Author: sdumitriu
Date: 2008-02-13 19:59:11 +0100 (Wed, 13 Feb 2008)
New Revision: 7690
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editinline.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editinline.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/editinline.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editinline.vm
2008-02-13 18:58:59 UTC (rev 7689)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editinline.vm
2008-02-13 18:59:11 UTC (rev 7690)
@@ -1,37 +0,0 @@
-#set($formname = "inline")
-#set($saveaction = "save")
-#set($previewenabled = true)
-<div class="main layoutsubsection">
-#set($xredirect=$!request.getParameter("xredirect"))
-#set($xnotification=$!request.getParameter("xnotification"))
-<form id="inline" method="post" action="$doc.getURL("preview")">
-<div>
-<div class="hidden"><input type="hidden" name="xcontinue"
value="$doc.getURL("inline")"/></div>
-<input type="hidden" name="xredirect" value="$!xredirect" />
-<input type="hidden" name="xnotification" value="$!xnotification" />
-<input type="hidden" name="template" value="$!request.template" />
-<input type="hidden" name="language" value="$!doc.language" />
-#set($force = $!request.get("force"))
-#if (($doc.getLocked()==true)&&(!$force))
-<div>
-$msg.get("doclockedby") $xwiki.getLocalUserName($doc.getLockingUser()).
-<br />
-<a href="$doc.getURL("inline",
"$!request.getQueryString()&force=1")">$msg.get("forcelock")</a>
-</div>
-#else
-#set($editactions = "top")
-<div class="topbuttons">#template("editactions.vm")</div>
-<div class="clear">
-#foreach($class in $doc.xWikiClasses)
-#set( $nb = $doc.getObjectNumbers("${class.name}"))
-<input type="hidden" name="${class.name}_nb" value="$nb" />
-#end
-$cdoc.getRenderedContent()
-</div> ## clear
-#set($editactions = "bottom")
-<div class="bottombuttons">#template("editactions.vm")</div>
-#end
-</div> ## form
-</form>
-#template("textarea_wysiwyg.vm")
-</div>
\ No newline at end of file
Copied:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editinline.vm (from
rev 7689,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editinline.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editinline.vm
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editinline.vm
2008-02-13 18:59:11 UTC (rev 7690)
@@ -0,0 +1,37 @@
+#set($formname = "inline")
+#set($saveaction = "save")
+#set($previewenabled = true)
+<div class="main layoutsubsection">
+#set($xredirect=$!request.getParameter("xredirect"))
+#set($xnotification=$!request.getParameter("xnotification"))
+<form id="inline" method="post" action="$doc.getURL("preview")">
+<div>
+<div class="hidden"><input type="hidden" name="xcontinue"
value="$doc.getURL("inline")"/></div>
+<input type="hidden" name="xredirect" value="$!xredirect" />
+<input type="hidden" name="xnotification" value="$!xnotification" />
+<input type="hidden" name="template" value="$!request.template" />
+<input type="hidden" name="language" value="$!doc.language" />
+#set($force = $!request.get("force"))
+#if (($doc.getLocked()==true)&&(!$force))
+<div>
+$msg.get("doclockedby") $xwiki.getLocalUserName($doc.getLockingUser()).
+<br />
+<a href="$doc.getURL("inline",
"$!request.getQueryString()&force=1")">$msg.get("forcelock")</a>
+</div>
+#else
+#set($editactions = "top")
+<div class="topbuttons">#template("editactions.vm")</div>
+<div class="clear">
+#foreach($class in $doc.xWikiClasses)
+#set( $nb = $doc.getObjectNumbers("${class.name}"))
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+#end
+$cdoc.getRenderedContent()
+</div> ## clear
+#set($editactions = "bottom")
+<div class="bottombuttons">#template("editactions.vm")</div>
+#end
+</div> ## form
+</form>
+#template("textarea_wysiwyg.vm")
+</div>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
