Author: sdumitriu
Date: 2008-02-13 19:33:59 +0100 (Wed, 13 Feb 2008)
New Revision: 7666

Added:
   
xwiki-platform/web/trunk/standard/src/main/webapp/templates/simpleedittoolbar.vm
Removed:
   
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/simpleedittoolbar.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/simpleedittoolbar.vm
===================================================================
--- 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/simpleedittoolbar.vm
      2008-02-13 18:31:03 UTC (rev 7665)
+++ 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/simpleedittoolbar.vm
      2008-02-13 18:33:59 UTC (rev 7666)
@@ -1,20 +0,0 @@
-<script type="text/javascript" 
src="$xwiki.getSkinFile("wikibits.js")"></script>
-<script type="text/javascript">
-// <![CDATA[
-// document.writeln("<div id='simpleedittoolbar' class='layoutsubsection'>")
-// document.writeln("<div class='rightmenu'><a 
href='$xwiki.getURL("Doc.SimpleEditorToolbar")' 
onclick=\"openURL('$xwiki.getURL("Doc.SimpleEditorToolbar", "view", 
"xpage=plain")'); return false;\">aaaaaaaaa?<" + "/a><" + "/div>");
-document.writeln("<div class='leftmenu2'>");
-addButton('$xwiki.getSkinFile("ed_format_bold.gif")','$msg.get("bold")','*','*','$msg.get("boldtext")');
-addButton('$xwiki.getSkinFile("ed_format_italic.gif")','$msg.get("italics")','~~','~~','$msg.get("italicstext")');
-addButton('$xwiki.getSkinFile("ed_format_underline.gif")','$msg.get("underline")','__','__','$msg.get("underlinetext")');
-// 
addButton('$xwiki.getSkinFile("ed_title.gif")','$msg.get("secondleveltitle")','\n1.1
 ','\n','$msg.get("titletext")');
-addButton('$xwiki.getSkinFile("ed_link.gif")','$msg.get("ilink")','[',']','$msg.get("ilinktext")');
-// 
addButton('$xwiki.getSkinFile("ed_extlink.gif")','$msg.get("elink")','[',']','$msg.get("elinktext")');
-addButton('$xwiki.getSkinFile("ed_hr.gif")','$msg.get("hr")','\n----\n','','$msg.get("hrtext")');
-addButton('$xwiki.getSkinFile("ed_image.gif")','$msg.get("img")','{image:','}','$msg.get("imgtext")');
-addButton('$xwiki.getSkinFile("ed_about.gif")','$msg.get("sig")','\#sign("$context.user")','','$msg.get("sigtext")');
-//addInfobox('$msg.get("simpleedittoolbardesc")','$msg.get("simpleedittoolbardesc2")');
-// document.writeln("<" + "/div>");
-document.writeln("<" + "/div>");
-// ]]>
-</script>

Copied: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/simpleedittoolbar.vm
 (from rev 7665, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/simpleedittoolbar.vm)
===================================================================
--- 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/simpleedittoolbar.vm
                            (rev 0)
+++ 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/simpleedittoolbar.vm
    2008-02-13 18:33:59 UTC (rev 7666)
@@ -0,0 +1,20 @@
+<script type="text/javascript" 
src="$xwiki.getSkinFile("wikibits.js")"></script>
+<script type="text/javascript">
+// <![CDATA[
+// document.writeln("<div id='simpleedittoolbar' class='layoutsubsection'>")
+// document.writeln("<div class='rightmenu'><a 
href='$xwiki.getURL("Doc.SimpleEditorToolbar")' 
onclick=\"openURL('$xwiki.getURL("Doc.SimpleEditorToolbar", "view", 
"xpage=plain")'); return false;\">aaaaaaaaa?<" + "/a><" + "/div>");
+document.writeln("<div class='leftmenu2'>");
+addButton('$xwiki.getSkinFile("ed_format_bold.gif")','$msg.get("bold")','*','*','$msg.get("boldtext")');
+addButton('$xwiki.getSkinFile("ed_format_italic.gif")','$msg.get("italics")','~~','~~','$msg.get("italicstext")');
+addButton('$xwiki.getSkinFile("ed_format_underline.gif")','$msg.get("underline")','__','__','$msg.get("underlinetext")');
+// 
addButton('$xwiki.getSkinFile("ed_title.gif")','$msg.get("secondleveltitle")','\n1.1
 ','\n','$msg.get("titletext")');
+addButton('$xwiki.getSkinFile("ed_link.gif")','$msg.get("ilink")','[',']','$msg.get("ilinktext")');
+// 
addButton('$xwiki.getSkinFile("ed_extlink.gif")','$msg.get("elink")','[',']','$msg.get("elinktext")');
+addButton('$xwiki.getSkinFile("ed_hr.gif")','$msg.get("hr")','\n----\n','','$msg.get("hrtext")');
+addButton('$xwiki.getSkinFile("ed_image.gif")','$msg.get("img")','{image:','}','$msg.get("imgtext")');
+addButton('$xwiki.getSkinFile("ed_about.gif")','$msg.get("sig")','\#sign("$context.user")','','$msg.get("sigtext")');
+//addInfobox('$msg.get("simpleedittoolbardesc")','$msg.get("simpleedittoolbardesc2")');
+// document.writeln("<" + "/div>");
+document.writeln("<" + "/div>");
+// ]]>
+</script>

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

Reply via email to