Author: sdumitriu
Date: 2008-02-13 16:44:05 +0100 (Wed, 13 Feb 2008)
New Revision: 7611

Added:
   
xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminspaceprefs.vm
Removed:
   
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminspaceprefs.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/adminspaceprefs.vm
===================================================================
--- 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminspaceprefs.vm
        2008-02-13 15:43:52 UTC (rev 7610)
+++ 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminspaceprefs.vm
        2008-02-13 15:44:05 UTC (rev 7611)
@@ -1,108 +0,0 @@
-###
-### Space preferences page in the "admin" mode
-###
-###
-##
-## Check if there is a valid XWikiPreferences object
-##
-#set($obj = $doc.getObject("XWiki.XWikiPreferences"))
-#if(!$obj)
-#set( $redirect = $xwiki.getRequestURL())
-$response.sendRedirect($doc.getURL("objectadd", 
"classname=XWiki.XWikiPreferences&xredirect=$xwiki.getFormEncoded($redirect)"))
-#end
-#####
-##
-## Surrounding divs
-##
-#set($formname = "update")
-#set($saveaction = "save")
-<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
-<div id="xwikieditcontent">
-##
-## Space changer
-##
-<div id="xwikichangespace">
-<p>$msg.get("editprefsforspace"): $space</p>
-<p>$msg.get("changespace"): <select name="space" 
onchange="location='?editor=spaceprefs&amp;global=1&amp;space=' + this.value;">
-<option value="" label="">---</option>
-#foreach($spaceitem in $xwiki.spaces)
-<option value="$spaceitem" label="$spaceitem">$spaceitem</option>
-#end
-</select></p>
-</div> ## xwikichangespace
-##
-## Define sections
-##
-#set($class = $obj.xWikiClass)
-#set($sections = ["params", "skin", "presentation", "editing", "advanced"])
-#set($sectionitemsmap = $xwiki.hashMap)
-#set($sectionitemsmap.params = ["multilingual", "languages", 
"default_language", "authenticate_view", "authenticate_edit", 
"auth_active_check", "parent" ])
-#set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets", 
"leftPanels", "rightPanels", "showLeftPanels", "showRightPanels", "pageWidth"])
-#set($sectionitemsmap.presentation = [ "title", "version", "webcopyright", 
"menu", "meta" ])
-#set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"])
-#set($sectionitemsmap.advanced = ["macros_languages", 
"macros_velocity","macros_groovy", "macros_mapping", "notification_pages" ])
-#####
-##
-## 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
-## End macro
-##
-#####
-##
-## Content
-##
-#set ($classname = "XWiki.XWikiPreferences")
-#set($class = $xwiki.getDocument($classname).xWikiClass)
-#set($obj = $doc.getObject($classname, 0))
-#set($redirect = "$xwiki.getRequestURL()")
-<div>
-<div class="hidden">
-<input type="hidden" name="xcontinue" value="$doc.getURL($context.action, 
"editor=spaceprefs&amp;global=1&amp;space=${doc.space}")"/>
-<input type="hidden" name="xredirect" 
value="$xwiki.getURL("${doc.space}.WebHome")"/>
-<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
-<input type="hidden" name="global" value="1" />
-</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>

Copied: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminspaceprefs.vm 
(from rev 7610, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/adminspaceprefs.vm)
===================================================================
--- 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminspaceprefs.vm  
                            (rev 0)
+++ 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/adminspaceprefs.vm  
    2008-02-13 15:44:05 UTC (rev 7611)
@@ -0,0 +1,108 @@
+###
+### Space preferences page in the "admin" mode
+###
+###
+##
+## Check if there is a valid XWikiPreferences object
+##
+#set($obj = $doc.getObject("XWiki.XWikiPreferences"))
+#if(!$obj)
+#set( $redirect = $xwiki.getRequestURL())
+$response.sendRedirect($doc.getURL("objectadd", 
"classname=XWiki.XWikiPreferences&xredirect=$xwiki.getFormEncoded($redirect)"))
+#end
+#####
+##
+## Surrounding divs
+##
+#set($formname = "update")
+#set($saveaction = "save")
+<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
+<div id="xwikieditcontent">
+##
+## Space changer
+##
+<div id="xwikichangespace">
+<p>$msg.get("editprefsforspace"): $space</p>
+<p>$msg.get("changespace"): <select name="space" 
onchange="location='?editor=spaceprefs&amp;global=1&amp;space=' + this.value;">
+<option value="" label="">---</option>
+#foreach($spaceitem in $xwiki.spaces)
+<option value="$spaceitem" label="$spaceitem">$spaceitem</option>
+#end
+</select></p>
+</div> ## xwikichangespace
+##
+## Define sections
+##
+#set($class = $obj.xWikiClass)
+#set($sections = ["params", "skin", "presentation", "editing", "advanced"])
+#set($sectionitemsmap = $xwiki.hashMap)
+#set($sectionitemsmap.params = ["multilingual", "languages", 
"default_language", "authenticate_view", "authenticate_edit", 
"auth_active_check", "parent" ])
+#set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets", 
"leftPanels", "rightPanels", "showLeftPanels", "showRightPanels", "pageWidth"])
+#set($sectionitemsmap.presentation = [ "title", "version", "webcopyright", 
"menu", "meta" ])
+#set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"])
+#set($sectionitemsmap.advanced = ["macros_languages", 
"macros_velocity","macros_groovy", "macros_mapping", "notification_pages" ])
+#####
+##
+## 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
+## End macro
+##
+#####
+##
+## Content
+##
+#set ($classname = "XWiki.XWikiPreferences")
+#set($class = $xwiki.getDocument($classname).xWikiClass)
+#set($obj = $doc.getObject($classname, 0))
+#set($redirect = "$xwiki.getRequestURL()")
+<div>
+<div class="hidden">
+<input type="hidden" name="xcontinue" value="$doc.getURL($context.action, 
"editor=spaceprefs&amp;global=1&amp;space=${doc.space}")"/>
+<input type="hidden" name="xredirect" 
value="$xwiki.getURL("${doc.space}.WebHome")"/>
+<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
+<input type="hidden" name="global" value="1" />
+</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>

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to