Author: vmassol
Date: 2007-09-28 14:25:11 +0200 (Fri, 28 Sep 2007)
New Revision: 5133
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/Backlinks
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelLayoutUpdate
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelTemplate
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelWizard
Log:
XAPANELS-36: Fix Velocity warnings
Patch submitted by Marius Florea
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/Backlinks
===================================================================
---
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/Backlinks
2007-09-28 11:26:46 UTC (rev 5132)
+++
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/Backlinks
2007-09-28 12:25:11 UTC (rev 5133)
@@ -137,7 +137,8 @@
<property>
<content>#set($blinks = $doc.getBacklinks())
#if($blinks.size()>0)
-#panelheader('Backlinks')
+#panelheader('Backlinks')
+#set($first = true)
#foreach($docname in $blinks)
#set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
#if($first == true)
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelLayoutUpdate
===================================================================
---
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelLayoutUpdate
2007-09-28 11:26:46 UTC (rev 5132)
+++
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelLayoutUpdate
2007-09-28 12:25:11 UTC (rev 5133)
@@ -24,7 +24,7 @@
#xwikimessageboxstart("Place Manager" "")
You are not admin on this place ($place).
#xwikimessageboxend()
-#elseif($request.xpage == "plain")
+#elseif($request.xpage and $request.xpage == "plain")
#if((!$place)||($place==""))
#set($prefsdoc = $xwiki.getDocument("XWiki.XWikiPreferences"))
#set($ok = $prefsdoc.use("XWiki.XWikiPreferences"))
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelTemplate
===================================================================
---
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelTemplate
2007-09-28 11:26:46 UTC (rev 5132)
+++
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelTemplate
2007-09-28 12:25:11 UTC (rev 5133)
@@ -93,6 +93,9 @@
<type>view</type>
</property>
<property>
+<category>Information</category>
+</property>
+<property>
<description>Panel Description</description>
</property>
<property>
@@ -101,7 +104,7 @@
#panelfooter()</content>
</property>
<property>
-<name>Panel Name</name>
+<name>Panel Name</name>
</property>
</object>
<content>#includeForm("Panels.PanelSheet")</content>
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelWizard
===================================================================
---
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelWizard
2007-09-28 11:26:46 UTC (rev 5132)
+++
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/PanelWizard
2007-09-28 12:25:11 UTC (rev 5133)
@@ -186,10 +186,10 @@
Choose a page layout:
#set($crtlayout = 0)
-#if($showLeftPanels == "1")
+#if($showLeftPanels and $showLeftPanels == "1")
#set($crtlayout = $crtlayout + 1)
#end
-#if($showRightPanels == "1")
+#if($showRightPanels and $showRightPanels == "1")
#set($crtlayout = $crtlayout + 2)
#end
<div class="pagelayoutoptions">
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications