Changeset 692:4e44501ed9ef

Timestamp:

10/07/09 12:16:45 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@693

Message:

removed punctuation

Location:

WebContent/WEB-INF/resources/templates

Files:

• text.error.vm (modified) (2 diffs)
• text.vm (modified) (5 diffs)

WebContent/WEB-INF/resources/templates/text.error.vm

@@ -1 +1 @@
 #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
-#foreach ($message in $messages)
-#if ($message.Level == "WARNING")
-Warning:
-        #evaluate($message.Message)
-        $!{message.Content}
-#end
-#end
-#foreach ($message in $messages)
-#if ($message.Level == "INFO")
-Info:
         #evaluate($message.Message)
         $!{message.Content}
@@ -22 +10 @@
 #end
 #end
+
+#if ($messages.hasWarning())
+$warning_label
+#foreach ($message in $messages)
+#if ($message.Level == "WARNING")
+        #evaluate($message.Message)
+        $!{message.Content}
+#end
+#end
+#end
+
+#if ($messages.hasInfo())
+$info_label
+#foreach ($message in $messages)
+#if ($message.Level == "INFO")
+        #evaluate($message.Message)
+        $!{message.Content}
+#end
+#end
+#end
+
+#end

WebContent/WEB-INF/resources/templates/text.vm

@@ -1 +1 @@
 #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
 
@@ -32 +42 @@
 #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
@@ -43 +53 @@
 #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)
 
@@ -71 +81 @@
 #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)
 
@@ -99 +109 @@
 #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)