[xwiki-notifications] r5594 - xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross

[tmortagne (SVN)]

Author: tmortagne
Date: 2007-11-01 11:31:17 +0100 (Thu, 01 Nov 2007)
New Revision: 5594

Modified:
   xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
   xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
   xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm
   xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
   xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm
Log:
XWIKI-1780: Ad support of xwiki.cfg parameter "xwiki.rights.defaultui" to set default ui used between old one and new ajax one.

Modified: xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm	2007-11-01 10:29:39 UTC (rev 5593)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm	2007-11-01 10:31:17 UTC (rev 5594)
@@ -1,6 +1,9 @@
 #set($formname = "update")
 #set($saveaction = "save")
-#set($interface = "$!request.get('interface')")
+#set($interface = $request.get("interface"))
+#if(!$interface)
+  #set($interface = $xwiki.rightsmanager.defaultUi)
+#end
 <div id="xwikieditcontent">
 ## switch between the new and the old interface
 <select name="switchInterface" onchange="if(this.options[this.selectedIndex].value=='new') { location='?editor=globalrights&amp;space=${doc.space}&amp;interface=new';  } else if(this.options[this.selectedIndex].value=='stable') { location='?editor=globalrights&amp;space=${doc.space}&amp;interface=stable';  } ">

Modified: xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm	2007-11-01 10:29:39 UTC (rev 5593)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm	2007-11-01 10:31:17 UTC (rev 5594)
@@ -1,6 +1,9 @@
 #set($formname = "update")
 #set($saveaction = "save")
-#set($interface = "$!request.get('interface')")
+#set($interface = $request.get("interface"))
+#if(!$interface)
+  #set($interface = $xwiki.rightsmanager.defaultUi)
+#end
 <div id="xwikieditcontent">
 #set($url = "?xpage=getgroups")
 ## switch between the new and the old interface

Modified: xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm	2007-11-01 10:29:39 UTC (rev 5593)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm	2007-11-01 10:31:17 UTC (rev 5594)
@@ -1,6 +1,9 @@
 #set($formname = "update")
 #set($saveaction = "save")
-#set($interface = "$!request.get('interface')")
+#set($interface = $request.get("interface"))
+#if(!$interface)
+  #set($interface = $xwiki.rightsmanager.defaultUi)
+#end
 <div id="xwikieditcontent">
 ## switch between the new and the old interface
 <select name="switchInterface" onchange="if(this.options[this.selectedIndex].value=='new') { location='?editor=spacerights&amp;space=${doc.space}&amp;interface=new';  } else if(this.options[this.selectedIndex].value=='stable') { location='?editor=spacerights&amp;space=${doc.space}&amp;interface=stable';  } ">

Modified: xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm	2007-11-01 10:29:39 UTC (rev 5593)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm	2007-11-01 10:31:17 UTC (rev 5594)
@@ -1,6 +1,9 @@
 #set($formname = "update")
 #set($saveaction = "save")
-#set($interface = "$!request.get('interface')")
+#set($interface = $request.get("interface"))
+#if(!$interface)
+  #set($interface = $xwiki.rightsmanager.defaultUi)
+#end
 <div id="xwikieditcontent">
 ## switch between the new and the old interface
 <select name="switchInterface" onchange="if(this.options[this.selectedIndex].value=='new') { location='?editor=users&amp;space=XWiki&amp;interface=new';  } else if(this.options[this.selectedIndex].value=='stable') { location='?editor=users&amp;space=XWiki&amp;interface=stable';  } ">

Modified: xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm	2007-11-01 10:29:39 UTC (rev 5593)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm	2007-11-01 10:31:17 UTC (rev 5594)
@@ -1,6 +1,9 @@
 #set($formname = "update")
 #set($saveaction = "save")
-#set($interface = "$!request.get('interface')")
+#set($interface = $request.get("interface"))
+#if(!$interface)
+  #set($interface = $xwiki.rightsmanager.defaultUi)
+#end
 <div id="xwikieditcontent">## switch between the new and the old interface
 <select name="switchInterface" onchange="if(this.options[this.selectedIndex].value=='new') { location='?editor=rights&amp;interface=new';  } else if(this.options[this.selectedIndex].value=='stable') { location='?editor=rights&amp;interface=stable';  } ">
 <option value="choose" #if($interface == "") selected="selected" #end>Switch interface</option>