Author: sdumitriu
Date: 2008-02-13 16:43:45 +0100 (Wed, 13 Feb 2008)
New Revision: 7609
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminprefs.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminprefs.vm
Log:
XWIKI-2114: Upgrade the default templates
XSALBATROSS-13: Move Albatross templates files to the XWiki Core templates
directory to share them with other skins
Deleted:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminprefs.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminprefs.vm
2008-02-13 15:43:28 UTC (rev 7608)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminprefs.vm
2008-02-13 15:43:45 UTC (rev 7609)
@@ -1,87 +0,0 @@
-###
-### Global preferences page in the "admin" mode
-###
-###
-##
-## Define sections
-##
-#set($sections = ["params", "skin", "presentation", "editing", "advanced",
"registration"])
-#set($sectionitemsmap = $xwiki.hashMap)
-#set($sectionitemsmap.params = ["multilingual", "languages" ,
"default_language", "authenticate_view", "authenticate_edit",
"auth_active_check" ])
-## #set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets",
"leftPanels", "rightPanels", "showLeftPanels", "showRightPanels", "pageWidth"])
-#set($sectionitemsmap.skin = ["skin", "stylesheet", "leftPanels",
"rightPanels", "showLeftPanels", "showRightPanels"])
-#set($sectionitemsmap.presentation = [ "title", "version", "webcopyright",
"meta" ])
-#set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"])
-#set($sectionitemsmap.advanced = ["macros_languages",
"macros_velocity","macros_groovy", "macros_mapping", "notification_pages",
"documentBundles" ])
-#set($sectionitemsmap.registration = [ "use_email_verification",
"admin_email", "smtp_server", "validation_email_content",
"confirmation_email_content", "invitation_email_content"])
-##
-## Define the macro that displays the options in a category
-##
-#macro(showsection $section $sectionitemsmap)
- <div id="xwikiprefs${section}">
- <div id="xwikiprefs${section}Header"
class="accordionTabTitleBar"><h6>$msg.get($section)</h6></div>
- <div id="xwikiprefs${section}Content" class="accordionTabContentBox">
- <div class="padded">
-<dl>
-#set($sectionitems = $sectionitemsmap.get($section))
-#foreach($item in $sectionitems)
-#set($prop = $obj.xWikiClass.get($item))
-#set($title = $msg.get($item))
-#if($title == $item)
-#if($prop)
-#set($title = $!prop.prettyName)
-#end
-#end
-<dt>${title}:</dt>
-<dd>
-#if($prop)
-$doc.displayEdit($prop, "${class.name}_${obj.number}_", $obj)
-#if($item=="skin")
-#set($skin = $xwiki.skin)
-#if($skin.indexOf(".")!=-1)
-#set($skindoc = $xwiki.getDocument($skin))
-<span class="xwikibuttonlink"><a href="$skindoc.getURL()">Customize</a></span>
-#end
-#end
-#end
-</dd>
-#end
-</dl>
- </div>
- </div>
- </div>
-#end
-##
-##########
-##
-## Content
-##
-#set($formname = "update")
-#set($saveaction = "save")
-<form id="update" method="post" action="$doc.getURL("save")"
onsubmit="cancelCancelEdit()">
-<div id="xwikieditcontent">
-#set($redirect = "$xwiki.getRequestURL()")
-#set($classname = "XWiki.XWikiPreferences")
-#set($class = $xwiki.getDocument($classname).xWikiClass)
-#set($obj = $doc.getObject($classname, 0))
-#if(!$obj)
-#set($redirect = $xwiki.getRequestURL())
-$response.sendRedirect($doc.getURL("objectadd",
"classname=XWiki.XWikiPreferences&XWiki.XWikiPreferences_upload_maxsize=33554432&xredirect=$xwiki.getFormEncoded($redirect)"))
-#end
-<div class="hidden">
-<input type="hidden" name="xcontinue" value="$doc.getURL("admin",
"editor=prefs")"/>
-<input type="hidden" name="xredirect" value="$xwiki.getURL("Main.WebHome")"/>
-<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
-<input type="hidden" name="global" value="1" />
-</div>
-<div>
-<div id="xwikiprefs">
-#foreach($section in $sections)
-#showsection($section $sectionitemsmap)
-#end
-</div> ## xwikiprefs
-<script type="text/javascript">new Rico.Accordion( 'xwikiprefs', {
panelHeight:'max', maxHeight: 320} );</script>
-</div> ## noname
-</div> ## xwikieditcontent
-<div class="bottombuttons">#template("adminactions.vm")</div>
-</form>
\ No newline at end of file
Copied:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminprefs.vm (from
rev 7608,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminprefs.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminprefs.vm
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminprefs.vm
2008-02-13 15:43:45 UTC (rev 7609)
@@ -0,0 +1,87 @@
+###
+### Global preferences page in the "admin" mode
+###
+###
+##
+## Define sections
+##
+#set($sections = ["params", "skin", "presentation", "editing", "advanced",
"registration"])
+#set($sectionitemsmap = $xwiki.hashMap)
+#set($sectionitemsmap.params = ["multilingual", "languages" ,
"default_language", "authenticate_view", "authenticate_edit",
"auth_active_check" ])
+## #set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets",
"leftPanels", "rightPanels", "showLeftPanels", "showRightPanels", "pageWidth"])
+#set($sectionitemsmap.skin = ["skin", "stylesheet", "leftPanels",
"rightPanels", "showLeftPanels", "showRightPanels"])
+#set($sectionitemsmap.presentation = [ "title", "version", "webcopyright",
"meta" ])
+#set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"])
+#set($sectionitemsmap.advanced = ["macros_languages",
"macros_velocity","macros_groovy", "macros_mapping", "notification_pages",
"documentBundles" ])
+#set($sectionitemsmap.registration = [ "use_email_verification",
"admin_email", "smtp_server", "validation_email_content",
"confirmation_email_content", "invitation_email_content"])
+##
+## Define the macro that displays the options in a category
+##
+#macro(showsection $section $sectionitemsmap)
+ <div id="xwikiprefs${section}">
+ <div id="xwikiprefs${section}Header"
class="accordionTabTitleBar"><h6>$msg.get($section)</h6></div>
+ <div id="xwikiprefs${section}Content" class="accordionTabContentBox">
+ <div class="padded">
+<dl>
+#set($sectionitems = $sectionitemsmap.get($section))
+#foreach($item in $sectionitems)
+#set($prop = $obj.xWikiClass.get($item))
+#set($title = $msg.get($item))
+#if($title == $item)
+#if($prop)
+#set($title = $!prop.prettyName)
+#end
+#end
+<dt>${title}:</dt>
+<dd>
+#if($prop)
+$doc.displayEdit($prop, "${class.name}_${obj.number}_", $obj)
+#if($item=="skin")
+#set($skin = $xwiki.skin)
+#if($skin.indexOf(".")!=-1)
+#set($skindoc = $xwiki.getDocument($skin))
+<span class="xwikibuttonlink"><a href="$skindoc.getURL()">Customize</a></span>
+#end
+#end
+#end
+</dd>
+#end
+</dl>
+ </div>
+ </div>
+ </div>
+#end
+##
+##########
+##
+## Content
+##
+#set($formname = "update")
+#set($saveaction = "save")
+<form id="update" method="post" action="$doc.getURL("save")"
onsubmit="cancelCancelEdit()">
+<div id="xwikieditcontent">
+#set($redirect = "$xwiki.getRequestURL()")
+#set($classname = "XWiki.XWikiPreferences")
+#set($class = $xwiki.getDocument($classname).xWikiClass)
+#set($obj = $doc.getObject($classname, 0))
+#if(!$obj)
+#set($redirect = $xwiki.getRequestURL())
+$response.sendRedirect($doc.getURL("objectadd",
"classname=XWiki.XWikiPreferences&XWiki.XWikiPreferences_upload_maxsize=33554432&xredirect=$xwiki.getFormEncoded($redirect)"))
+#end
+<div class="hidden">
+<input type="hidden" name="xcontinue" value="$doc.getURL("admin",
"editor=prefs")"/>
+<input type="hidden" name="xredirect" value="$xwiki.getURL("Main.WebHome")"/>
+<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
+<input type="hidden" name="global" value="1" />
+</div>
+<div>
+<div id="xwikiprefs">
+#foreach($section in $sections)
+#showsection($section $sectionitemsmap)
+#end
+</div> ## xwikiprefs
+<script type="text/javascript">new Rico.Accordion( 'xwikiprefs', {
panelHeight:'max', maxHeight: 320} );</script>
+</div> ## noname
+</div> ## xwikieditcontent
+<div class="bottombuttons">#template("adminactions.vm")</div>
+</form>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
