2006/unicorn/WebContent/WEB-INF/resources/templates xhtml10.vm,1.1.2.9,1.1.2.10

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

Modified Files:
      Tag: dev2
	xhtml10.vm 
Log Message:
does not use version name as observer name anymore

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/Attic/xhtml10.vm,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- xhtml10.vm	26 Aug 2009 16:16:55 -0000	1.1.2.9
+++ xhtml10.vm	26 Aug 2009 17:27:46 -0000	1.1.2.10
@@ -14,22 +14,18 @@
 	#set($observation = $observationList.get($observationName))
 	#if($observation.isPassed())
 	<h2 class="valid">
-		$test_ok_1 
-		#if($observation.getVersion()) $observation.getVersion().toUpperCase()
-		#else $unicorncall.getObserverName($observationName, $lang) #end
-		$test_ok_2
+		$test_ok_1:
+		$unicorncall.getObserverName($observationName, $lang)
 	</h2>
 	#else
 	<h2 class="invalid">
-		$test_fail_1 
-		#if($observation.getVersion()) $observation.getVersion().toUpperCase()
-		#else  $observationName #end
-		$test_fail_2
+		$test_fail_1: 
+		$unicorncall.getObserverName($observationName, $lang)
 	</h2>
 	#end
 	
 	#set ($infoCount = $observation.getInfoCount())
-	#if ($infoCount > 0)
+	#if ($infoCount && $infoCount > 0)
 		<div class="infos">
 		<h3>Infos ($infoCount)</h3>
 		#foreach($result in $observation.getResultsList())
@@ -63,7 +59,7 @@
 	#end
 	
 	#set ($errorCount = $observation.getErrorCount())
-	#if ($errorCount > 0)
+	#if ($errorCount && $errorCount > 0)
 		<div class="errors">
 		<h3>Errors ($errorCount)</h3>
 		#foreach($result in $observation.getResultsList())
@@ -97,7 +93,7 @@
 	#end
 	
 	#set ($warningCount = $observation.getWarningCount())
-	#if ($warningCount > 0)
+	#if ($warningCount && $warningCount > 0)
 		<div class="warnings">
 		<h3>Warnings ($warningCount)</h3>
 		#foreach($result in $observation.getResultsList())

Received on Wednesday, 26 August 2009 17:27:58 UTC