r952 - xwiki/trunk/src/main/web/templates

[Ludovic Dubost]

Author: ludovic
Date: 2006-03-01 10:58:17 +0100 (Wed, 01 Mar 2006)
New Revision: 952

Modified:
   xwiki/trunk/src/main/web/templates/viewheader.vm
Log:
Switch back edit prefs, objects, class and rights to "edit" action instead of "inline"

Modified: xwiki/trunk/src/main/web/templates/viewheader.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/viewheader.vm	2006-03-01 09:29:41 UTC (rev 951)
+++ xwiki/trunk/src/main/web/templates/viewheader.vm	2006-03-01 09:58:17 UTC (rev 952)
@@ -112,26 +112,26 @@
             #end
           #end
           #if (!$isReadOnly)
-            #xwikiitem($doc.getURL("inline") "editinline")
-            #xwikiitem($doc.getURL("inline", "xpage=editobject") "editobject")
+            #xwikiitem($doc.getURL("edit") "editinline")
+            #xwikiitem($doc.getURL("edit", "xpage=editobject") "editobject")
           #end
           #if(($hasadmin||($context.user.equals($doc.creator))) && !$isReadOnly)
             #xwikiitem($doc.getURL("delete") "delete")
           #end
           #if (!$isReadOnly)
             #xwikiitem($doc.getURL("chartwizard") "chartwizard")
-            #xwikiitem($doc.getURL("inline", "xpage=editrights") "editrights")
+            #xwikiitem($doc.getURL("edit", "xpage=editrights") "editrights")
           #end
         #end
 ## Admin section
         #if($hasadmin && !$isReadOnly)
           <div class="xwikimenutitle">$msg.get("admin")</div>
           #xwikiitem($xwiki.getURL("${doc.web}.WebHome", "view") "space")
-          #xwikiitem($xwiki.getURL("${doc.web}.WebPreferences", "inline", "xpage=editprefs") "webprefs")
-          #xwikiitem($xwiki.getURL("${doc.web}.WebPreferences", "inline" , "xpage=editrights&global=1") "webrights")
-          #xwikiitem($xwiki.getURL("XWiki.XWikiPreferences", "inline", "xpage=editprefs") "xwikiprefs")
-          #xwikiitem($xwiki.getURL("XWiki.XWikiPreferences", "inline", "xpage=editrights&global=1") "xwikirights")
-          #xwikiitem($doc.getURL("inline", "xpage=editclass") "classeditor")
+          #xwikiitem($xwiki.getURL("${doc.web}.WebPreferences", "edit", "xpage=editprefs") "webprefs")
+          #xwikiitem($xwiki.getURL("${doc.web}.WebPreferences", "edit" , "xpage=editrights&global=1") "webrights")
+          #xwikiitem($xwiki.getURL("XWiki.XWikiPreferences", "edit", "xpage=editprefs") "xwikiprefs")
+          #xwikiitem($xwiki.getURL("XWiki.XWikiPreferences", "edit", "xpage=editrights&global=1") "xwikirights")
+          #xwikiitem($doc.getURL("edit", "xpage=editclass") "classeditor")
         #end
 ## Help section
         <div class="xwikimenutitle">$msg.get("help")</div>