[xwiki-notifications] r7685 - in xwiki-platform: skins/trunk/albatross/src/main/resources/albatross web/trunk/standard/src/main/webapp/templates

[SVN]

Author: sdumitriu
Date: 2008-02-13 19:55:16 +0100 (Wed, 13 Feb 2008)
New Revision: 7685

Added:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm
Removed:
   xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edit.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/edit.vm
===================================================================
--- xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edit.vm   
2008-02-13 18:54:21 UTC (rev 7684)
+++ xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edit.vm   
2008-02-13 18:55:16 UTC (rev 7685)
@@ -1,73 +0,0 @@
-###
-### Main "edit" template
-###
-### General wrapper for edit actions
-###
-##
-## Determine what editor to show
-##
-#if((!$editor) || ($editor == ""))
-#set($editor = $request.getParameter("editor"))
-#if((!$editor) || ($editor == ""))
-<!-- advanced: $doc.isAdvancedContent()  pref: 
$xwiki.getUserPreference("editor") -->
-#if(($xwiki.getUserPreference("editor")=="Wysiwyg")&&(!$doc.isAdvancedContent()))
-#set($editor="wysiwyg")
-#else
-#set($editor="wiki")
-#end
-#end
-#end
-##
-## "Compute" the title
-##
-#set($title = $xwiki.parseContent($msg.get("editpageTitle")))
-##
-## Header
-##
-#template("xwikivars.vm")
-#template("layoutvars.vm")
-#template("htmlheader.vm")
-#template("header.vm")
-#template("menuedit.vm")
-#if($editor == "wiki" || $editor == "wysiwyg")
-<form id="edit" method="post" action="$doc.getURL("preview")" >
-#end
-##
-## Content
-##
-#set($force = $!request.get("force"))
-#if (($tdoc.getLocked()==true)&&(!$force))
-<div class="layoutsection">
-#xwikimessageboxstart($msg.get("notice") "$msg.get('doclockedby') 
$xwiki.getLocalUserName($doc.getLockingUser())")
-<a href="$doc.getURL($context.action, 
"$!{request.getQueryString().replaceAll('&', '&amp;').replaceAll('&amp;amp;', 
'&amp;')}&amp;force=1")">$msg.get("forcelock")</a>
-#xwikimessageboxend()
-</div>
-#else
-<div id="xwikieditor" class="layoutsection">
-<div id="xwikieditorinner">
-<div class="leftsidecolumns">
-<div id="editcolumn" class="editor">
-<div class="alleditcontent">
-#if($editor == "wiki" || $editor == "wysiwyg")
-<label>$msg.get("titlefield"):
-<input type="text" id="xwikidoctitleinput" name="title" 
value="$!tdoc.title"/></label>
-#end
-#template("editmodes.vm")
-#template("edit${editor}.vm")
-</div> ## alleditcontent
-</div> ## editcolumn
-<div class="clearfloats"></div>
-</div> ## leftsidecolumns
-#template("editpanels.vm")
-<div class="clearfloats"></div>
-</div> ## xwikieditorinner
-#end
-##
-## Footer
-##
-</div> ## xwikieditor
-#if($editor == "wiki" || $editor == "wysiwyg")
-</form>
-#end
-#template("footer.vm")
-#template("htmlfooter.vm")

Copied: xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm 
(from rev 7684, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/edit.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm         
                (rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/edit.vm 
2008-02-13 18:55:16 UTC (rev 7685)
@@ -0,0 +1,73 @@
+###
+### Main "edit" template
+###
+### General wrapper for edit actions
+###
+##
+## Determine what editor to show
+##
+#if((!$editor) || ($editor == ""))
+#set($editor = $request.getParameter("editor"))
+#if((!$editor) || ($editor == ""))
+<!-- advanced: $doc.isAdvancedContent()  pref: 
$xwiki.getUserPreference("editor") -->
+#if(($xwiki.getUserPreference("editor")=="Wysiwyg")&&(!$doc.isAdvancedContent()))
+#set($editor="wysiwyg")
+#else
+#set($editor="wiki")
+#end
+#end
+#end
+##
+## "Compute" the title
+##
+#set($title = $xwiki.parseContent($msg.get("editpageTitle")))
+##
+## Header
+##
+#template("xwikivars.vm")
+#template("layoutvars.vm")
+#template("htmlheader.vm")
+#template("header.vm")
+#template("menuedit.vm")
+#if($editor == "wiki" || $editor == "wysiwyg")
+<form id="edit" method="post" action="$doc.getURL("preview")" >
+#end
+##
+## Content
+##
+#set($force = $!request.get("force"))
+#if (($tdoc.getLocked()==true)&&(!$force))
+<div class="layoutsection">
+#xwikimessageboxstart($msg.get("notice") "$msg.get('doclockedby') 
$xwiki.getLocalUserName($doc.getLockingUser())")
+<a href="$doc.getURL($context.action, 
"$!{request.getQueryString().replaceAll('&', '&amp;').replaceAll('&amp;amp;', 
'&amp;')}&amp;force=1")">$msg.get("forcelock")</a>
+#xwikimessageboxend()
+</div>
+#else
+<div id="xwikieditor" class="layoutsection">
+<div id="xwikieditorinner">
+<div class="leftsidecolumns">
+<div id="editcolumn" class="editor">
+<div class="alleditcontent">
+#if($editor == "wiki" || $editor == "wysiwyg")
+<label>$msg.get("titlefield"):
+<input type="text" id="xwikidoctitleinput" name="title" 
value="$!tdoc.title"/></label>
+#end
+#template("editmodes.vm")
+#template("edit${editor}.vm")
+</div> ## alleditcontent
+</div> ## editcolumn
+<div class="clearfloats"></div>
+</div> ## leftsidecolumns
+#template("editpanels.vm")
+<div class="clearfloats"></div>
+</div> ## xwikieditorinner
+#end
+##
+## Footer
+##
+</div> ## xwikieditor
+#if($editor == "wiki" || $editor == "wysiwyg")
+</form>
+#end
+#template("footer.vm")
+#template("htmlfooter.vm")

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications