2006/unicorn/WebContent/WEB-INF/resources/templates index.vm,1.1.2.8,1.1.2.9

Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates
In directory hutz:/tmp/cvs-serv338/WebContent/WEB-INF/resources/templates

Modified Files:
      Tag: dev2
	index.vm 
Log Message:
updated interface

Index: index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/Attic/index.vm,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- index.vm	21 Aug 2009 11:28:20 -0000	1.1.2.8
+++ index.vm	24 Aug 2009 09:17:47 -0000	1.1.2.9
@@ -1,104 +1,94 @@
-#set ($title = "Unicorn")
-#set ($css = ['base.css'])
+#set ($title = "Unicorn")
+#set ($css = ['base_ucn.css'])
 #set ($js = ['scripts/mootools-1.2.3-core-nc.js', 'scripts/mootools-1.2.3.1-more.js', 'scripts/w3c-validator.js'])
-#parse( 'includes/head.vm' )
-
-#macro (display_tasklist)
-				<form method="get" action="">
-					<p class="instructions">$select-a-task</p>
-					<p>
-						<label><span>$task:</span>
-							<select name="${param_prefix}task" class="ucn_task">
-#foreach( $task in $tasklist )
-								<option value="$task.getID()" title="$task.getDescription($lang)" #if ($task == $current_task) selected="selected" #end>$task.getLongName("${lang}")</option>
-#end
-							</select>
-						</label>
-						<label title="Change task">
-							<input type="hidden" name="${param_prefix}lang" value="$lang" />
-							<input type="submit" value="Ok" class="change_task" />
-						</label>
-						<span class="task_description">$current_task.getDescription($lang)</span>
-					</p>
-				</form>
-#end
+#parse( 'head.vm' )
 
 #macro (submit_button)
-					<p class="submit_button">
+					<div class="submit">
 						<input type="hidden" name="${param_prefix}lang" value="$lang" class="lang" />
 						<input type="hidden" name="${param_prefix}task" value="$current_task.getID()" class="task" />
-						<label title="$submit_title">
-							<input type="submit" value="$submit" class="js" />
-						</label>
-					</p>
+						<input type="submit" value="$submit" />
+					</div>
 #end
 
 	<div id="frontforms">
 		<ul id="tabset_tabs">
-			<li><a href="#validate-by-uri" class="active">$validate-by-uri</a></li><!--
+			<li><a href="#validate-by-uri">$validate-by-uri</a></li><!--
 		 --><li><a href="#validate-by-upload">$validate-by-upload</a></li><!--
 		 --><li><a href="#validate-by-input">$validate-by-input</a></li>
 		</ul>
+
 		<div id="fields">
-			<fieldset id="validate-by-uri" class="tabset_content front">
-				<legend class="tabset_label">$legend-by-uri</legend>
-#display_tasklist()
-				<form method="get" action="observe"  class="ucn">
-					<p class="instructions">$instruction-by-uri</p>
-					<p>
-						<label title="$uri_title" for="${param_prefix}uri"><span>$uri:</span>
-							<input type="text" name="${param_prefix}uri" id="${param_prefix}uri" size="45" />
-						</label>
-					</p>
-					<div class="options_container">
-#set ($param_suffix="uri")
-#parse('includes/parameters.vm')
+			<form method="get" action="">
+				<fieldset>
+					<legend>$select-a-task</legend>
+					<div class="input">
+						<p>
+							<label><span>$task:</span>
+								<select name="${param_prefix}task" id="tasks">
+#foreach( $task in $tasklist )
+									<option value="$task.getID()" title="$task.getDescription($lang)" #if ($task == $current_task) selected="selected" #end>$task.getLongName("${lang}")</option>
+#end
+								</select>
+							</label>
+							<input type="hidden" name="${param_prefix}lang" value="$lang" class="lang" />
+							<input id="task_change" type="submit" value="OK" />
+							<span id="task_descrip">$current_task.getDescription($lang)</span>
+						</p>
+					</div>
+				</fieldset>
+			</form>
+			<form action="observe" method="get" id="validate-by-uri">
+				<fieldset>
+					<legend>$legend-by-uri</legend>
+					<div class="input">
+						<p class="instructions">$instruction-by-uri</p>
+						<p>
+							<label title="$uri_title" for="ucn_uri"><span>$uri:</span>
+								<input type="text" name="${param_prefix}uri" id="ucn_uri" size="45" />
+							</label>
+						</p>
 					</div>
