2006/unicorn/WebContent/WEB-INF/resources/templates xhtml10.vm,1.1.2.16,1.1.2.17 index.vm,1.1.2.10,1.1.2.11

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

Modified Files:
      Tag: dev2
	xhtml10.vm index.vm 
Log Message:
does not escape the page title twice
any reference prefixed with $noEscape_ won't be escape by XHTMLize()

Index: index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/Attic/index.vm,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- index.vm	28 Aug 2009 09:03:11 -0000	1.1.2.10
+++ index.vm	28 Aug 2009 10:04:58 -0000	1.1.2.11
@@ -1,4 +1,4 @@
-#set ($title = "Unicorn")
+#set ($noEscape_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_unicorn_index.js'])
 #parse( 'head.vm' )

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/Attic/xhtml10.vm,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- xhtml10.vm	28 Aug 2009 09:03:57 -0000	1.1.2.16
+++ xhtml10.vm	28 Aug 2009 10:04:58 -0000	1.1.2.17
@@ -1,7 +1,7 @@
 #if($unicorncall.DocumentName)
-#set ($title = "$result_for $unicorncall.DocumentName")
+#set ($noEscape_title = "$result_for $unicorncall.DocumentName")
 #else
-#set ($title = $result_for_upload)
+#set ($noEscape_title = $result_for_upload)
 #end  
 #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_unicorn_results.js'])
@@ -22,28 +22,19 @@
 #else
 <div class="observer $observationName invalid">
 #end
-	
-	#if($observation.isPassed())
-	<h2 class="valid">
+	<h2>
 		<span class="icons">
 			#if ($infoCount && $infoCount > 0)<img src="images/icone_info.png" alt="info icon" /><span>$infoCount</span> #end
 			#if ($errorCount && $errorCount > 0)<img src="images/icone_error.png" alt="error icon" /><span>$errorCount</span> #end
 			#if ($warningCount && $warningCount > 0)<img src="images/icone_warning.png" alt="warning icon" /><span>$warningCount</span> #end
 		</span>
+		#if($observation.isPassed())
 		$test_ok_1
-		$unicorncall.getObserverName($observationName, $lang)
-	</h2>
-	#else
-	<h2 class="invalid">
-		<span class="icons">
-			#if ($infoCount && $infoCount > 0)<img src="images/icone_info.png" alt="info icon" /><span>$infoCount</span> #end
-			#if ($errorCount && $errorCount > 0)<img src="images/icone_error.png" alt="error icon" /><span>$errorCount</span> #end
-			#if ($warningCount && $warningCount > 0)<img src="images/icone_warning.png" alt="warning icon" /><span>$warningCount</span> #end
-		</span>
+		#else
 		$test_fail_1
-		$unicorncall.getObserverName($observationName, $lang)
+		#end
+		<span class="name">$unicorncall.getObserverName($observationName, $lang)</span>
 	</h2>
-	#end
 	
 	<div class="results">
 	#if ($infoCount && $infoCount > 0)

Received on Friday, 28 August 2009 10:05:13 UTC