XWIKI-6504: Convert Panels application into syntax 2.0

Done almost all documents, only the panel wizard remains.
xwiki · Jun 16, 2011 · 2e4b542 · 2e4b542
1 parent 2a95806
commit 2e4b542
Show file tree

Hide file tree

Showing 37 changed files with 1,529 additions and 2,405 deletions.
diff --git a/...i-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties b/...i-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
@@ -1228,6 +1228,7 @@ panels.translation.title=Document translations
 panels.translation.editingOriginal=You are editing the original document ({0}).
 panels.translation.editingTranslation=You are editing the following translation: {0}.
 panels.translation.originalLanguage=The original language of the document is <a href="{0}">{1}</a>.
+panels.translation.editOriginalLanguage=The original language of the document is {0}.
 panels.translation.translate=Translate this document in:
 panels.translation.otherTranslations=Other translations:
 panels.translation.existingTranslations=Existing translations:
@@ -1240,7 +1241,7 @@ panelwizard.panelwizard=Panel Wizard
 panelwizard.placemanager=Place Manager
 panelwizard.notadmininplace=You are not admin on this place {0}.
 panelwizard.panellayoutupdate=Panel Layout Update
-panelwizard.nodirectaccess=This page is not supposed to be accessed directly. Please use {0}.
+panelwizard.nodirectaccess=This page is not supposed to be accessed directly. Please use the {0}.
 panelwizard.panellist=Panel List
 panelwizard.pagelayout=Page Layout
 panelwizard.nopanels=There are no panels from this category.
@@ -1253,6 +1254,7 @@ panelwizard.needadminright=You need to have administrative rights to use the Pan
 panelwizard.paneleditor=Panel Editor
 panelwizard.tip=To drag a panel, use your mouse and click on the header of the panel. Keep your left mouse button down while you move your mouse and the panel at the same time. While you move the panel you will see in real-time where the panel will be dropped when you release your left mouse button.
 panelwizard.draganddrop=Drag and drop panels to rearrange them inside a column or between columns. To add or remove panels, drag them from the list of available panels to one of the columns or from the column into the list, respectively.
+panelwizard.save.versionComment=Updated panel layout
 
 #tooltip for fullscreen editing
 fullScreenTooltip=Edit in Full Screen

diff --git a/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/AddClassProperty.xml b/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/AddClassProperty.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <xwikidoc>
 <web>Panels</web>
 <name>AddClassProperty</name>
@@ -21,7 +20,7 @@
 <validationScript></validationScript>
 <comment></comment>
 <minorEdit>false</minorEdit>
-<syntaxId>xwiki/1.0</syntaxId>
+<syntaxId>xwiki/2.0</syntaxId>
 <hidden>false</hidden>
 <object>
 <class>
@@ -35,6 +34,7 @@
 <validationScript></validationScript>
 <category>
 <cache>0</cache>
+<disabled>0</disabled>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
 <name>category</name>
@@ -49,6 +49,7 @@
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </category>
 <content>
+<disabled>0</disabled>
 <editor>Text</editor>
 <name>content</name>
 <number>4</number>
@@ -59,6 +60,7 @@
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </content>
 <description>
+<disabled>0</disabled>
 <editor>Text</editor>
 <name>description</name>
 <number>3</number>
@@ -69,6 +71,7 @@
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </description>
 <name>
+<disabled>0</disabled>
 <name>name</name>
 <number>1</number>
 <prettyName>Name</prettyName>
@@ -78,6 +81,7 @@
 </name>
 <type>
 <cache>0</cache>
+<disabled>0</disabled>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
 <name>type</name>
@@ -100,25 +104,29 @@
 <category>Tools</category>
 </property>
 <property>
-<content>#largepanelheader($msg.get("addproperty"))
-&lt;form id="propadd" method="post" action="$doc.getURL("propadd")" onsubmit="cancelCancelEdit()"&gt;
+<content>{{velocity}}
+#largepanelheader($msg.get('addproperty'))
+{{html}}
+&lt;form id="propadd" method="post" action="$doc.getURL('propadd')" onsubmit="cancelCancelEdit()"&gt;
 &lt;div class="padded"&gt;
 &lt;input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" /&gt;
-&lt;input type="hidden" name="xredirect" value="$doc.getURL("edit", "editor=class")"/&gt;
-&lt;label for="propname"&gt;$msg.get("propname"):&lt;/label&gt;&lt;br /&gt;
+&lt;input type="hidden" name="xredirect" value="$doc.getURL('edit', 'editor=class')"/&gt;
+&lt;label for="propname"&gt;$msg.get('propname'):&lt;/label&gt;&lt;br /&gt;
 &lt;input type="text" id="propname" name="propname" value="" size="20" /&gt;&lt;br /&gt;
-&lt;label for="proptype"&gt;$msg.get("proptype"):&lt;/label&gt;&lt;br /&gt;
+&lt;label for="proptype"&gt;$msg.get('proptype'):&lt;/label&gt;&lt;br /&gt;
 &lt;select id="proptype" name="proptype" size="1"&gt;
-&lt;option value="---"&gt;$msg.get("selectproptype")&lt;/option&gt;
+&lt;option value="---"&gt;$msg.get('selectproptype')&lt;/option&gt;
 #foreach($prop in $xwiki.metaclass.properties)
 &lt;option value="$prop.name"&gt;$prop.prettyName&lt;/option&gt;
 #end
 &lt;/select&gt;
 &lt;span class="buttonwrapper"&gt;
