- From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 22 Oct 2009 12:58:07 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates
In directory hutz:/tmp/cvs-serv386/WebContent/WEB-INF/resources/templates
Modified Files:
language.vm index.vm xhtml10.vm language.form.vm
Log Message:
uses compressed version of scripts and css
+ fixed a bug where no context was displayed in case of a single context
Index: language.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/language.vm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- language.vm 21 Oct 2009 17:12:50 -0000 1.16
+++ language.vm 22 Oct 2009 12:58:05 -0000 1.17
@@ -1,6 +1,6 @@
#set ($title = "Unicorn - Translations")
-#set ($css = ['base_ucn.css'])
-#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_languages.js'])
+#set ($css = ['base_ucn-yc.css'])
+#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_languages-yc.js'])
#parse('head.vm')
#if ($messages)
Index: language.form.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/language.form.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- language.form.vm 21 Oct 2009 17:12:50 -0000 1.8
+++ language.form.vm 22 Oct 2009 12:58:05 -0000 1.9
@@ -1,6 +1,6 @@
#set ($title = "Unicorn - Translations")
-#set ($css = ['base_ucn.css'])
-#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_languages.js'])
+#set ($css = ['base_ucn-yc.css'])
+#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_languages-yc.js'])
#parse('head.vm')
#if ($messages)
Index: index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/index.vm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- index.vm 21 Oct 2009 17:12:50 -0000 1.17
+++ index.vm 22 Oct 2009 12:58:05 -0000 1.18
@@ -1,6 +1,6 @@
#set ($title = "Unicorn")
-#set ($css = ['base_ucn.css'])
-#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_index.js'])
+#set ($css = ['base_ucn-yc.css'])
+#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_index-yc.js'])
#parse('head.vm')
#if ($messages)
Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/xhtml10.vm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- xhtml10.vm 21 Oct 2009 17:12:50 -0000 1.41
+++ xhtml10.vm 22 Oct 2009 12:58:05 -0000 1.42
@@ -1,6 +1,6 @@
#set ($title = "$ucn.evaluate($lang, 'result_for', $unicorncall.DocumentName)")
-#set ($css = ['base_ucn.css'])
-#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_results.js'])
+#set ($css = ['base_ucn-yc.css'])
+#set ($js = ['mootools-1.2.3-core+more-yc.js', 'w3c_unicorn_results-yc.js'])
#if ($unicorncall.isPassed())
#set ($fav = "favicon_green.ico")
#else
@@ -75,25 +75,19 @@
#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 || $contextsCount == 1)
+ #if ($contextsCount == 0)
<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">
- #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)
- </span>
+ <td class="linenumber" title=""></td>
+ <td class="colnumber" title=""></td>
+ <td class="codeContext" title="$context_token"></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>
<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
</tr>
#else
- #set ($b = true)
+ #set ($rowspan = $message.getContexts().size())
#foreach($context in $message.getContexts())
<tr>
<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
@@ -102,16 +96,14 @@
#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 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)
- </span>
+ <td class="info level$message.Level message" id="$messageId" #if($rowspan>1) rowspan="$rowspan" #end>
+ <span class="msg">$!esc.html($message.Title)</span>
#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
</td>
- <td class="anchor" rowspan="$message.getContexts().size()"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
+ <td class="anchor" #if($rowspan>1) rowspan="$rowspan" #end><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
#end
</tr>
#end
@@ -147,43 +139,35 @@
#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 || $contextsCount == 1)
+ #if ($contextsCount == 0)
<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">
- #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)
- </span>
+ <td class="linenumber" title=""></td>
+ <td class="colnumber" title=""></td>
+ <td class="codeContext" title="$context_token"></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>
<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
</tr>
#else
- #set ($b = true)
+ #set ($rowspan = $message.getContexts().size())
#foreach($context in $message.getContexts())
<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">
+ <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="$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)
- </span>
+ <td class="info level$message.Level message" id="$messageId" #if($rowspan>1) rowspan="$rowspan" #end>
+ <span class="msg">$!esc.html($message.Title)</span>
#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
</td>
- <td class="anchor" rowspan="$message.getContexts().size()"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
+ <td class="anchor" #if($rowspan>1) rowspan="$rowspan" #end><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
#end
</tr>
#end
@@ -227,14 +211,11 @@
#set ($messageId = "${observationName}_info_${uriCount}_$velocityCount")
#set ($contextsCount = $message.getContexts().size())
#set ($b = true)
- #if ($contextsCount == 0 || $contextsCount == 1)
+ #if ($contextsCount == 0)
<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">
- #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="linenumber" title=""></td>
+ <td class="colnumber" title=""></td>
+ <td class="codeContext" title="$context_token"></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
@@ -242,6 +223,7 @@
<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
</tr>
#else
+ #set ($rowspan = $message.getContexts().size())
#foreach($context in $message.getContexts())
<tr>
<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
@@ -253,11 +235,11 @@
#if ($b)
#set ($b = false)
- <td class="info level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
+ <td class="info level$message.Level message" id="$messageId" #if($rowspan>1) rowspan="$rowspan" #end>
<span class="msg">$!esc.html($message.Title)</span>
#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
</td>
- <td class="anchor" rowspan="$message.getContexts().size()"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
+ <td class="anchor" #if($rowspan>1) rowspan="$rowspan" #end><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
#end
</tr>
#end
@@ -294,21 +276,19 @@
#set ($messageId = "${observationName}_error_${uriCount}_$velocityCount")
#set ($contextsCount = $message.getContexts().size())
#set ($b = true)
- #if ($contextsCount == 0 || $contextsCount == 1)
+ #if ($contextsCount == 0)
<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">
- #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">
+ <td class="linenumber" title=""></td>
+ <td class="colnumber" title=""></td>
+ <td class="codeContext" title="$context_token"></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>
<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
</tr>
#else
+ #set ($rowspan = $message.getContexts().size())
#foreach($context in $message.getContexts())
<tr>
<td class="linenumber" title="#if($context.Line)$line_token $context.Line#end">$!context.Line</td>
@@ -317,13 +297,14 @@
#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 message" id="$messageId" rowspan="$message.getContexts().size()">
+ <td class="info level$message.Level message" id="$messageId" #if($rowspan>1) rowspan="$rowspan" #end>
<span class="msg">$!esc.html($message.Title)</span>
#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
</td>
- <td class="anchor" rowspan="$message.getContexts().size()"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
+ <td class="anchor" #if($rowspan>1) rowspan="$rowspan" #end><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
#end
</tr>
#end
@@ -360,31 +341,35 @@
#set ($messageId = "${observationName}_warning_${uriCount}_$velocityCount")
#set ($contextsCount = $message.getContexts().size())
#set ($b = true)
- #if ($contextsCount == 0 || $contextsCount == 1)
+ #if ($contextsCount == 0)
<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=""></td>
- <td class="warning level$message.Level message" id="$messageId">
+ <td class="linenumber" title=""></td>
+ <td class="colnumber" title=""></td>
+ <td class="codeContext" title="$context_token"></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>
<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
</tr>
#else
+ #set ($rowspan = $message.getContexts().size())
#foreach($context in $message.getContexts())
<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="warning level$message.Level message" id="$messageId" rowspan="$message.getContexts().size()">
+ <td class="info level$message.Level message" id="$messageId" #if($rowspan>1) rowspan="$rowspan" #end>
<span class="msg">$!esc.html($message.Title)</span>
#if($message.Description && $message.Description != "")<div class="description">$!message.Description</div>#end
</td>
- <td class="anchor" rowspan="$message.getContexts().size()"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
+ <td class="anchor" #if($rowspan>1) rowspan="$rowspan" #end><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
#end
</tr>
#end
Received on Thursday, 22 October 2009 12:58:11 UTC