2006/unicorn/WebContent/WEB-INF/resources/templates text.error.vm,1.3,1.4 xhtml10.vm,1.29,1.30 text.vm,1.5,1.6 from Thomas Gambet via cvs-syncmail on 2009-10-07 (www-validator-cvs@w3.org from October 2009)

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 07 Oct 2009 12:16:47 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MvVRn-0006an-AN@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates
In directory hutz:/tmp/cvs-serv25327/WebContent/WEB-INF/resources/templates

Modified Files:
	text.error.vm xhtml10.vm text.vm 
Log Message:
removed punctuation

Index: text.error.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/text.error.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- text.error.vm	28 Sep 2009 14:24:44 -0000	1.3
+++ text.error.vm	7 Oct 2009 12:16:45 -0000	1.4
@@ -1,23 +1,33 @@
 #if ($messages.size() > 0)
+
+#if ($messages.hasError())
+$error_label
 #foreach ($message in $messages)
 #if ($message.Level == "ERROR")
-Error:
 	#evaluate($message.Message)
 	$!{message.Content}
 #end
 #end
+#end
+
+#if ($messages.hasWarning())
+$warning_label
 #foreach ($message in $messages)
 #if ($message.Level == "WARNING")
-Warning:
 	#evaluate($message.Message)
 	$!{message.Content}
 #end
 #end
+#end
+
+#if ($messages.hasInfo())
+$info_label
 #foreach ($message in $messages)
 #if ($message.Level == "INFO")
-Info:
 	#evaluate($message.Message)
 	$!{message.Content}
 #end
 #end
+#end
+
 #end
\ No newline at end of file

Index: text.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/text.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- text.vm	1 Oct 2009 10:01:03 -0000	1.5
+++ text.vm	7 Oct 2009 12:16:45 -0000	1.6
@@ -1,27 +1,37 @@
 #if ($messages.size() > 0)
+
+#if ($messages.hasError())
+$error_label
 #foreach ($message in $messages)
 #if ($message.Level == "ERROR")
-Error:
 	#evaluate($message.Message)
 	$!{message.Content}
 #end
 #end
+#end
+
+#if ($messages.hasWarning())
+$warning_label
 #foreach ($message in $messages)
 #if ($message.Level == "WARNING")
-Warning:
 	#evaluate($message.Message)
 	$!{message.Content}
 #end
 #end
+#end
+
+#if ($messages.hasInfo())
+$info_label
 #foreach ($message in $messages)
 #if ($message.Level == "INFO")
-Info:
 	#evaluate($message.Message)
 	$!{message.Content}
 #end
 #end
 #end
 
+#end
+
 #set($observationList = $unicorncall.ObservationList)
 #foreach ($observationName in $observationList.keySet())
 #set ($observation = $observationList.get($observationName))
@@ -31,9 +41,9 @@
 ==================================================================================================================================================
 #if($observation.isPassed())$test_ok#else$test_fail#end $unicorncall.getObserverName($observationName, $lang)#if($observation.Rating) ($observation.Rating/100)#end
 
-#if($infoCount && $infoCount > 0)$info_label: $infoCount
-#end#if($errorCount && $errorCount > 0)$error_label: $errorCount
-#end#if($warningCount && $warningCount > 0)$warning_label: $warningCount
+#if($infoCount && $infoCount > 0)$info_label ($infoCount)
+#end#if($errorCount && $errorCount > 0)$error_label ($errorCount)
+#end#if($warningCount && $warningCount > 0)$warning_label ($warningCount)
 #end#if($observation.getFilteredRequestUri())$direct_link_label: $observation.getFilteredRequestUri()
 #{else}$direct_link_label: $observation.getBaseURI($observationName)#end
 #if ($infoCount && $infoCount > 0)
@@ -42,12 +52,12 @@
 --------------------------------------------------------------------------------------------------------------------------------------------------
 #foreach($result in $observation.getResultsList())
 #if(!$result.Infos.isEmpty())
-#if ($unicorncall.getInputMethod() == "URI")=> $uri_token: $result.Uri#end
-#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "URI")=> $uri_token $result.Uri#end
+#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token $result.Uri#end
 #if ($unicorncall.getInputMethod() == "DIRECT")=> $submitted_file#end
 
 #foreach($info in $result.Infos)
-   -#if($info.Line) $line_token:$info.Line#end#if($info.Column) $column_token:$info.Column#end#if($info.Context) $context_token:$info.Context#end
+   -#if($info.Line) $line_token $info.Line#end#if($info.Column) $column_token $info.Column#end#if($info.Context) $context_token $info.Context#end
 #if ($info.Line || $info.Column || $info.Context)
 
     #end
@@ -70,12 +80,12 @@
 --------------------------------------------------------------------------------------------------------------------------------------------------
 #foreach($result in $observation.getResultsList())
 #if(!$result.Errors.isEmpty())
-#if ($unicorncall.getInputMethod() == "URI")=> $uri_token: $result.Uri#end
-#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "URI")=> $uri_token $result.Uri#end
+#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token $result.Uri#end
 #if ($unicorncall.getInputMethod() == "DIRECT")=> $submitted_file#end
 
 #foreach($error in $result.Errors)
-   -#if($error.Line) $line_token:$error.Line#end#if($error.Column) $column_token:$error.Column#end#if($error.Context) $context_token:$error.Context#end
+   -#if($error.Line) $line_token $error.Line#end#if($error.Column) $column_token $error.Column#end#if($error.Context) $context_token $error.Context#end
 #if ($error.Line || $error.Column || $error.Context)
 
     #end