-&lt;input type="submit" class="button" value="$msg.get("addproperty")"/&gt;&lt;/span&gt;
+&lt;input type="submit" class="button" value="$msg.get('addproperty')"/&gt;&lt;/span&gt;
 &lt;/div&gt;
 &lt;/form&gt;
-#panelfooter()</content>
+{{/html}}
+#panelfooter()
+{{/velocity}}</content>
 </property>
 <property>
 <description>Form which allows adding a class property.</description>
@@ -130,5 +138,4 @@
 <type>edit</type>
 </property>
 </object>
-<content>#includeForm("Panels.PanelSheet")</content>
-</xwikidoc>
+<content>{{include document="Panels.PanelSheet"/}}</content></xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/AddObject.xml b/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/AddObject.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <xwikidoc>
 <web>Panels</web>
 <name>AddObject</name>
@@ -21,7 +20,7 @@
 <validationScript></validationScript>
 <comment></comment>
 <minorEdit>false</minorEdit>
-<syntaxId>xwiki/1.0</syntaxId>
+<syntaxId>xwiki/2.0</syntaxId>
 <hidden>false</hidden>
 <object>
 <class>
@@ -35,6 +34,7 @@
 <validationScript></validationScript>
 <category>
 <cache>0</cache>
+<disabled>0</disabled>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
 <name>category</name>
@@ -49,6 +49,7 @@
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </category>
 <content>
+<disabled>0</disabled>
 <editor>Text</editor>
 <name>content</name>
 <number>4</number>
@@ -59,6 +60,7 @@
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </content>
 <description>
+<disabled>0</disabled>
 <editor>Text</editor>
 <name>description</name>
 <number>3</number>
@@ -69,6 +71,7 @@
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </description>
 <name>
+<disabled>0</disabled>
 <name>name</name>
 <number>1</number>
 <prettyName>Name</prettyName>
@@ -78,6 +81,7 @@
 </name>
 <type>
 <cache>0</cache>
+<disabled>0</disabled>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
 <name>type</name>
@@ -100,42 +104,46 @@
 <category>Tools</category>
 </property>
 <property>
-<content>#largepanelheader($msg.get("addobject"))
-&lt;form id="objectadd" method="post" action="$doc.getURL("objectadd")" onsubmit="cancelCancelEdit()"&gt;
+<content>{{velocity}}
+#largepanelheader($msg.get('addobject'))
+{{html}}
+&lt;form id="objectadd" method="post" action="$doc.getURL('objectadd')" onsubmit="cancelCancelEdit()"&gt;
 &lt;p&gt;
 &lt;input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" /&gt;
-&lt;input type="hidden" name="xredirect" value="$doc.getURL("edit", "editor=object")" /&gt;
+&lt;input type="hidden" name="xredirect" value="$doc.getURL('edit', 'editor=object')" /&gt;
 &lt;select name="classname" size="1"&gt;
-&lt;option value="---"&gt;$msg.get("selectclass")&lt;/option&gt;
+&lt;option value="---"&gt;$msg.get('selectclass')&lt;/option&gt;
 ##
 ## Existing classes are enumerated, grouped by space name.
 ## The list is already sorted alphabetically
 ##
-#set($prevSpace = "")
-#set($optGroupOpen = false)
+#set ($prevSpace = '')
+#set ($optGroupOpen = false)
 #foreach ($classname in $xwiki.classList)
-  #set($classdoc = $xwiki.getDocument($classname))
-  #if($classdoc.space != $prevSpace)
-    #if($optGroupOpen)
+  #set ($classdoc = $xwiki.getDocument($classname))
+  #if ($classdoc.space != $prevSpace)
+    #if ($optGroupOpen)
       &lt;/optgroup&gt;
     #else
       #set($optGroupOpen = true)
     #end
-        &lt;optgroup label="$classdoc.space"&gt;
+    &lt;optgroup label="$classdoc.space"&gt;
     #set($prevSpace = $classdoc.space)
   #end
   &lt;option value="$classdoc.fullName"&gt;$classdoc.name&lt;/option&gt;
 #end
 #if($optGroupOpen)
-        &lt;/optgroup&gt;
+  &lt;/optgroup&gt;
 #end
 &lt;/select&gt;
 &lt;/p&gt;
 &lt;p&gt;
-&lt;span class="buttonwrapper"&gt;&lt;input type="submit" value="$msg.get("addobjectfromclass")" class="button"/&gt;&lt;/span&gt;
+&lt;span class="buttonwrapper"&gt;&lt;input type="submit" value="$msg.get('addobjectfromclass')" class="button"/&gt;&lt;/span&gt;
 &lt;/p&gt;
 &lt;/form&gt;
-#panelfooter()</content>
+{{/html}}
+#panelfooter()
+{{/velocity}}</content>
 </property>
 <property>
 <description>Form which allows adding an object to a document.</description>
@@ -147,5 +155,4 @@
 <type>edit</type>
 </property>
 </object>
-<content>#includeForm("Panels.PanelSheet")</content>
-</xwikidoc>
+<content>{{include document="Panels.PanelSheet"/}}</content></xwikidoc>