r1363 - xwiki/trunk/src/main/web/skins/xwiki10

[Jean-Vincent Drean]

Author: jvdrean
Date: 2006-10-04 17:04:19 +0200 (Wed, 04 Oct 2006)
New Revision: 1363

Modified:
   xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
Log:
cleaned macros.vm

Modified: xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/macros.vm	2006-10-04 14:12:31 UTC (rev 1362)
+++ xwiki/trunk/src/main/web/skins/xwiki10/macros.vm	2006-10-04 15:04:19 UTC (rev 1363)
@@ -152,39 +152,38 @@
 #macro(panelfooter)
 </div>
 </div>
-#end
-
-###
-###    Display Panel
-###
-### Extract and display the panel code from the panel object
-###
-#macro(displaypanel $name)
-#set($obj = "")
-#set($paneldoc = $xwiki.getDocument($name))
-#set($obj = $paneldoc.getObject("Panels.PanelClass"))
-#if($obj == "")
-## discarded
-#else
-$paneldoc.display("content", "view", $obj)
-#end
-#end
-#macro(displayPropName $prop)
-#if($msg.get("$class.getName()_$prop.name") ==
-"$class.getName()_$prop.name")
-$prop.prettyName#else
-$msg.get($prop.name)#end
-#end
-
-###
-###    Display Panel content
-###
-###
-#macro(displaypanelcontent $doc $obj)
-$doc.display("content", $obj)
 #end
 
 ###
+###    Display Panel
+###
+### Extract and display the panel code from the panel object
+###
+#macro(displaypanel $name)
+#set($obj = "")
+#set($paneldoc = $xwiki.getDocument($name))
+#set($obj = $paneldoc.getObject("Panels.PanelClass"))
+#if($obj == "")
+## discarded
+#else
+$paneldoc.display("content", "view", $obj)
+#end
+#end
+#macro(displayPropName $prop)
+#if($msg.get("$class.getName()_$prop.name") == "$class.getName()_$prop.name")
+$prop.prettyName#else
+$msg.get($prop.name)#end
+#end
+
+###
+###    Display Panel content
+###
+###
+#macro(displaypanelcontent $doc $obj)
+$doc.display("content", $obj)
+#end
+
+###
 ###    Toplevel Menu entry with subitems
 ###
 ### Generate a menu entry and start the subitem section