2006/unicorn/WebContent/WEB-INF/resources/templates xhtml10.vm,1.24,1.25

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

Modified Files:
	xhtml10.vm 
Log Message:
updated

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/xhtml10.vm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- xhtml10.vm	30 Sep 2009 13:43:13 -0000	1.24
+++ xhtml10.vm	30 Sep 2009 15:04:06 -0000	1.25
@@ -1,8 +1,4 @@
-#if($unicorncall.DocumentName)
-#set ($noEscape_title = "$result_for $unicorncall.DocumentName")
-#else
-#set ($noEscape_title = $result_for_upload)
-#end  
+#set ($noEscape_title = "$result_for #evaluate($unicorncall.DocumentName)")
 #set ($css = ['base_ucn.css'])
 #set ($js = ['mootools-1.2.3-core-nc.js', 'mootools-1.2.3.1-more.js', 'w3c_unicorn_results.js'])
 #if ($unicorncall.isPassed())
@@ -71,9 +67,9 @@
 						#set ($i = $i + 1)
 						<tr>
 							<td colspan="4" class="uri" id="${observationName}_info_${i}">
-							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token</span><a href="$result.Uri">$result.Uri</a>#end
-							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token</span>$result.Uri#end
-							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file</span>#end
+							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token: </span><a href="$result.Uri">$result.Uri</a>#end
+							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token: </span>$result.Uri#end
+							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file: </span>#end
 							</td>
 							<td class="anchor uri"><a class="smooth" title="$anchor_uri" href="#${observationName}_info_${i}">a</a></td>
 						</tr>
@@ -119,9 +115,9 @@
 						#set ($i = $i + 1)
 						<tr>
 							<td colspan="4" class="uri" id="${observationName}_error_${i}">
-							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token</span><a href="$result.Uri">$result.Uri</a>#end
-							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token</span>$result.Uri#end
-							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file</span>#end
+							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token: </span><a href="$result.Uri">$result.Uri</a>#end
+							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token: </span>$result.Uri#end
+							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file: </span>#end
 							</td>
 							<td class="anchor uri"><a class="smooth" title="$anchor_uri" href="#${observationName}_error_${i}">a</a></td>
 						</tr>
@@ -167,9 +163,9 @@
 						#set ($i = $i + 1)
 						<tr>
 							<td colspan="4" class="uri" id="${observationName}_warning_${i}">
-							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token</span><a href="$result.Uri">$result.Uri</a>#end
-							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token</span>$result.Uri#end
-							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file</span>#end
+							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token: </span><a href="$result.Uri">$result.Uri</a>#end
+							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token: </span>$result.Uri#end
+							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file: </span>#end
 							</td>
 							<td class="anchor uri"><a class="smooth" title="$anchor_uri" href="#${observationName}_warning_${i}">a</a></td>
 						</tr>

Received on Wednesday, 30 September 2009 15:04:11 UTC