W3C home > Mailing lists > Public > www-validator-cvs@w3.org > August 2009

2006/unicorn/WebContent/WEB-INF/resources/templates xhtml10.vm,1.1.2.4,1.1.2.5

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 25 Aug 2009 14:50:16 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MfxLk-0007jO-Co@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates
In directory hutz:/tmp/cvs-serv29684/WebContent/WEB-INF/resources/templates

Modified Files:
      Tag: dev2
	xhtml10.vm 
Log Message:
updated result display

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/Attic/xhtml10.vm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- xhtml10.vm	24 Aug 2009 15:43:24 -0000	1.1.2.4
+++ xhtml10.vm	25 Aug 2009 14:50:14 -0000	1.1.2.5
@@ -1,55 +1,157 @@
 #if($unicorncall.DocumentName)
-  #set ($title = "$result_for $unicorncall.DocumentName")
+#set ($title = "$result_for $unicorncall.DocumentName")
 #else
-  #set ($title = $result_for_upload)
+#set ($title = $result_for_upload)
 #end  
-#set ($css = ['base_ucn.css', 'results.css'])
-#parse( 'includes/head.vm' )
+#set ($css = ['base_ucn.css'])
+#parse('includes/head.vm')
 
-  <div id="result">
-  #set($observationList = $unicorncall.ObservationList)
-  #foreach($observationName in $observationList.keySet())
-    #set($observation = $observationList.get($observationName))
-    #if($observation.isPassed())
-      <h2 class="valid">$test_ok_1 
-      #if($observation.getVersion())
-        $observation.getVersion().toUpperCase()
-      #else 
-        $observationName
-      #end
-      $test_ok_2</h2>
-    #else
-      <h2 class="invalid">$test_fail_1 
-      #if($observation.getVersion())
-        $observation.getVersion().toUpperCase()
-      #else 
-        $observationName
-      #end
-      $test_fail_2</h2>
-      #foreach($result in $observation.getResultsList())
-        #if(!$result.Errors.isEmpty())
-          <h3>$location: $result.Uri</h3>
-      	  #produceErrors($result.Errors)
-      	#end
-      #end
-    #end
-    
-    
-    #foreach($result in $observation.getResultsList())
-      #if(!$result.Infos.isEmpty() || !$result.Warnings.isEmpty())
-        <h3>$location: $result.Uri</h3>
-      #end
-  
-      #if(!$result.Infos.isEmpty())
-        #produceInfos($result.Infos)
-      #end
-    
-      #if(!$result.Warnings.isEmpty())
-        #produceWarnings($result.Warnings)
-      #end
-    #end
-  #end
+#set($observationList = $unicorncall.ObservationList)
 
-  </div>
+<div id="result">
+#foreach($observationName in $observationList.keySet())
+<div class="observer">
+	#set($observation = $observationList.get($observationName))
+	#if($observation.isPassed())
+	<h2 class="valid">
+		$test_ok_1 
+		#if($observation.getVersion()) $observation.getVersion().toUpperCase()
+		#else  $observationName #end
+		$test_ok_2
+	</h2>
+	#else
+	<h2 class="invalid">
+		$test_fail_1 
+		#if($observation.getVersion()) $observation.getVersion().toUpperCase()
+		#else  $observationName #end
+		$test_fail_2
+	</h2>
+	#end
+	
+	#set ($infoCount = $observation.getInfoCount())
+	#if ($infoCount > 0)
+		<div class="infos">
+		<h3>Infos ($infoCount)</h3>
+		#foreach($result in $observation.getResultsList())
+			#if(!$result.Infos.isEmpty())
+			<div class="info-section">
+				<h4><span>URI : </span><a href="$result.Uri">$result.Uri</a></h4>
+				<table>
+					<tbody>
+						#foreach($info in $result.Infos)
+						<tr>
+							<td class="linenumber" title="">
+								#if($info.Line)$info.Line #end
+								#if($info.Column)/$info.Column #end
+							</td>
+							<td class="codeContext">
+								#if($info.Context) $info.Context #end
+							</td>
+							<td class="parse-info">
+								#foreach($message in $info.Message)
+								<span class="msg">$message</span>
+								#end
+								#foreach($longMessage in $info.Longmessage)
+								<p>
+								#foreach($longMessagePiece in $longMessage.Content)
+									$longMessagePiece
+								#end
+								</p>
+								#end
+							</td>
+						</tr>
+						#end
+					</tbody>
+				</table>
+			</div>
+			#end
+		#end
+		</div>
+	#end
+	
+	#set ($errorCount = $observation.getErrorCount())
+	#if ($errorCount > 0)
+		<div class="errors">
+		<h3>Errors ($errorCount)</h3>
+		#foreach($result in $observation.getResultsList())
+			#if(!$result.Errors.isEmpty())
+			<div class="error-section">
+				<h4><span>URI : </span><a href="$result.Uri">$result.Uri</a></h4>
+				<table>
+					<tbody>
+						#foreach($error in $result.Errors)
+						<tr>
+							<td class="linenumber" title="">
+								#if($error.Line)$error.Line #end
+								#if($error.Column)/$error.Column #end
+							</td>
+							<td class="codeContext">
+								#if($error.Context) $error.Context #end
+							</td>
+							<td class="parse-error">
+								#foreach($message in $error.Message)
+								<span class="msg">$message</span>
+								#end
+								#foreach($longMessage in $error.Longmessage)
+								<p>
+								#foreach($longMessagePiece in $longMessage.Content)
+									$longMessagePiece
+								#end
+								</p>
+								#end
+							</td>
+						</tr>
+						#end
+					</tbody>
+				</table>
+			</div>
+			#end
+		#end
+		</div>
+	#end
+	
+	#set ($warningCount = $observation.getWarningCount())
+	#if ($warningCount > 0)
+		<div class="warnings">
+		<h3>Warnings ($warningCount)</h3>
+		#foreach($result in $observation.getResultsList())
+			#if(!$result.Warnings.isEmpty())
+			<div class="warning-section">
+				<h4><span>URI : </span><a href="$result.Uri">$result.Uri</a></h4>
+				<table>
+					<tbody>
+						#foreach($warning in $result.Warnings)
+						<tr>
+							<td class="linenumber" title="">
+								#if($warning.Line)$warning.Line #end
+								#if($warning.Column)/$warning.Column #end
+							</td>
+							<td class="codeContext">
+								#if($warning.Context) $warning.Context #end
+							</td>
+							<td class="parse-warning">
+								#foreach($message in $warning.Message)
+								<span class="msg">$message</span>
+								#end
+								#foreach($longMessage in $warning.Longmessage)
+								<p>
+								#foreach($longMessagePiece in $longMessage.Content)
+									$longMessagePiece
+								#end
+								</p>
+								#end
+							</td>
+						</tr>
+						#end
+					</tbody>
+				</table>
+			</div>
+			#end
+		#end
+		</div>
+	#end
+</div>
+#end
+</div>
 
 #parse( 'includes/footer.vm' )
Received on Tuesday, 25 August 2009 14:50:26 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:38 UTC