Author: sdumitriu
Date: 2008-02-13 19:59:59 +0100 (Wed, 13 Feb 2008)
New Revision: 7696
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editwysiwyg.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editwysiwyg.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/editwysiwyg.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editwysiwyg.vm
2008-02-13 18:59:52 UTC (rev 7695)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editwysiwyg.vm
2008-02-13 18:59:59 UTC (rev 7696)
@@ -1,54 +0,0 @@
-#set($formname = "edit")
-#set($saveaction = "save")
-#set($previewenabled = true)
-<script type="text/javascript"
src="${request.contextPath}/tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript"
src="${request.contextPath}/wiki_editor/wiki_editor.js"></script>
-#set($xredirect=$!request.getParameter("xredirect"))
-## <form id="edit" method="post" action="$doc.getURL("preview")"
onsubmit="tinyMCE.triggerSave();">
-## #set($editactions = "top")
-## <div class="topbuttons">#template("editactions.vm")</div>
-<div>
-<div class="hidden">
-<input type="hidden" name="template" value="$!request.template" />
-<input type="hidden" name="xcontinue" value="$doc.getURL("edit",
"editor=wysiwyg")"/>
-<input type="hidden" name="xredirect" value="$!xredirect" />
-<input type="hidden" name="language" value="$!tdoc.realLanguage" />
-## <input type="hidden" id="xwikidoctitleinput" name="title"
value="$!tdoc.title"/>
-## <input type="hidden" id="xwikidocparentinput" name="parent"
value="$!tdoc.parent"/>
-</div>
-<div id="xwikitext">
-<div id="xwikieditcontent">
-$xwiki.getTextArea($tdoc.content)
-</div>
-</div>
-</div>
-#set($editactions = "bottom")
-<div class="bottombuttons">#template("editactions.vm")</div>
-## </form>
-<script type="text/javascript">
-//<![CDATA[
- if ( browser.isIE || browser.isMozilla || browser.isGecko ||
browser.isSafari) {
- wikiEditor.init({
- language: "en",
- elements : "content",
- mode: "exact",
- content_css: "$xwiki.getSkinFile("style.css")",
- debug : false,
- remove_linebreaks : false,
- wiki_editor_toolbar: '$xwiki.getWysiwygToolbars()',
- plugins: 'table, contextmenu, paste, searchreplace',
- wiki_images_path :
'${request.contextPath}/bin/download/$doc.web/$doc.name/',
- wiki_attach_path :
'${request.contextPath}/bin/view/$doc.web/$doc.name',
- wiki_macro_path :
'${request.contextPath}/bin/view/$doc.web/$doc.name',
- wiki_plugins: 'core,attachments,macros'
-});
-
- } else {
- alert("$msg.get('browsernoncompatible')");
- }
-//]]>
-</script>
-## fullscreen editing
-<script type="text/javascript">
-Event.observe(window, "load", function() {fullscreenEdit('wysiwyg'); }, true);
-</script>
\ No newline at end of file
Copied:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editwysiwyg.vm
(from rev 7695,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editwysiwyg.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editwysiwyg.vm
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editwysiwyg.vm
2008-02-13 18:59:59 UTC (rev 7696)
@@ -0,0 +1,54 @@
+#set($formname = "edit")
+#set($saveaction = "save")
+#set($previewenabled = true)
+<script type="text/javascript"
src="${request.contextPath}/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript"
src="${request.contextPath}/wiki_editor/wiki_editor.js"></script>
+#set($xredirect=$!request.getParameter("xredirect"))
+## <form id="edit" method="post" action="$doc.getURL("preview")"
onsubmit="tinyMCE.triggerSave();">
+## #set($editactions = "top")
+## <div class="topbuttons">#template("editactions.vm")</div>
+<div>
+<div class="hidden">
+<input type="hidden" name="template" value="$!request.template" />
+<input type="hidden" name="xcontinue" value="$doc.getURL("edit",
"editor=wysiwyg")"/>
+<input type="hidden" name="xredirect" value="$!xredirect" />
+<input type="hidden" name="language" value="$!tdoc.realLanguage" />
+## <input type="hidden" id="xwikidoctitleinput" name="title"
value="$!tdoc.title"/>
+## <input type="hidden" id="xwikidocparentinput" name="parent"
value="$!tdoc.parent"/>
+</div>
+<div id="xwikitext">
+<div id="xwikieditcontent">
+$xwiki.getTextArea($tdoc.content)
+</div>
+</div>
+</div>
+#set($editactions = "bottom")
+<div class="bottombuttons">#template("editactions.vm")</div>
+## </form>
+<script type="text/javascript">
+//<![CDATA[
+ if ( browser.isIE || browser.isMozilla || browser.isGecko ||
browser.isSafari) {
+ wikiEditor.init({
+ language: "en",
+ elements : "content",
+ mode: "exact",
+ content_css: "$xwiki.getSkinFile("style.css")",
+ debug : false,
+ remove_linebreaks : false,
+ wiki_editor_toolbar: '$xwiki.getWysiwygToolbars()',
+ plugins: 'table, contextmenu, paste, searchreplace',
+ wiki_images_path :
'${request.contextPath}/bin/download/$doc.web/$doc.name/',
+ wiki_attach_path :
'${request.contextPath}/bin/view/$doc.web/$doc.name',
+ wiki_macro_path :
'${request.contextPath}/bin/view/$doc.web/$doc.name',
+ wiki_plugins: 'core,attachments,macros'
+});
+
+ } else {
+ alert("$msg.get('browsernoncompatible')");
+ }
+//]]>
+</script>
+## fullscreen editing
+<script type="text/javascript">
+Event.observe(window, "load", function() {fullscreenEdit('wysiwyg'); }, true);
+</script>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
