Changes to toolbar to position color pickers better, and

reintroduce the "select all" button.  Unfortnately, I had
to remove the "About richtext" button to make room

diff --git a/lib/rte/README_MOODLE b/lib/rte/README_MOODLE
index 908712181594e36130b5e7bb8041785aeb4fc93f..d42a940a88f3faaa33ed0543f0c7dd77053d984d 100644 (file)
--- a/lib/rte/README_MOODLE
+++ b/lib/rte/README_MOODLE
@@ -1,4 +1,7 @@
 This version of the Richtext editor started out as 0.3 beta 1,
 and I've hacked richedit.html to make the toolbars more compact.
 
+I've also changed the smilies to refer to Moodle smilies, and 
+added/removed some.
+
 Martin Dougiamas, 10/10/2002

diff --git a/lib/rte/richedit.html b/lib/rte/richedit.html
index 7d71422dd6aaf8f3fc9758da894b8dc82bbd51b6..21d3ad51ca7f0c9dfe34e9eef2c6e9ae17fcdc42 100644 (file)
--- a/lib/rte/richedit.html
+++ b/lib/rte/richedit.html
@@ -164,8 +164,9 @@ var tEdit = null;
                <img class="spacer" src="images/spacer.gif" width="2"><span class="sep"></span>\r
                <img id="btnOutdent"  onmousedown="doStyle('Outdent')" alt="@{DecreaseIndent}" src="images/icon_outdent.gif" align="absMiddle" width="20" height="20">\r
                <img id="btnIndent"   onmousedown="doStyle('Indent')" alt="@{IncreaseIndent}" src="images/icon_indent.gif" align="absMiddle" width="20" height="20">\r
+               <img id="btnSelect" onclick="doStyle('SelectAll')" alt="@{SelectAll}" src="images/icon_select_all.gif" align="absMiddle" width="20" height="20">\r
                <span id="featureHistory">\r
-               <img class="spacer" src="images/spacer.gif" width="2"><span class="sep"></span>\r
+               <img class="spacer" src="images/spacer.gif" width="10"><span class="sep"></span>\r
                <img id="btnPrev" onmousedown="document.execCommand('Undo')" alt="@{HistoryBack}"    src="images/icon_undo.gif" align="absMiddle" width="20" height="20">\r
                <img id="btnNext" onmousedown="document.execCommand('Redo')"  alt="@{HistoryForward}" src="images/icon_redo.gif" align="absMiddle" width="20" height="20">\r
        </span></nobr></td>\r
@@ -181,8 +182,6 @@ var tEdit = null;
                <img id="btnRule"   onclick="doStyle('InsertHorizontalRule')" alt="@{InsertLine}" src="images/icon_rule.gif" align="absMiddle" width="20" height="20">\r
                <img id="btnSmile"  onclick="insert('smile')" alt="@{InsertSmily}" src="images/em.icon.smile.gif" align="absMiddle" width="15" height="15">\r
                <img id="btnChar"       onclick="insert('char')" alt="@{InsertCharacter}" src="images/icon_ins_char.gif" align="absMiddle" width="20" height="20" border="0">\r
-               <img class="spacer" src="images/spacer.gif" width="2"><span class="sep"></span>\r
-               <img id="btnAbout"  onclick="insert('about')" alt="@{About}" src="images/icon_about.gif" align="absMiddle" width="16" height="16">\r
     </span></nobr></td></tr>\r
        <tr id="featureStyleBar" ondragstart="handleDrag(0)" onmouseup="press(false)" onmousedown="press(true)" onmouseover="hover(true)" onmouseout="hover(false)">\r
     <td colspan=2 class="rebar"><nobr><span class="toolbar">\r

diff --git a/lib/rte/rte.js b/lib/rte/rte.js
index 6734d2ea831036ff77edb4b159d42acc36b18ec5..01c0d0c3014659a8cb426443b36b47dcca2df51b 100644 (file)
--- a/lib/rte/rte.js
+++ b/lib/rte/rte.js
@@ -326,7 +326,7 @@ function pickColor(fg)
       setState(el, true);\r
    }\r
    color.style.top = window.event.clientY + 10;\r
-   color.style.left = window.event.clientX - 100;\r
+   color.style.left = window.event.clientX - 250;\r
    color.style.display = 'block';\r
    color._fg = fg;\r
 }\r