+#parse('parameters.vm')
 #submit_button
-				</form>
-			</fieldset>
-			<fieldset id="validate-by-upload" class="tabset_content front">
-				<legend class="tabset_label">$legend-by-upload</legend>
-#display_tasklist()
-				<form method="post" enctype="multipart/form-data" action="observe" class="ucn">
-					<p class="instructions">$instruction-by-upload</p>
-					<p>
-						<label title="$instruction-by-upload" for="${param_prefix}file"><span>$local_file:</span>
-							<input type="file" id="${param_prefix}file" name="${param_prefix}file" size="30" />
-						</label>
-					</p>
-					<div class="options_container">
-#set ($param_suffix="upload")
-#parse('includes/parameters.vm')
+				</fieldset>
+			</form>
+			<form action="observe" method="post" enctype="multipart/form-data"  id="validate-by-upload">
+				<fieldset>
+					<legend>$legend-by-upload</legend>
+					<div class="input">
+						<p class="instructions">$instruction-by-upload</p>
+						<p>
+							<label title="$instruction-by-upload" for="ucn_file"><span>$local_file:</span>
+								<input type="file" id="ucn_file" name="${param_prefix}file" size="30" />
+							</label>
+						</p>
 					</div>
+#parse('parameters.vm')
 #submit_button
-				</form>
-			</fieldset>
-			<fieldset id="validate-by-input" class="tabset_content front">
-				<legend class="tabset_label">$legend-by-input</legend>
-#display_tasklist()
-				<form action="observe" method="post" class="ucn">
-					<p class="instructions">$instruction-by-input</p>
-					<p>
-						<textarea name="${param_prefix}text" rows="12" cols="70"></textarea>
-						<span id="${param_prefix}text_mime"></span>
-						<input type="hidden" name="${param_prefix}lang" value="fr" />
-						<select name="${param_prefix}text_mime">
-						#foreach($mime in $current_task.SupportedMimeTypes)  
-							<option value="$mime">$mime</option>
-						#end
-						</select>
-					</p>      
-					<div class="options_container">
-#set ($param_suffix="input")
-#parse( 'includes/parameters.vm' )
+				</fieldset>
+			</form>
+			<form action="observe" method="post" id="validate-by-input">
+				<fieldset>
+					<legend>$legend-by-input</legend>
+					<div class="input">
+						<p class="instructions">$instruction-by-input</p>
+						<p>
+							<textarea name="${param_prefix}text" rows="12" cols="70"></textarea>
+							<select id="ucn_text_mime" name="${param_prefix}text_mime">
+							#foreach($mime in $current_task.SupportedMimeTypes)  
+								<option value="$mime">$mime</option>
+							#end
+							</select>
+						</p> 
 					</div>
+#parse( 'parameters.vm' )
 #submit_button
-				</form>
-			</fieldset>
+				</fieldset>
+			</form>
 		</div>
 	</div>
-	<div class="intro" id="don_program">
+	<div id="don_program">
 		<script type="text/javascript" src="http://www.w3.org/QA/Tools/don_prog.js"></script>
 	</div>
 	<!--<div id="ucn_news">
@@ -120,4 +110,4 @@
 		<p><strong>Note</strong>: You need to enable Javascript to be able to check documents.</p>
 	</div>-->
 
-#parse( 'includes/footer.vm' )
\ No newline at end of file
+#parse( 'footer.vm' )
\ No newline at end of file

Received on Monday, 24 August 2009 09:17:58 UTC