Author: sdumitriu
Date: 2008-02-13 19:01:37 +0100 (Wed, 13 Feb 2008)
New Revision: 7655
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/textarea_wysiwyg.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/textarea_wysiwyg.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/textarea_wysiwyg.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/textarea_wysiwyg.vm
2008-02-13 18:01:28 UTC (rev 7654)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/textarea_wysiwyg.vm
2008-02-13 18:01:37 UTC (rev 7655)
@@ -1,23 +0,0 @@
-#set($editors = $context.getEditorWysiwyg())
-#if($editors)
-<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>
-<script type="text/javascript">
-//<![CDATA[
- wikiEditor.init({
- elements : "$editors",
- language: "en",
- mode: "exact",
- content_css: "$xwiki.getSkinFile("style.css")",
- debug : false,
- remove_linebreaks : false,
- plugins: 'table, contextmenu, paste, searchreplace',
- wiki_use_style: '$xwiki.useWysiwygStyleToolbar()',
- 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'
- });
-//]]>
-</script>
-#end
Copied:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/textarea_wysiwyg.vm
(from rev 7654,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/textarea_wysiwyg.vm)
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/textarea_wysiwyg.vm
(rev 0)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/textarea_wysiwyg.vm
2008-02-13 18:01:37 UTC (rev 7655)
@@ -0,0 +1,23 @@
+#set($editors = $context.getEditorWysiwyg())
+#if($editors)
+<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>
+<script type="text/javascript">
+//<![CDATA[
+ wikiEditor.init({
+ elements : "$editors",
+ language: "en",
+ mode: "exact",
+ content_css: "$xwiki.getSkinFile("style.css")",
+ debug : false,
+ remove_linebreaks : false,
+ plugins: 'table, contextmenu, paste, searchreplace',
+ wiki_use_style: '$xwiki.useWysiwygStyleToolbar()',
+ 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'
+ });
+//]]>
+</script>
+#end
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
