2006/unicorn/WebContent/WEB-INF/resources/templates index.vm,1.1.2.3,1.1.2.4

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

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


Index: index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/Attic/index.vm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- index.vm	19 Aug 2009 08:14:13 -0000	1.1.2.3
+++ index.vm	19 Aug 2009 18:47:04 -0000	1.1.2.4
@@ -3,149 +3,86 @@
 #set ($js = ['scripts/mootools.js', 'scripts/w3c-validator.js'])
 #parse( 'includes/head.vm' )
 
-	<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-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>
+#macro (display_tasklist)
 				<form method="get" action="">
 					<p class="instructions">$select-a-task</p>
 					<p>
 						<label title="Address of page to Validate">$task:
 							<select name="${param_prefix}task" class="ucn_task">
 #foreach( $task in $tasklist )
-								<option value="$task.getID()">$task.getLongName("${lang}")</option>
+								<option value="$task.getID()" #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>
-						<input type="hidden" name="${param_prefix}lang" value="$lang" />
+						<span class="task_description">$current_task.getDescription("${lang}")</span>
 					</p>
 				</form>
-				<form method="get" action="observe">
-					<!--<p class="instructions">$select-a-task</p>
-					<p>
-						<label title="Address of page to Validate">$task:
-							<select name="${param_prefix}task" class="ucn_task">
-#foreach( $task in $tasklist )
-								<option value="$task.getID()">$task.getLongName("${lang}")</option>
 #end
-							</select>
-						</label>
-						<label title="Change task">
-							<input type="submit" value="Ok" class="change_task" />
+
+#macro (submit_button)
+					<p class="submit_button">
+						<input type="hidden" name="${param_prefix}lang" value="$lang" />
+						<input type="hidden" name="${param_prefix}task" value="$current_task.getID()" />
+						<label title="$submit_title">
+							<input type="submit" value="$submit" class="js" />
 						</label>
-					</p>-->
+					</p>
+#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-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">
 					<p class="instructions">$instruction-by-uri</p>
 					<p>
 						<label title="$uri_title" for="${param_prefix}uri">$uri:
 							<input type="text" name="${param_prefix}uri" id="${param_prefix}uri" size="45" />
 						</label>
 					</p>
-#if (true)
-					<fieldset id="opt_uri" class="options">
-						<legend>Options</legend>
-						<div> to
-						</div>
-					</fieldset>
-#end
-#if (true)
-					<fieldset id="extra_opt_uri" class="moreoptions">
-						<legend class="toggletext" title="Show/Hide extra options">$extra_options</legend>
-						<div class="options">
-							
-						</div>
-					</fieldset>
-#end
-					<p class="submit_button">
-						<input type="hidden" name="${param_prefix}lang" value="$lang" />
-						<input type="hidden" name="${param_prefix}task" value="conformance" />
-						<label title="$submit_title">
-							<input type="submit" value="$submit" />
-						</label>
-					</p>
+#set ($param_suffix="uri")
+#parse('includes/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">
-					<p class="instructions">$select-a-task</p>
-					<p>
-						<label title="Address of page to Validate">$task:
-							<select name="${param_prefix}task" class="ucn_task">
-#foreach( $task in $tasklist ) 
-								<option value="$task.getID()">$task.getLongName("${lang}")</option>
-#end
-							</select>
-						</label>
-					</p>
 					<p class="instructions">$instruction-by-upload</p>
 					<p>
 						<label title="$instruction-by-upload" for="${param_prefix}file">$local_file
 							<input type="file" id="${param_prefix}file" name="${param_prefix}file" size="30" />
 						</label>
 					</p>
-					<fieldset id="opt_upload" class="options">
-						<legend>Options</legend>
-						<div>
-						</div>
-					</fieldset>
-					<fieldset id="extra_opt_upload" class="moreoptions">
-						<legend class="toggletext" title="Show/Hide extra options">$extra_options</legend>
-						<div class="options">
-							
-						</div>
-					</fieldset>
-					<p class="submit_button">
-						<input type="hidden" name="${param_prefix}lang" value="$lang" />
-						<label title="$submit_title">
-							<input type="submit" value="$submit" />
-						</label>
-					</p>
+#set ($param_suffix="upload")
+#parse('includes/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="get">
-					<p class="instructions">$select-a-task</p>
-					<p>
-						<label title="Address of page to Validate">$task:
-							<select name="${param_prefix}task" class="ucn_task">
-#foreach( $task in $tasklist ) 
-								<option value="$task.getID()">$task.getLongName("${lang}")</option>
-#end
-							</select>
-						</label>
-					</p>
 					<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" />
 					</p>      
-					<fieldset id="opt_direct" class="options">
-						<legend>Options</legend>
-						<div>
-						</div>
-					</fieldset>
-					<fieldset id="extra_opt_direct" class="moreoptions">
-						<legend class="toggletext" title="Show/Hide extra options">$extra_options</legend>
-						<div class="options">
-							
-						</div>
-					</fieldset>
-					<p class="submit_button">
-						<input type="hidden" name="${param_prefix}lang" value="$lang" />
-						<label title="$submit_title">
-							<input type="submit" value="$submit" />
-						</label>
-					</p>
+#set ($param_suffix="input")
+#parse( 'includes/parameters.vm' )
+#submit_button
 				</form>
 			</fieldset>
 		</div>
@@ -153,7 +90,7 @@
 	<div class="intro" id="don_program">
 		<script type="text/javascript" src="http://www.w3.org/QA/Tools/don_prog.js"></script>
 	</div>
-	<!--<div id="ucn_news">
+	<div id="ucn_news">
 		<h1>Latest News</h1>
 		<h2 id="news_200809">September 2008: public preview, phase 2</h2>
 		<p>The public preview of the Unicorn framework gets a massive update after two summers of code and spec improvements. All the changes, aimed at making the unicorn framework faster, more reliable and easier to integrate with validators and web observation tools, include:</p>
@@ -171,11 +108,5 @@
 		or how you can provide feedback for this preview, check the <a href="http://www.w3.org/QA/2006/09/unicorn_public_preview.html">W3C QA Weblog</a>.</p>
 		<p><strong>Note</strong>: You need to enable Javascript to be able to check documents.</p>
 	</div>
-<h2>$last_news</h2>
-<h3>$news_subtitle</h3>
-<p>$news</p>
-
-<p><strong>Note</strong>: Vous devez activer JavaScript pour pouvoir v&eacute;rifier des documents.</p>-->
-
 
 #parse( 'includes/footer.vm' )
\ No newline at end of file

Received on Wednesday, 19 August 2009 18:47:16 UTC