Author: sdumitriu
Date: 2008-02-13 19:54:21 +0100 (Wed, 13 Feb 2008)
New Revision: 7684

Removed:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editactions.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editclass.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editfooter.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editheader.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editprefs.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editrights.vm
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/edittoolbar.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/web/trunk/standard/src/main/webapp/templates/edit.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm 
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm 
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,122 +0,0 @@
-#set($hasedit = $xwiki.hasAccessLevel("edit"))
-#set($hasadmin = $xwiki.hasAdminRights())
-#set($showactions=1)
-#template("editheader.vm")
-#if($xwiki.exists("EditToolbar"))
-#set($toolbardoc = "EditToolbar")
-#else
-#if($xwiki.exists("XWiki.EditToolbar"))
-#set($toolbardoc = "XWiki.EditToolbar")
-#else
-#if($xwiki.exists("xwiki:XWiki.EditToolbar"))
-#set($toolbardoc = "xwiki:XWiki.EditToolbar")
-#end
-#end
-#end
-#if($toolbardoc)
-#set($colsclass = "hide-left")
-#else
-#set($colsclass = "hide-both")
-#end
-
-#set($switchParam = "xpage=wysiwyg")
-#if ($sectionNumber != 0)
-   #set($switchParam = "xpage=wysiwyg&section=$sectionNumber")
-#end
-
-<script language="javascript" type="text/javascript" 
src="${request.contextPath}/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript" 
src="${request.contextPath}/wiki_editor/wiki_editor.js"></script>
-
-<div id="xwikieditcontent" class="large">
-       <div id="columns">
-        <div class="cols-wrapper">
-          <div class="float-wrapper">
-            <div id="col-a">
-              <div class="main-content">
-#set($xredirect=$!request.getParameter("xredirect"))
-<form id="edit" method="post" action="$doc.getURL("preview")" >
-<p>
-<input type="hidden" name="template" value="$!request.template" />
-<input type="hidden" name="xredirect" value="$!xredirect" />
-<input type="hidden" name="language" value="$!tdoc.language" />
-</p>
-#set($force = $!request.get("force"))
-#if (($tdoc.getLocked()==true)&&(!$force))
-<p>
-$msg.get("doclockedby") $xwiki.getLocalUserName($doc.getLockingUser()).
-<br />
-<a href="$doc.getURL("edit", 
"$!request.getQueryString()&force=1")">$msg.get("forcelock")</a>
-</p>
-#else
-#set( $pages = $tdoc.includedPages)
-#if ( $pages.size() > 0)
-<p>
-$msg.get("editincludepagemsg")
-#foreach ($page in $pages)
-<a href="$xwiki.getURL($page, "edit")">$page</a>&nbsp;
-#end
-</p>
-#end
-<div id="xwikitext">
-#if ($xwiki.isMultiLingual()==true)
-$msg.get("youareediting"): $tdoc.language
-<br /><br />
-#end
-$msg.get("titlefield"):&nbsp;<input type="text" name="title" 
value="$!tdoc.title" size="60" />
-<br /><br />
-$msg.get("switchto") &nbsp; <span style="color: blue; cursor:pointer;" 
onclick="document.forms.edit.action='$doc.getURL("edit","$switchParam")'; if 
(document.forms.edit.onsubmit) document.forms.edit.onsubmit(); 
document.forms.edit.submit(); return 
false;"><u>$msg.get("wysiwygeditor")</u></span>
-<br />
-#includeHelp("EditWikiToolbar")
-$xwiki.getTextArea($tdoc.content)
-<br/>
-<script type="text/javascript">
-<!--
-function openHelp() {
-  win = open( 
"http://www.xwiki.org/xwiki/bin/view/UserGuide/XWikiSyntax?xpage=print";, "XWiki 
Syntax", "titlebar=0,width=750,height=480,resizable,scrollbars");
-  if( win ) {
-        win.focus();
-  }
-}
-// -->
-</script>
-$msg.get("helponsyntax") <a href="" onClick="openHelp(); return 
false;">$msg.get("xwikisyntax")</a>
-#if ($captchaPlugin)
-  $captchaPlugin.displayCaptcha("edit","wiki_captcha")
-#end
-<br />
-#if ($tdoc.language=="")
-$msg.get("parent"):&nbsp;<input type="text" name="parent" value="$!doc.parent" 
size="40" />
-<br/><br/>
-$msg.get("defaultlanguage"):&nbsp;<input type="text" name="default_language" 
value="$!doc.defaultLanguage" size="10" />
-<br/><br/>
-#if(($doc.creator.equals($context.user))
-     ||($hasadmin))
-$msg.get("creator"):&nbsp;<input type="text" name="creator" 
value="$!doc.creator" size="40" />
-#else
-$msg.get("creator"):&nbsp;$!doc.creator
-#end
-#end
-#end
-</div>
-</form>
-         </div>
-            </div>
-            <div id="col-b" class="sidecol">
-              <div class="box">
-              </div>
-            </div>
-          </div>
-          <div id="col-c" class="sidecol">
-         <div class="box">
-#if($toolbardoc)
-$xwiki.includeForm("$toolbardoc",false)
-#else
-#template("edittoolbar.vm")
-#end
-          </div>
-          </div>
-          <div class="clear" id="em"></div>
-          </div>
-          </div>
-</div>
-#template("editfooter.vm")

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editactions.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editactions.vm  
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editactions.vm  
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,23 +0,0 @@
-<script type="text/javascript">
-    function checkDocumentContent() {
-       if (document.forms.edit.content) {
-        var content = document.forms.edit.content.value;
-        if (content == null || content == "") {
-           alert("$msg.get('wikicontentcannotbeempty')");
-           return false ;
-        }
-       }
-       return true;
-   }
-</script>
-#set($param = "")
-#if ($sectionNumber != 0)
-   #set($param = "section=$sectionNumber")
-#end
-#if ($showactions == 1)
-    <a href="$doc.getURL("cancel")" 
onclick="document.forms.edit.action=this.href; if 
(document.forms.edit.onsubmit) document.forms.edit.onsubmit(); 
document.forms.edit.submit(); return false;" >$msg.get("cancel")</a>
-    <span> | </span>
-    <a style="cursor:pointer;" 
onclick="document.forms.edit.action='$doc.getURL("preview",$param)'; if 
(document.forms.edit.onsubmit) document.forms.edit.onsubmit();if 
(checkDocumentContent()) document.forms.edit.submit(); return false;" 
>$msg.get("preview")</a>
-    <span> | </span>
-    <a href="$doc.getURL("save",$param)" 
onclick="document.forms.edit.action=this.href; if 
(document.forms.edit.onsubmit) document.forms.edit.onsubmit();if 
(checkDocumentContent()) document.forms.edit.submit(); return false;" 
>$msg.get("save")</a>
-#end
\ No newline at end of file

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editclass.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editclass.vm    
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editclass.vm    
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,134 +0,0 @@
-#set($showactions=0)
-#template("editheader.vm")
-<div id="xwikicontent" class="large">
-#set( $class = $doc.getxWikiClass())
-#set( $redirect = $xwiki.getRequestURL())
-<script type="text/javascript">
-<!--
-var currentfield = "";
-function show(fieldname) {
-  if (currentfield!="")
-    document.getElementById("field_" + currentfield).style.display="none";
-  document.getElementById("field_" + fieldname).style.display="block";
-  currentfield = fieldname;
-}
-// -->
-</script>
-       <div id="columns">
-        <div class="cols-wrapper">
-          <div class="float-wrapper">
-            <div id="col-a">
-              <div class="main-content">
-<form id="propupdate" method="post" action="$doc.getURL("propupdate")" 
onsubmit="cancelCancelEdit()">
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-<div id="intro">
-$msg.get("welcometoclasseditor")
-<br />
-</div>
-
-#set ( $first = 1)
-#foreach ($field in $class.properties)
-<div id="field_$field.name" style="display: #if ($first==1) block #else none 
#end;">
-#if ($first==1)
-<script type="text/javascript">
-<!--
-currentfield = "$field.name";
-// -->
-</script>
-#set ($first = 0)
-#end
-<h3>$msg.get("editfield") $field.prettyName</h3>
-
-<table border="0">
-#foreach ($classprop in $field.xWikiClass.propertyNames)
-<tr><td>$field.xWikiClass.get("$classprop").getPrettyName()</td>
-<td>$doc.displayEdit($field.xWikiClass.get("$classprop"), "${field.name}_" , 
$field)
-</td>
-</tr>
-#end
-</table>
-</div>
-#end
-</form>
-#includeHelp("EditClassHelp")
-         </div>
-            </div>
-            <div id="col-b" class="sidecol">
-              <div class="box">
-              </div>
-            </div>
-          </div>
-          <div id="col-c" class="sidecol">
-         <div class="box">
-<h2>$msg.get("classeditor")</h2>
-<br />
-<p style="text-align: center">
-<input type="button" value="$msg.get("saveclass")" 
onclick="document.forms.propupdate.submit()" />
-<br />
-<h3>$msg.get("currentproperties")</h3>
-#foreach ($field in $class.properties)
-<a href="" onclick="show('$field.name'); return 
false;">$field.prettyName</a><br />
-#end
-<br />
-<h3>$msg.get("addproperty")</h3>
-<form id="propadd" method="post" action="$doc.getURL("propadd")" 
onsubmit="cancelCancelEdit()">
-<p style="text-align: center">
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-$msg.get("propname"): <input type="text" name="propname" value="" size="20" />
-<br /><br />
-<select name="proptype" size="1">
-<option value="---">$msg.get("selectproptype")</option>
-#foreach($prop in $xwiki.metaclass.properties)
-<option value="$prop.name">$prop.prettyName</option>
-#end
-</select>
-<br /><br />
-<input type="submit" value="$msg.get("addproperty")" />
-</p>
-</form>
-<br />
-<br />
-<h3>$msg.get("editanotherclass")</h3>
-#set($rsvc= $xwiki.xWiki.getRightService())
-<form id="changeclass" method="post" action="">
-<p style="text-align: center">
-<select name="classname" size="1">
-<option value="---">$msg.get("selectclass")</option>
-#foreach ($classname in $xwiki.classList)
-#!if ($xwiki.hasAccessLevel("edit", $classname))
-#set($classdoc = $xwiki.getDocument($classname))
-<option value="$classdoc.getURL("edit", "xpage=editclass")">$classname</option>
-#!end
-#end
-</select>
-<script type="text/javascript">
-function gotoclass(dest) {
- if (dest!="---") {
-   location = dest;
-   }
-   return false;
-}
-</script>
-<br />
-<br />
-<input type="submit" value="$msg.get("changeclass")" onClick="return 
gotoclass(this.form.classname.value)" />
-</p>
-</form>
-#if($xwiki.exists("xwiki:XWiki.EditClassHelp"))
-#set($edithelpdoc = $xwiki.getDocument("xwiki:XWiki.EditClassHelp"))
-#else
-#if($xwiki.exists("XWiki.EditClassHelp"))
-#set($edithelpdoc = $xwiki.getDocument("XWiki.EditClassHelp"))
-#end
-#end
-#if($edithelpdoc)
-$edithelpdoc.getRenderedContent()
-#end
-          </div>
-          </div>
-          <div class="clear" id="em"></div>
-          </div>
-          </div>
-</div>
-</div>
-#template("editfooter.vm")
\ No newline at end of file

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editfooter.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editfooter.vm   
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editfooter.vm   
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,6 +0,0 @@
-<div class="xwiki${xwikimode}b" id="xwikinav_footer">
-<div class="xwikiactions">
-#template("editactions.vm")
-</div>
-</div>
-#template("footer.vm")

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editheader.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editheader.vm   
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editheader.vm   
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,8 +0,0 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-<div class="xwiki${xwikimode}b" id="xwikinav_header">
-<div class="xwikiactions">
-#template("editactions.vm")
-</div>
-</div>
\ No newline at end of file

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm   
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm   
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,158 +0,0 @@
-#set($showactions=0)
-#template("editheader.vm")
-<div id="xwikicontent" class="large">
-#set( $classes = $doc.getxWikiClasses())
-#set( $redirect = $xwiki.getRequestURL())
-<script type="text/javascript">
-<!--
-var currentfield = "";
-function show(fieldname) {
-  if (currentfield!="")
-    document.getElementById(currentfield).style.display="none";
-  document.getElementById(fieldname).style.display="block";
-  currentfield = fieldname;
-}
-function addUser(form, prefix) {
-    var username = form[prefix + "newuser"].value;
-    var select =  form[prefix + "users"][0];
-    if (username != null && username != "") {
-        length = select.options.length ;
-        dusername = username;
-        if (username.indexOf('.')==-1) {
-          xusername = "XWiki." + username;
-        }
-        else {
-          if (username.indexOf(":")==-1) {
-           dusername = username.substring(username.lastIndexOf(".")+1);
-          }
-          xusername = username
-        }
-        select.options[length] = new Option(dusername, xusername, true);
-    }
-}
-
-function addGroup(form, prefix) {
-    var groupname = form[prefix + "newgroup"].value;
-    var select =  form[prefix + "groups"][0];
-    if (groupname != null && groupname != "") {
-        length = select.options.length ;
-        dgroupname = groupname;
-        if (groupname.indexOf('.')==-1) {
-          xgroupname = "XWiki." + groupname;
-        }
-        else {
-          if (groupname.indexOf(":")==-1)
-           dgroupname = groupname.substring(groupname.lastIndexOf(".")+1);
-          xgroupname = groupname
-        }
-        select.options[length] = new Option(dgroupname, xgroupname, true);
-    }
-}
-
-// -->
-</script>
-       <div id="columns">
-        <div class="cols-wrapper">
-          <div class="float-wrapper">
-            <div id="col-a">
-              <div class="main-content">
-<div id="intro">
-$msg.get("welcometoobjecteditor")
-</div>
-<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
-<p>
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-#set ( $first = 1)
-#foreach($class in $classes)
-#set( $nb = $doc.getObjectNumbers("${class.name}"))
-<input type="hidden" name="${class.name}_nb" value="$nb" />
-</p>
-#foreach($obj in $doc.getObjects($class.name))
-<div id="${class.name}_${obj.number}" style="display: #if ($first==1) block 
#else none #end;">
-#if ($first==1)
-<script type="text/javascript">
-<!--
-currentfield = "${class.name}_${obj.number}";
-// -->
-</script>
-#set ($first = 0)
-#end
-
-$msg.get("youcan") <a href="$doc.getURL("objectremove" , 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getFormEncoded($redirect)}")"
-    onclick="return confirm('$msg.get("confirmobjectremove")')">
-    $msg.get("removethisobject")</a><br /><br /><br />
-
-<table>
-#foreach($prop in $class.properties)
-<tr><td>$prop.prettyName</td>
-<td>$doc.displayEdit($prop, "${class.name}_${obj.number}_",  $obj)
-</td></tr>
-#end
-</table>
-</div>
- #end
-#end
-</form>
-#includeHelp("EditObjectsHelp")
-         </div>
-            </div>
-            <div id="col-b" class="sidecol">
-              <div class="box">
-              </div>
-            </div>
-          </div>
-          <div id="col-c" class="sidecol">
-         <div class="box">
-<h2>$msg.get("objecteditor")</h2>
-<br />
-<p style="text-align: center">
-<input type="button" value="$msg.get("saveobjects")" 
onclick="document.forms.update.submit()" />
-</p>
-<br />
-<h3>$msg.get("currentobjects")</h3>
-#foreach ($class in $classes)
-<b>$class.name</b><br />
-<div id="class_${class.name}">
-#set( $props = $class.getProperties())
-#set( $i=0)
-#foreach( $prop in $props)
-#if ($i==0)
-#set($firstfield = $prop.name)
-#set ($i = 1)
-#end
-#end
-#foreach ($obj in $doc.getObjects($class.name))
-&nbsp;&nbsp;<a href="" onclick="show('${class.name}_${obj.number}'); return 
false;">${obj.number}: $doc.display($firstfield,$obj)</a><br />
-#end
-</div>
-<br /><br />
-#end
-<h3>$msg.get("addobject")</h3>
-<form id="objectadd" method="post" action="$doc.getURL("objectadd")" 
onsubmit="cancelCancelEdit()">
-<p style="text-align: center">
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-<select name="classname" size="1">
-<option value="---">$msg.get("selectclass")</option>
-#foreach ($classname in $xwiki.classList)
-<option value="$classname">$classname</option>
-#end
-</select>
-<input type="submit" value="$msg.get("addobjectfromclass")" />
-</p>
-</form>
-#if($xwiki.isVirtual())
-<form id="objectadd2" method="post" action="$doc.getURL("objectadd")" 
onsubmit="cancelCancelEdit()">
-<p style="text-align: center">
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-<input type="text" name="classname" size="20" />
-<input type="submit" value="$msg.get("addobjectfromclass")" />
-</p>
-</form>
-#end
-          </div>
-          </div>
-          <div class="clear" id="em"></div>
-          </div>
-          </div>
-</div>
-#template("editfooter.vm")

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editprefs.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editprefs.vm    
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editprefs.vm    
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,139 +0,0 @@
-#set($showactions=0)
-#set( $redirect = $xwiki.getRequestURL())
-#template("editheader.vm")
-<script type="text/javascript">
-<!--
-var currentfield = "params";
-function show(fieldname) {
-  if (currentfield!="")
-    document.getElementById(currentfield).style.display="none";
-  document.getElementById(fieldname).style.display="block";
-  currentfield = fieldname;
-}
-// -->
-</script>
-#set($obj = $doc.getObject("XWiki.XWikiPreferences"))
-
-#if(!$obj)
-<form id="objectadd" method="post" action="$doc.getURL("objectadd")">
-<p>
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
-</p>
-</form>
-<script type="text/javascript">
-<!--
-document.forms.objectadd.submit();
--->
-</script>
-#else
-#set($class = $obj.xWikiClass)
-#set($sections = ["params", "skin", "presentation", "editing", "advanced", 
"registration", "antispam"])
-#set($sectionitemsmap = $xwiki.hashMap)
-#set($sectionitemsmap.params = ["multilingual", "default_language", 
"authenticate_view", "authenticate_edit", "auth_active_check" ])
-#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", 
"renderXWikiVelocityRenderer", "renderXWikiGroovyRenderer", 
"renderXWikiRadeoxRenderer" ])
-#set($sectionitemsmap.registration = [ "use_email_verification", 
"admin_email", "smtp_server", "validation_email_content",  
"confirmation_email_content" , "invitation_email_content"])
-#set($sectionitemsmap.antispam = [ "registration_anonymous", 
"registration_registered", "edit_anonymous", "edit_registered",  
"comment_anonymous", "comment_registered"])
-#macro(showsection $section $sectionitemsmap)
-<h3>$msg.get($section)</h3>
-<br>
-<table border="0">
-#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!=$xwiki.null)
-#set($title = $!prop.prettyName)
-#end
-#end
-<tr>
-  <td>
-    #if($item=="registration_anonymous")
-      <b><i> $msg.get("registration")  </i></b>
-    #end
-    #if($item=="edit_anonymous")
-      <br><b><i> $msg.get("edit")  </i></b>
-    #end
-    #if($item=="comment_anonymous")
-      <br><b><i> $msg.get("comment")  </i></b>
-    #end
-  </td>
-</tr>
-<tr><td>$title</td>
-<td>
-#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))
-<a href="$skindoc.getURL()">Customize</a>
-#end
-#end
-#end
-</td></tr>
-#end
-</table>
-#end
-<div id="xwikicontent" class="large">
-       <div id="columns">
-        <div class="cols-wrapper">
-          <div class="float-wrapper">
-            <div id="col-a">
-              <div class="main-content">
-<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
-<p>
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-</p>
-#set($first = 1)
-#foreach($section in $sections)
-<div id="${section}" style="display: #if ($first==1) block #else none #end;">
-#if ($first==1)
-<script type="text/javascript">
-<!--
-currentfield = "${section}";
-// -->
-</script>
-#set ($first = 0)
-#end
-#showsection($section $sectionitemsmap)
-</div>
-#end
-</form>
-#includeHelp("EditPrefsHelp")
-         </div>
-            </div>
-            <div id="col-b" class="sidecol">
-              <div class="box">
-              </div>
-            </div>
-          </div>
-          <div id="col-c" class="sidecol">
-         <div class="box">
-<h3>$msg.get("preferences")</h3>
-<br />
-<p style="text-align: center">
-<input type="button" value="$msg.get("saveprefs")" 
onclick="cancelCancelEdit(); document.forms.update.submit()" />
-</p>
-<br />
-<h3>$msg.get("sections")</h3>
-<br />
-<p style="text-align: center">
-#foreach ($section in $sections)
-<a href="" onclick="show('${section}'); return false;">$msg.get($section)</a>
-<br />
-#end
-</p>
-          </div>
-          </div>
-          <div class="clear" id="em"></div>
-          </div>
-          </div>
-</div>
-#end
-#template("basefooter.vm")
-#template("footer.vm")

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editrights.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editrights.vm   
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editrights.vm   
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,132 +0,0 @@
-#set($showactions=0)
-#template("editheader.vm")
-#if ( $request.getParameter("global").equals("1"))
-#set ($classname = "XWiki.XWikiGlobalRights")
-#else
-#set ($classname = "XWiki.XWikiRights")
-#end
-#set( $class = $xwiki.getDocument($classname).xWikiClass)
-#set( $redirect = $xwiki.getRequestURL())
-<script type="text/javascript">
-<!--
-var currentfield = "";
-function show(fieldname) {
-    if (currentfield!="")
-        document.getElementById(currentfield).style.display="none";
-    document.getElementById(fieldname).style.display="block";
-    currentfield = fieldname;
-}
-
-function addUser(form, prefix) {
-    var username = form[prefix + "newuser"].value;
-    var select =  form[prefix + "users"][0];
-    if (username != null && username != "") {
-        length = select.options.length ;
-        dusername = username;
-        if (username.indexOf('.')==-1) {
-          xusername = "XWiki." + username;
-        }
-        else {
-          if (username.indexOf(":")==-1) {
-           dusername = username.substring(username.lastIndexOf(".")+1);
-          }
-          xusername = username
-        }
-        select.options[length] = new Option(dusername, xusername, true);
-    }
-}
-
-function addGroup(form, prefix) {
-    var groupname = form[prefix + "newgroup"].value;
-    var select =  form[prefix + "groups"][0];
-    if (groupname != null && groupname != "") {
-        length = select.options.length ;
-        dgroupname = groupname;
-        if (groupname.indexOf('.')==-1) {
-          xgroupname = "XWiki." + groupname;
-        }
-        else {
-          if (groupname.indexOf(":")==-1)
-           dgroupname = groupname.substring(groupname.lastIndexOf(".")+1);
-          xgroupname = groupname
-        }
-        select.options[length] = new Option(dgroupname, xgroupname, true);
-    }
-}
--->
-</script>
-<div id="xwikicontent" class="large">
-       <div id="columns">
-        <div class="cols-wrapper">
-          <div class="float-wrapper">
-            <div id="col-a">
-              <div class="main-content">
-<div id="intro">
-$msg.get("welcometorightseditor")
-</div>
-<div style="overflow:hidden;width:100%">
-<div style="float:left">
-<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
-<p>
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-#set ( $first = 1)
-#set( $nb = $doc.getObjectNumbers("${class.name}"))
-<input type="hidden" name="${class.name}_nb" value="$nb" />
-</p>
- <table border="1" cellpadding="4" cellspacing="0" width="90%">
- <tr>
-    
<th>$msg.get("Right")</th><th>$msg.get("Users")</th><th>$msg.get("Groups")</th><th>$msg.get("Level")</th><th>$msg.get("Allow-Deny")</th><th>$msg.get("Remove")</th>
- </tr>
-#foreach ($obj in $doc.getObjects($class.name))
-#set($class = $obj.xWikiClass)
-    <tr>
-        <td align="center">$!{obj.number}</td>
-        <td 
align="center">$!doc.displayEdit($class.users,"${class.name}_${obj.number}_",$obj)
 <br>
