2006/unicorn/WebContent/WEB-INF/resources/templates xhtml10.vm,1.38,1.39

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

Modified Files:
	xhtml10.vm 
Log Message:
uri links if a context has an uri
+ some changes for javascript

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/xhtml10.vm,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- xhtml10.vm	20 Oct 2009 16:45:50 -0000	1.38
+++ xhtml10.vm	21 Oct 2009 15:11:55 -0000	1.39
@@ -16,18 +16,20 @@
 <div id="don_program">
 	<script type="text/javascript" src="http://www.w3.org/QA/Tools/don_prog.js"></script>
 	<noscript>
-		<div><span id="don_program_img">
-			<a href="http://www.w3.org/QA/Tools/Donate">
-				<img alt="" src="http://www.w3.org/QA/Tools/I_heart_validator_lg" />
-			</a>
-		</span>
-		<span id="don_program_text">
-			The W3C validators rely on community support for hosting and development.<br />
-			<a href="http://www.w3.org/QA/Tools/Donate">Donate</a> and help us build better tools for a better web.
-		</span></div>
+		<div>
+			<span id="don_program_img">
+				<a href="http://www.w3.org/QA/Tools/Donate">
+					<img src="http://www.w3.org/QA/Tools/I_heart_validator_lg" alt="Validators Donation Program Logo"/>
+				</a>
+			</span>
+			<span lang="en" id="don_program_text" dir="ltr">
+				The W3C validators rely on community support for hosting and development.<br />
+				<a href="http://www.w3.org/QA/Tools/Donate">Donate</a> and help us build better tools for a better web.
+			</span>
+		</div>
 	</noscript>
 </div>
-<div id="observations">
+<div id="observations" class="contextShow:'$esc.html($contexts_show)' contextHide:'$esc.html($contexts_hide)'">
 #foreach ($observationName in $observationList.keySet())
 #set ($observation = $observationList.get($observationName))
 #set ($infoCount = $observation.getInfoCount())
@@ -73,12 +75,15 @@
 								#if($message.getType()==2)#set($type="error")#elseif($message.getType()==1)#set($type="warning")#else#set($type="info")#end
 								#set ($messageId = "${observationName}_${group.Name}_${uriCount}_$velocityCount")
 								#set ($contextsCount = $message.getContexts().size())
-								#if ($contextsCount == 0)
+								#if ($contextsCount == 0 || $contextsCount == 1)
 									<tr>
-										<td class="linenumber" title=""></td>
-										<td class="colnumber" title=""></td>
-										<td class="codeContext" title=""></td>
-										<td class="$type level$message.Level" id="$messageId">
+										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
+										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
+										<td class="codeContext" title="$context_token">
+											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
+											$!esc.html($!{context.Context})
+										</td>
+										<td class="$type level$message.Level message" id="$messageId">
 											<span class="msg#if($message.Description && $message.Description != "") desc#end">
 												<span class="$type legend">$type</span>
 												$!esc.html($message.Title)
@@ -94,12 +99,12 @@
 										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
 										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
 										<td class="codeContext" title="$context_token">
-											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="Resource referenced by this context: $context.URI"">link</a> #end
+											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
 											$!esc.html($!{context.Context})
 										</td>
 										#if ($b)
 										#set ($b = false)
-										<td class="$type level$message.Level" id="$messageId" rowspan="$message.getContexts().size()">
+										<td class="$type level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
 											<span class="msg#if($message.Description && $message.Description != "") desc#end">
 												<span class="$type legend">$type</span>
 												$!esc.html($message.Title)
@@ -142,12 +147,15 @@
 										#if($message.getType()==2)#set($type="error")#elseif($message.getType()==1)#set($type="warning")#else#set($type="info")#end
 										#set ($messageId = "${observationName}_${group.Name}_${uriCount}_$velocityCount")
 										#set ($contextsCount = $message.getContexts().size())
-										#if ($contextsCount == 0)
+										#if ($contextsCount == 0 || $contextsCount == 1)
 											<tr>
-												<td class="linenumber" title=""></td>
-												<td class="colnumber" title=""></td>
-												<td class="codeContext" title=""></td>
-												<td class="$type level$message.Level" id="$messageId">
+												<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
+												<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
+												<td class="codeContext" title="$context_token">
+													#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
+													$!esc.html($!{context.Context})
+												</td>
+												<td class="$type level$message.Level message" id="$messageId">
 													<span class="msg#if($message.Description && $message.Description != "") desc#end">
 														<span class="$type legend">$type</span>
 														$!esc.html($message.Title)