@@ -98,12 +108,12 @@
 --------------------------------------------------------------------------------------------------------------------------------------------------
 #foreach($result in $observation.getResultsList())
 #if(!$result.Warnings.isEmpty())
-#if ($unicorncall.getInputMethod() == "URI")=> $uri_token: $result.Uri#end
-#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "URI")=> $uri_token $result.Uri#end
+#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token $result.Uri#end
 #if ($unicorncall.getInputMethod() == "DIRECT")=> $submitted_file#end
 
 #foreach($warning in $result.Warnings)
-   -#if($warning.Line) $line_token:$warning.Line#end#if($warning.Column) $column_token:$warning.Column#end#if($warning.Context) $context_token:$warning.Context#end
+   -#if($warning.Line) $line_token $warning.Line#end#if($warning.Column) $column_token $warning.Column#end#if($warning.Context) $context_token $warning.Context#end
 #if ($warning.Line || $warning.Column || $warning.Context)
 
     #end

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/xhtml10.vm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- xhtml10.vm	7 Oct 2009 11:50:46 -0000	1.29
+++ xhtml10.vm	7 Oct 2009 12:16:45 -0000	1.30
@@ -36,9 +36,9 @@
 <div class="observer section #if($observation.isPassed()) valid #else invalid #end" id="$observationName">
 	<h2 class="title">
 		<span class="icons">
-			#if ($infoCount && $infoCount > 0)<a class="infos" href="#${observationName}_info" title="$info_label:$infoCount"><span class="legend">$info_label</span><span class="count">$infoCount</span></a> #end
-			#if ($errorCount && $errorCount > 0)<a class="errors" href="#${observationName}_error" title="$error_label:$errorCount"><span class="legend">$error_label</span><span class="count">$errorCount</span></a> #end
-			#if ($warningCount && $warningCount > 0)<a class="warnings" href="#${observationName}_warning" title="$warning_label:$warningCount"><span class="legend">$warning_label</span><span class="count">$warningCount</span></a> #end
+			#if ($infoCount && $infoCount > 0)<a class="infos" href="#${observationName}_info" title="$info_label ($infoCount)"><span class="legend">$info_label</span><span class="count">$infoCount</span></a> #end
+			#if ($errorCount && $errorCount > 0)<a class="errors" href="#${observationName}_error" title="$error_label ($errorCount)"><span class="legend">$error_label</span><span class="count">$errorCount</span></a> #end
+			#if ($warningCount && $warningCount > 0)<a class="warnings" href="#${observationName}_warning" title="$warning_label ($warningCount)"><span class="legend">$warning_label</span><span class="count">$warningCount</span></a> #end
 			<a class="anchor smooth" href="#$observationName" title="$anchor_observation">a</a>
 		</span>
 		#if($observation.isPassed()) #set($ref = "test_ok") #else #set($ref = "test_fail") #end
@@ -72,8 +72,8 @@
 #foreach($info in $result.Infos)
 #set ($messageId = "${observationName}_info_${i}_$velocityCount")
 						<tr>
-							<td class="linenumber" title="#if($info.Line)$line_token: $info.Line#end">$!info.Line</td>
-							<td class="colnumber" title="#if($info.Column)$column_token: $info.Column#end">$!info.Column</td>
+							<td class="linenumber" title="#if($info.Line)$line_token $info.Line#end">$!info.Line</td>
+							<td class="colnumber" title="#if($info.Column)$column_token $info.Column#end">$!info.Column</td>
 							<td class="codeContext" title="$context_token">$!{info.Context}</td>
 							<td class="info" id="$messageId">
 							#foreach($message in $info.Message)<span class="msg">$message</span>#end
@@ -120,8 +120,8 @@
 #foreach($error in $result.Errors)
 #set ($messageId = "${observationName}_error_${i}_$velocityCount")
 						<tr>
-							<td class="linenumber" title="#if($error.Line)$line_token: $error.Line#end">$!error.Line</td>
-							<td class="colnumber" title="#if($error.Column)$column_token: $error.Column#end">$!error.Column</td>
+							<td class="linenumber" title="#if($error.Line)$line_token $error.Line#end">$!error.Line</td>
+							<td class="colnumber" title="#if($error.Column)$column_token $error.Column#end">$!error.Column</td>
 							<td class="codeContext" title="$context_token">$!error.Context</td>
 							<td class="error" id="$messageId">
 							#foreach($message in $error.Message)<span class="msg">$message</span>#end
@@ -168,8 +168,8 @@
 #foreach($warning in $result.Warnings)
 #set ($messageId = "${observationName}_warning_${i}_$velocityCount")
 						<tr>
-							<td class="linenumber" title="#if($warning.Line)$line_token: $warning.Line#end">$!warning.Line</td>
-							<td class="colnumber" title="#if($warning.Column)$column_token: $warning.Column#end">$!warning.Column</td>
+							<td class="linenumber" title="#if($warning.Line)$line_token $warning.Line#end">$!warning.Line</td>
+							<td class="colnumber" title="#if($warning.Column)$column_token $warning.Column#end">$!warning.Column</td>
 							<td class="codeContext" title="$context_token">$!warning.Context</td>
 							<td class="warning level$warning.getLevel()" id="$messageId">
 							#foreach($message in $warning.Message)<span class="msg">$message</span>#end
Received on Wednesday, 7 October 2009 12:16:49 UTC