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

2006/unicorn/WebContent/WEB-INF/resources/templates/includes head.vm,1.3,1.4 macros_index.vm,1.2,1.3

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 01 Sep 2009 13:39:43 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MiTaJ-0004ov-4p@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/includes
In directory hutz:/tmp/cvs-serv18414/WebContent/WEB-INF/resources/templates/includes

Modified Files:
	head.vm macros_index.vm 
Log Message:
added languages merging
+ messages on index

Index: head.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/includes/head.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- head.vm	28 Aug 2009 16:11:40 -0000	1.3
+++ head.vm	1 Sep 2009 13:39:40 -0000	1.4
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang">
 <head>
 	<title>$noEscape_title</title>
+	<link rel="shortcut icon" href="http://www.w3.org/2008/site/images/favicon.ico" type="image/x-icon" />
 	<link rev="start" href="./" title="Home Page" />
 #foreach( $sheet in $css )
 	<link href="./style/$sheet" type="text/css" media="screen" rel="stylesheet" />
@@ -12,7 +13,6 @@
 #end
 	
 	<link rev="made" href="mailto:www-validator@w3.org" />
-	<link rel="shortcut icon" href="http://www.w3.org/2008/site/images/favicon.ico" type="image/x-icon" />
 	<link rev="start" href="./" title="Home Page" />
 </head>
 <body>

Index: macros_index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/includes/macros_index.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- macros_index.vm	28 Aug 2009 12:40:10 -0000	1.2
+++ macros_index.vm	1 Sep 2009 13:39:41 -0000	1.3
@@ -1,3 +1,59 @@
+#macro(displayMessages $messages)
+<div id="messages">
+#foreach ($message in $messages)
+	#if ($message.Level == "ERROR")
+	<div class="error">
+		<h4>$message.Message</h4>
+		#if ($message.Content)
+		<pre>$message.Content</pre>
+		#end
+	</div>
+	#end
+#end
+#foreach ($message in $messages)
+	#if ($message.Level == "WARNING")
+	<div class="warning">
+		<h4>$message.Message</h4>
+		#if ($message.Content)
+		<pre>$message.Content</pre>
+		#end
+	</div>
+	#end
+#end
+#foreach ($message in $messages)
+	#if ($message.Level == "INFO")
+	<div class="info">
+		<h4>$message.Message</h4>
+		#if ($message.Content)
+		<pre>$message.Content</pre>
+		#end
+	</div>
+	#end
+#end
+</div>
+
+
+#end
+
+#macro(createParameter $param)
+#set($type = $param.getType())
+#if($type == "CHECKBOX")
+#createCheckbox($param)
+#elseif($type == "CHECKBOXLIST")
+#createCheckboxList($param)
+#elseif($type == "DROPDOWN")
+#createDropdown($param, false)
+#elseif($type == "DROPDOWNLIST")
+#createDropdown($param, true)
+#elseif($type == "RADIO")
+#createRadio($param, true)
+#elseif($type == "TEXTAREA")
+#createTextarea($param, true)
+#elseif($type == "TEXTFIELD")
+#createTextfield($param, true)
+#end
+#end
+
 #macro(createCheckbox $param)
 #set($defaults = $param.getMapOfDefaultValue())
 <label><span>$param.getLongName($lang):</span> 
@@ -54,21 +110,3 @@
 </label>
 #end
 
-#macro(createParameter $param)
-#set($type = $param.getType())
-#if($type == "CHECKBOX")
-#createCheckbox($param)
-#elseif($type == "CHECKBOXLIST")
-#createCheckboxList($param)
-#elseif($type == "DROPDOWN")
-#createDropdown($param, false)
-#elseif($type == "DROPDOWNLIST")
-#createDropdown($param, true)
-#elseif($type == "RADIO")
-#createRadio($param, true)
-#elseif($type == "TEXTAREA")
-#createTextarea($param, true)
-#elseif($type == "TEXTFIELD")
-#createTextfield($param, true)
-#end
-#end
\ No newline at end of file
Received on Tuesday, 1 September 2009 13:39:54 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:12 GMT