-        <td 
align="center">$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
-        <td 
align="center">$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
-        <td 
align="center">$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-        <td align="center"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")"
-    onclick="return confirm('$msg.get("confirmobjectremove")')">
-    $msg.get("remove")</a></td>
-    </tr>
-#end
- </table>
-</form>
-</div>
-</div>
-#includeHelp("EditRightsHelp")
-         </div>
-            </div>
-            <div id="col-b" class="sidecol">
-              <div class="box">
-              </div>
-            </div>
-          </div>
-          <div id="col-c" class="sidecol">
-         <div class="box">
-<h2>$msg.get("rightseditor")</h2>
-<br />
-<p>
-<input type="button" value="$msg.get("saverights")" 
onclick="document.forms.update.submit()" />
-</p>
-<br />
-<div id="class_${class.name}">
-<br /><br />
-
-<h3>$msg.get("addrightentry")</h3>
-<form id="objectadd" method="post" action="$doc.getURL("objectadd")" 
onsubmit="cancelCancelEdit()">
-<p>
-<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" 
/>
-<input type="hidden" name="classname" value="$classname" />
-<input type="submit" value="$msg.get("addrightentry")" />
-</p>
-</form>
-<br />
-          </div>
-          </div>
-          <div class="clear" id="em"></div>
-          </div>
-          </div>
-</div>
-</div>
-#template("editfooter.vm")
\ No newline at end of file

