Author: vmassol
Date: 2008-02-07 11:38:51 +0100 (Thu, 07 Feb 2008)
New Revision: 7338
Added:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanelsvars.vm
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanelsvars.vm
Removed:
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanels.vm
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanels.vm
Log:
XSALBATROSS-5: Allow skins extending Albatross the ability to specify their own
edit panels lists
XSTOUCAN-1: Create Toucan skin from xwiki.org
* Removed the editpanels.vm
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanels.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanels.vm
2008-02-07 10:22:04 UTC (rev 7337)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanels.vm
2008-02-07 10:38:51 UTC (rev 7338)
@@ -1,16 +1,23 @@
+## This template is necessary so that different skins can use different edit
Panels.
+## Thus each skin is allowed to override the editpanelsvars.vm file.
+#template("editpanelsvars.vm")
#if($editor == "wiki" || $editor == "wysiwyg")
-#set($editorPanels =
"Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp")
+ #set($editorPanels = $editorPanelsWiki)
+#elseif($editor == "wysiwyg")
+ #set($editorPanels = $editorPanelsWysiwyg)
#elseif($editor == "object")
-#set($editorPanels = "Panels.ObjectEditorWelcome,Panels.AddObject")
+ #set($editorPanels = $editorPanelsObjects)
#elseif($editor == "class")
-#set($editorPanels = "Panels.ClassEditorWelcome,Panels.AddClassProperty")
+ #set($editorPanels = $editorPanelsClass)
#elseif($editor == "rights")
-#set($editorPanels =
"Panels.RightsEditorWelcome,Panels.RightsHelp,Panels.RightsTips")
+ #set($editorPanels = $editorPanelsRights)
+#elseif($editor == "history")
+ #set($editorPanels = $editorPanelsHistory)
#end
#set($editorPanels = $editorPanels.split(","))
<div id="editPanels" class="panels editor">
#foreach($panel in $editorPanels)
-#displaypanel($panel)
+ #displaypanel($panel)
#end
</div>
#if($editor == "wysiwyg")
Added:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanelsvars.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanelsvars.vm
(rev 0)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editpanelsvars.vm
2008-02-07 10:38:51 UTC (rev 7338)
@@ -0,0 +1,8 @@
+## Define variables containing the list of edit panels for the Albatross skin
+#set($editorPanelsWiki =
"Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp")
+#set($editorPanelsWysiwyg =
"Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp")
+#set($editorPanelsObjects = "Panels.ObjectEditorWelcome,Panels.AddObject")
+#set($editorPanelsClass = "Panels.ClassEditorWelcome,Panels.AddClassProperty")
+#set($editorPanelsRights =
"Panels.RightsEditorWelcome,Panels.RightsHelp,Panels.RightsTips")
+## No Panels for the histoty editor mode in Albatross
+#set($editorPanelsHistory = "")
\ No newline at end of file
Deleted:
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanels.vm
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanels.vm
2008-02-07 10:22:04 UTC (rev 7337)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanels.vm
2008-02-07 10:38:51 UTC (rev 7338)
@@ -1,30 +0,0 @@
-#if($editor == "wiki" || $editor == "wysiwyg")
-#set($editorPanels =
"Panels.EditModes,Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp")
-#elseif($editor == "object")
-#set($editorPanels =
"Panels.EditModes,Panels.ObjectEditorWelcome,Panels.AddObject")
-#elseif($editor == "class")
-#set($editorPanels =
"Panels.EditModes,Panels.ClassEditorWelcome,Panels.AddClassProperty")
-#elseif($editor == "rights")
-#set($editorPanels =
"Panels.EditModes,Panels.RightsEditorWelcome,Panels.RightsHelp,Panels.RightsTips")
-#elseif($editor == "history")
-#set($editorPanels =
"Panels.EditModes,Panels.RightsEditorWelcome,Panels.RightsHelp,Panels.RightsTips")
-#end
-#set($editorPanels = $editorPanels.split(","))
-<div id="editPanels" class="panels editor">
-#foreach($panel in $editorPanels)
-#displaypanel($panel)
-#end
-</div>
-#if($editor == "wysiwyg")
-<script type="text/javascript">
-//<![CDATA[
- if (browser.isIE || browser.isMozilla || browser.isGecko ||
browser.isSafari) {
- var panels = document.getElementById("editPanels");
- if(document.getElementById("xwikisyntaxhelppanel"))
- panels.removeChild(document.getElementById("xwikisyntaxhelppanel"));
- if (document.getElementById("simpleedittoolbar"))
- document.getElementById("simpleedittoolbar").style.display = "none";
- }
-//]]>
-</script>
-#end
Added:
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanelsvars.vm
===================================================================
---
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanelsvars.vm
(rev 0)
+++
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/editpanelsvars.vm
2008-02-07 10:38:51 UTC (rev 7338)
@@ -0,0 +1,7 @@
+## Define variables containing the list of edit panels for the Toucan skin
+#set($editorPanelsWiki =
"Panels.EditModes,Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp")
+#set($editorPanelsWysiwyg =
"Panels.EditModes,Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp")
+#set($editorPanelsObjects =
"Panels.EditModes,Panels.ObjectEditorWelcome,Panels.AddObject")
+#set($editorPanelsClass =
"Panels.EditModes,Panels.ClassEditorWelcome,Panels.AddClassProperty")
+#set($editorPanelsRights =
"Panels.EditModes,Panels.RightsEditorWelcome,Panels.RightsHelp,Panels.RightsTips")
+#set($editorPanelsHistory = "Panels.EditModes")
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