@@ -163,12 +171,12 @@
 												<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
 												<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
 												<td class="codeContext" title="$context_token">											
-													#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="Resource referenced by this context: $context.URI">link</a> #end
+													#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
 													$!esc.html($!{context.Context})
 												</td>
 												#if ($b)
 												#set ($b = false)
-												<td class="$type level$message.Level" id="$messageId" rowspan="$message.getContexts().size()">
+												<td class="$type level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
 													<span class="msg#if($message.Description && $message.Description != "") desc#end">
 														<span class="$type legend">$type</span>
 														$!esc.html($message.Title)
@@ -219,12 +227,15 @@
 							#set ($messageId = "${observationName}_info_${uriCount}_$velocityCount")
 							#set ($contextsCount = $message.getContexts().size())
 							#set ($b = true)
-								#if ($contextsCount == 0)
+								#if ($contextsCount == 0 || $contextsCount == 1)
 									<tr>
-										<td class="linenumber" title=""></td>
-										<td class="colnumber" title=""></td>
-										<td class="codeContext" title=""></td>
-										<td class="info level$message.Level" id="$messageId">
+										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
+										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
+										<td class="codeContext" title="$context_token">
+											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
+											$!esc.html($!{context.Context})
+										</td>
+										<td class="info level$message.Level message" id="$messageId">
 											<span class="msg">$!esc.html($message.Title)</span>
 											#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
 										</td>
@@ -235,11 +246,14 @@
 									<tr>
 										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
 										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
-										<td class="codeContext" title="$context_token">$!esc.html($!{context.Context})</td>
+										<td class="codeContext" title="$context_token">
+											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
+											$!esc.html($!{context.Context})
+										</td>
 										
 										#if ($b)
 										#set ($b = false)
-										<td class="info level$message.Level" id="$messageId" rowspan="$message.getContexts().size()">
+										<td class="info level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
 											<span class="msg">$!esc.html($message.Title)</span>
 											#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
 										</td>
@@ -280,12 +294,15 @@
 							#set ($messageId = "${observationName}_error_${uriCount}_$velocityCount")
 							#set ($contextsCount = $message.getContexts().size())
 							#set ($b = true)
-								#if ($contextsCount == 0)
+								#if ($contextsCount == 0 || $contextsCount == 1)
 									<tr>
-										<td class="linenumber" title=""></td>
-										<td class="colnumber" title=""></td>
-										<td class="codeContext" title=""></td>
-										<td class="error level$message.Level" id="$messageId">
+										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
+										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
+										<td class="codeContext" title="$context_token">
+											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
+											$!esc.html($!{context.Context})
+										</td>
+										<td class="error level$message.Level message" id="$messageId">
 											<span class="msg">$!esc.html($message.Title)</span>
 											#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
 										</td>
@@ -296,11 +313,13 @@
 									<tr>
 										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
 										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
-										<td class="codeContext" title="$context_token">$!esc.html($!{context.Context})</td>
-										
+										<td class="codeContext" title="$context_token">
+											#if($context.URI && $context.URI != $uri) <a class="direct_link" href="$context.URI" title="$context.URI">link</a> #end
+											$!esc.html($!{context.Context})
+										</td>
 										#if ($b)
 										#set ($b = false)
-										<td class="error level$message.Level" id="$messageId" rowspan="$message.getContexts().size()">
+										<td class="error level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
 											<span class="msg">$!esc.html($message.Title)</span>
 											#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
 										</td>
@@ -341,12 +360,12 @@
 							#set ($messageId = "${observationName}_warning_${uriCount}_$velocityCount")
 							#set ($contextsCount = $message.getContexts().size())
 							#set ($b = true)
-								#if ($contextsCount == 0)
+								#if ($contextsCount == 0 || $contextsCount == 1)
 									<tr>
-										<td class="linenumber" title=""></td>
-										<td class="colnumber" title=""></td>
+										<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
+										<td class="colnumber" title="#if($context.Column)$column_token $context.Column#end">$!context.Column</td>
 										<td class="codeContext" title=""></td>
-										<td class="warning level$message.Level" id="$messageId">
+										<td class="warning level$message.Level message" id="$messageId">
 											<span class="msg">$!esc.html($message.Title)</span>
 											#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
 										</td>
@@ -361,7 +380,7 @@
 										
 										#if ($b)
 										#set ($b = false)
-										<td class="warning level$message.Level" id="$messageId" rowspan="$message.getContexts().size()">
+										<td class="warning level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
 											<span class="msg">$!esc.html($message.Title)</span>
 											#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
 										</td>

Received on Wednesday, 21 October 2009 15:12:01 UTC