Deleted: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/edittoolbar.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/edittoolbar.vm  
2008-02-13 18:50:51 UTC (rev 7683)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/edittoolbar.vm  
2008-02-13 18:54:21 UTC (rev 7684)
@@ -1,48 +0,0 @@
-#if($request.xpage!="wyswiyg")
-<div class="xwikimenutitle">Basic Syntax</div>
-<div class="xwikimenulinks">
-<pre>
-1 Level 1 Title
-1.1 Level 2 Title
-*Bold*
-~~Italics~~
--- Striked--
-</pre>
-</div>
-<div class="xwikimenutitle">Lists</div>
-<div class="xwikimenulinks">
-<pre>
-* List item level 1
-** List item level 2
-** List item level 2
-*** List item level 3
-
-# Numbered list item
-# Numbered list item
-</pre>
-</div>
-#end
-<div class="xwikimenutitle">Links</div>
-<div class="xwikimenulinks">
-<pre>
-[PageName]
-[linktext>PageName]
-[linktext>Space.PageName]
-[linktext>http://...]
-</pre>
-</div>
-<div class="xwikimenutitle">Images and Attachments</div>
-<div class="xwikimenulinks">
-{image:filename.gif} inserts an image
-{attach:filename.doc} creates a link
-</div>
-<div class="xwikimenutitle">Tables</div>
-<div class="xwikimenulinks">
-<pre>
-{table}
-Header1|Header2
-item1|item2
-item3|item4
-{table}
-</pre>
-</div>

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

Reply via email to