Menu
▾
▴
[TWiki-Dev] [SVN] MichaelDaum r15580 - in twiki/branches/MAIN/twikiplugins/NatEditContrib: data/TWiki lib/TWiki/Contrib lib/TWiki/Contrib/NatEditContrib pub/TWiki/NatEditContrib pub/TWiki/NatEditContrib/default templates
Author: MichaelDaum
Date: 2007-11-13 14:02:17 -0600 (Tue, 13 Nov 2007)
New Revision: 15580
Modified:
twiki/branches/MAIN/twikiplugins/NatEditContrib/data/TWiki/NatEditContrib.txt
twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib.pm
twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib/DEPENDENCIES
twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/default/buttons_sprite.png
twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/default/styles.css
twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/edit.js
twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/styles.css
twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/editjavascript.natedit.tmpl
twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.natedit.tmpl
twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.word.natedit.tmpl
twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/previewtoolbar.natedit.tmpl
Log:
Item4964: fixing init steps
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/data/TWiki/NatEditContrib.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/data/TWiki/NatEditContrib.txt 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/data/TWiki/NatEditContrib.txt 2007-11-13 20:02:17 UTC (rev 15580)
@@ -12,8 +12,6 @@
mail the author.
-->
%TOC%
-
----++ Description
<table style="float:right">
<tr>
<td><img src="%ATTACHURLPATH%/wikiringlogo40x40.png"></td>
@@ -22,6 +20,8 @@
</td>
</tr>
</table>
+
+---++ Description
The <nop>NatEdit is an wiki editor that helps in learning the <nop>TWikiMarkup Language
by providing a GUI. By design, this is not a wysiwyg editor that tries to generate the
correct TML in the background. Instead, the user is still in charge of writing correct
@@ -87,38 +87,44 @@
will be inserted. If there's a current selection, then it will be used instead of the
=<sample-text>=.
+<div class="natEditToolBar" style="height:auto">
| *Name* | *Icon* | *Description* | *Default* |
-| NATEDIT_BOLD | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_bold.png" alt="bold" /> | bold text | '*', 'Bold text', '*' |
-| NATEDIT_ITALIC | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_italic.png" alt="italic" /> | italic text | '_', 'Italic text', '_' |
-| NATEDIT_MONO | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_mono.png" alt="monospace" /> | monospace text | '=', 'Monospace text', '=' |
-| NATEDIT_UNDERLINE | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_underlined.png" alt="underlined" /> | underlined text | '<<nop>u>', 'Underlined text', '</u>' |
-| NATEDIT_STRIKE | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_strike.png" alt="strike" /> | striked text | '<<nop>strike>', 'Strike through text', '<<nop>/strike>' |
-| NATEDIT_SUB | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_sub.png" alt="sub" /> | subscribed text | '<<nop>sub>', 'Subscript text', '<<nop>/sub>' |
-| NATEDIT_SUP | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_super.png" alt="super" /> | superscribed text | '<<nop>sup>', 'Superscript text', '<<nop>/sup>' |
-| NATEDIT_LEFT | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_left.png" alt="left" /> | left adjusted section | '<<nop>div style=\"text-align:left\">\n','Align left','\n<<nop>\/div>\n' |
-| NATEDIT_RIGHT | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_right.png" alt="right" /> | right adjusted section | '<<nop>div style=\"text-align:right\">\n','Align right','\n<<nop>\/div>\n' |
-| NATEDIT_CENTER | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_center.png" alt="center" /> | centered section | '<<nop>div style=\"text-align:center\">\n','Center text','\n<<nop>\/div>\n' |
-| NATEDIT_JUSTIFY | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_justify.png" alt="justify" /> | justify section | '<<nop>div style=\"text-align:justify\">\n','Justify text','\n<<nop>\/div>\n' |
-| NATEDIT_H1 | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_h1.png" alt="h1" /> | headline level 1 | '\n---+ ','Headline text','\n' |
-| NATEDIT_H2 | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_h2.png" alt="h2" /> | headline level 2 | '\n---++ ','Headline text','\n' |
-| NATEDIT_H3 | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_h3.png" alt="h3" /> | headline level 3 | '\n---+++ ','Headline text','\n' |
-| NATEDIT_H4 | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_h4.png" alt="h4" /> | headline level 4 | '\n---++++ ','Headline text','\n' |
-| NATEDIT_IMAGE | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_image.png" alt="image" /> | image button |\
+| NATEDIT_BOLD | <span class="natEditBoldButton"><a></a></span> | bold text | '*', 'Bold text', '*' |
+| NATEDIT_ITALIC | <span class="natEditItalicButton"><a></a></span> | italic text | '_', 'Italic text', '_' |
+| NATEDIT_MONO | <span class="natEditMonoButton"><a></a></span> | monospace text | '=', 'Monospace text', '=' |
+| NATEDIT_UNDERLINE | <span class="natEditUnderlineButton"><a></a></span> | underlined text | '<<nop>u>', 'Underlined text', '</u>' |
+| NATEDIT_STRIKE | <span class="natEditStrikeButton"><a></a></span> | striked text | '<<nop>strike>', 'Strike through text', '<<nop>/strike>' |
+| NATEDIT_LEFT | <span class="natEditLeftButton"><a></a></span> | left adjusted section | '<<nop>div style=\"text-align:left\">\n','Align left','\n<<nop>\/div>\n' |
+| NATEDIT_RIGHT | <span class="natEditRightButton"><a></a></span> | right adjusted section | '<<nop>div style=\"text-align:right\">\n','Align right','\n<<nop>\/div>\n' |
+| NATEDIT_CENTER | <span class="natEditCenterButton"><a></a></span> | centered section | '<<nop>div style=\"text-align:center\">\n','Center text','\n<<nop>\/div>\n' |
+| NATEDIT_JUSTIFY | <span class="natEditJustifyButton"><a></a></span> | justify section | '<<nop>div style=\"text-align:justify\">\n','Justify text','\n<<nop>\/div>\n' |
+| NATEDIT_H1 | <span class="natEditH1Button"><a></a></span> | headline level 1 | '\n---+ ','Headline text','\n' |
+| NATEDIT_H2 | <span class="natEditH2Button"><a></a></span> | headline level 2 | '\n---++ ','Headline text','\n' |
+| NATEDIT_H3 | <span class="natEditH3Button"><a></a></span> | headline level 3 | '\n---+++ ','Headline text','\n' |
+| NATEDIT_H4 | <span class="natEditH4Button"><a></a></span> | headline level 4 | '\n---++++ ','Headline text','\n' |
+| NATEDIT_IMAGE | <span class="natEditImageButton"><a></a></span> | image button |\
<<nop>img src=\"%<nop>ATTACHURLPATH%/','Example.jpg','\" title=\"Example\" /> \
<br /> or \
%<nop>IMAGE{\"','Example.jpg','|400px|Caption text|frame|center\"}<nop>% \
when the <nop>ImagePlugin is installed |
-| NATEDIT_EXTLINK | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_ext.png" alt="ext link" /> | external link | '[<nop>[http://...][','link text',']]' |
-| NATEDIT_INTLINK | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_int.png" alt="int link" /> | internal link | '[<nop>[','web.topic][link text',']]' |
-| NATEDIT_MATH | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_formula.png" alt="math" /> | only visible if the <nop>MathModePlugin is installed | '<<nop>latex title=\"Example\">\n','\\sum_{x=1}^{n}\\frac{1}{x}','\n<<nop>/latex>' |
-| NATEDIT_SIGNATURE | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_signature.png" alt="signature" /> | signature button | '-- ','%<nop>WIKIUSERNAME%',' - %<nop>DATE%' |
-| NATEDIT_VERBATIM | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_verbatim.png" alt="verbatim" /> | section ignoring contained wiki markup | '<<nop>verbatim>\n','Insert non-formatted text here','\n<\/verbatim>\n' |
-| NATEDIT_TABLE | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_table.png" alt="table" /> | add table | creates new table |
-| NATEDIT_NUMBERED | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_numbered.png" alt="numbered list" /> | make into numbered point | 3 spaces 1 space |
-| NATEDIT_BULLET | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_bullet.png" alt="bullet point" /> | make into bullet point | 3 spaces * space |
-| NATEDIT_INDENT | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_indent.png" alt="indent" /> | indent | adds 3 spaces |
-| NATEDIT_UNDENT | <img src="%ATTACHURLPATH%/%NATEDIT_THEME%/button_undent.png" alt="undent" /> | un-indent | removes 3 spaces, or 3 spaces * space or 3 spaces 1 space |
+| NATEDIT_EXTLINK | <span class="natEditExtButton"><a></a></span> | external link | '[<nop>[http://...][','link text',']]' |
+| NATEDIT_INTLINK | <span class="natEditIntButton"><a></a></span> | internal link | '[<nop>[','web.topic][link text',']]' |
+| NATEDIT_MATH | <span class="natEditMathButton"><a></a></span> | only visible if the <nop>MathModePlugin is installed | '<<nop>latex title=\"Example\">\n','\\sum_{x=1}^{n}\\frac{1}{x}','\n<<nop>/latex>' |
+| NATEDIT_SIGNATURE | <span class="natEditSignatureButton"><a></a></span> | signature button | '-- ','%<nop>WIKIUSERNAME%',' - %<nop>DATE%' |
+| NATEDIT_VERBATIM | <span class="natEditVerbatimButton"><a></a></span> | section ignoring contained wiki markup | '<<nop>verbatim>\n','Insert non-formatted text here','\n<\/verbatim>\n' |
+| NATEDIT_SUB | | subscribed text | '<<nop>sub>', 'Subscript text' , '<<nop>/sub>' |
+| NATEDIT_SUP | | superscribed text | '<<nop>sup>', 'Superscript text', '<<nop>/sup>' |
+| NATEDIT_TABLE | | add table | creates new table |
+| NATEDIT_NUMBERED | | make into numbered point | 3 spaces 1 space |
+| NATEDIT_BULLET | | make into bullet point | 3 spaces * space |
+| NATEDIT_INDENT | | indent | adds 3 spaces |
+| NATEDIT_UNDENT | | un-indent | removes 3 spaces, or 3 spaces * space or 3 spaces 1 space |
+</div>
+<style type="text/css">
+@import url("%ATTACHURLPATH%/styles.css");
+@import url("%ATTACHURLPATH%/default/styles.css");
+</style>
If you want to customize the help text in the bottom part of the editor then
set the variable =NATEDIT_HELPTEXT= to the name of a topic that contains
@@ -147,8 +153,11 @@
| Author: | TWiki:Main/MichaelDaum |
| Copyright ©: | 2007 Michael Daum http://wikiring.de |
| License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-| Version: | v1.53 |
+| Version: | v1.54 |
| Change History: | |
+| 13 Nov 2007 | fixed calculation of textarea offset while autoresizing it to window height, \
+ fixed initialization not to use Behaviour anymore, \
+ fixed autohide/showing of word toolbar together with tinymce |
| 08 Oct 2007 | fixed word toolbar together with <nop>TinyMCEPlugin; \
fixed launching a popup by not relying on twiki's javascript; \
using css sprites instead of individual buttons |
@@ -181,6 +190,7 @@
| Feedback: | TWiki:Plugins/%TOPIC%Dev |
| Appraisal: | TWiki:Plugins/%TOPIC%Appraisal |
--- TWiki:Main.MichaelDaum - 08 Oct 2007
+-- TWiki:Main.MichaelDaum - 13 Nov 2007
%META:FILEATTACHMENT{name="screenshot1.png" attachment="screenshot1.png" attr="" comment="" date="1175688869" path="screenshot1.png" size="61040" stream="screenshot1.png" user="TWikiContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo40x40.png" attachment="wikiringlogo40x40.png" attr="h" comment="" date="1189787359" path="wikiringlogo40x40.png" size="2571" stream="wikiringlogo40x40.png" tmpFilename="" user="TWikiContributor" version="1"}%
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib/DEPENDENCIES
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib/DEPENDENCIES 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib/DEPENDENCIES 2007-11-13 20:02:17 UTC (rev 15580)
@@ -0,0 +1,2 @@
+TWiki::Plugins::JQueryPlugin,>=0.3,perl,Required. Download from the TWiki:Plugins/JQueryPlugin add-on.
+
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib.pm 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/lib/TWiki/Contrib/NatEditContrib.pm 2007-11-13 20:02:17 UTC (rev 15580)
@@ -1,6 +1,6 @@
package TWiki::Contrib::NatEditContrib;
use vars qw($VERSION $RELEASE);
$VERSION = '$Rev$';
-$RELEASE = 'v1.53';
+$RELEASE = 'v1.54';
1;
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/default/buttons_sprite.png
===================================================================
(Binary files differ)
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/default/styles.css
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/default/styles.css 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/default/styles.css 2007-11-13 20:02:17 UTC (rev 15580)
@@ -1,7 +1,11 @@
/* default theme */
.natEditToolBar { height:26px; margin:0px;}
.natEditToolBar a:hover,
-.natEditToolBar a {width:24px; height:24px; background-image:url(buttons_sprite.png);}
+.natEditToolBar a {
+ width:25px;
+ height:25px;
+ background-image:url(buttons_sprite.png);
+}
.natEditH1Button a { background-position:0px 0px; }
.natEditH1Button a:hover { background-position:0px -25px; }
.natEditH2Button a { background-position:-25px 0px; }
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/edit.js
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/edit.js 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/edit.js 2007-11-13 20:02:17 UTC (rev 15580)
@@ -3,6 +3,7 @@
// IE range selection adapted from http://twiki.org/cgi-bin/view/Plugins/SmartEditAddOn
var txtarea;
+var txtareaOffset = -1;
var isOpera=window.opera?1:0;
@@ -191,13 +192,28 @@
return 0; // outch
}
+function getOffset(elem) {
+ //alert("elem="+elem);
+ if (elem) {
+ var parentElem = elem.offsetParent;
+ var parentOffset = 0;
+ if (parentElem) {
+ parentOffset = getOffset(parentElem);
+ }
+ return elem.offsetTop + parentOffset;
+ } else {
+ return 0;
+ }
+}
+
function fixHeightOfTheText() {
window.onresize = null; /* disable onresize handler */
var height = getWindowHeight();
- var offset;
if (height) {
- offset = txtarea.offsetTop;
- height = height-offset-80;
+ if (txtareaOffset < 0) {
+ txtareaOffset = getOffset(txtarea);
+ }
+ height = height-txtareaOffset-80;
txtarea.style.height = height + "px";
}
setTimeout("establishOnResize()", 100); /* add a slight timeout not to DoS IE */
@@ -222,73 +238,90 @@
txtarea = areas[0];
}
}
+
+ // establish tooltips
+ $(".natEditToolBar a, .natEditToolBar input").Tooltip({
+ delay:200,
+ track:true,
+ showURL:false,
+ extraClass:'twiki',
+ showBody:": "
+ });//.css('background','pink');
+
+ // tinymce toggle
+ if (typeof(tinyMCE) != 'undefined') {
+ var elems = document.getElementsByName('hide_in_wysiwyg');
+ for (var i = 0; i < elems.length; i++) {
+ elems[i].style['display'] = 'none';
+ }
+ }
+ var elem = document.getElementById('natEditToolBar');
+ if (elem) {
+ elem.style['visibility'] = 'visible';
+ }
+
+ // establish textarea resizer
fixHeightOfTheText();
establishOnResize();
- if (twiki.JQueryPluginEnabled) {
+ // establish the table dialog
+ var natEditTableDialog = $('#natEditTableDialog')[0];
- // establish the table dialog
- $(function() {
- // cache the question element
- var natEditTableDialog = $('#natEditTableDialog')[0];
-
- // table button
- $('#natEditTableButtonLink').href='';
- $('#natEditTableButtonLink').click(function() {
+ // table button
+ $('#natEditTableButtonLink').href='';
+ $('#natEditTableButtonLink').click(function() {
- if (document.selection && !isOpera) {
- var cursorPos = getCursorPosition();
- $.startPos = cursorPos.startPos;
- $.endPos = cursorPos.endPos;
+ if (document.selection && !isOpera) {
+ var cursorPos = getCursorPosition();
+ $.startPos = cursorPos.startPos;
+ $.endPos = cursorPos.endPos;
- } // end IE
+ } // end IE
- $.blockUI(natEditTableDialog, { width: '275px' });
- return false;
- });
-
- // dialog buttons
- $('#yes').click(function() {
- // read the rows&col's and create table to that spec
- var rows = $('#rows').val()
- var cols = $('#columns').val();
- $.unblockUI();
-
- var newTable = '\n';
- for (var i = 0; i < rows; i++) {
- newTable += '|';
- for (var j = 0; j < cols; j++) {
- if (i == 0) {
- newTable += ' ** ';
- } else {
- newTable += ' ';
- }
- newTable += ' |';
- }
- newTable += '\n';
+ $.blockUI(natEditTableDialog, { width: '275px' });
+ return false;
+ });
+
+ // dialog buttons
+ $('#yes').click(function() {
+ // read the rows&col's and create table to that spec
+ var rows = $('#rows').val()
+ var cols = $('#columns').val();
+ $.unblockUI();
+
+ var newTable = '\n';
+ for (var i = 0; i < rows; i++) {
+ newTable += '|';
+ for (var j = 0; j < cols; j++) {
+ if (i == 0) {
+ newTable += ' ** ';
+ } else {
+ newTable += ' ';
}
- txtarea.focus();
- //TODO: where in the table shall we place the cursor?
- // help IE out by re-selecting what was selected before :(
- if (document.selection && !isOpera) { //IE
- ieSelect($.startPos, $.endPos);
- }
- natInsertTags('','',newTable);
+ newTable += ' |';
+ }
+ newTable += '\n';
+ }
+ txtarea.focus();
+ //TODO: where in the table shall we place the cursor?
+ // help IE out by re-selecting what was selected before :(
+ if (document.selection && !isOpera) { //IE
+ ieSelect($.startPos, $.endPos);
+ }
+ natInsertTags('','',newTable);
- return false;
- });
-
- $('#cancel').click(function() {
- $.unblockUI();
-
- txtarea.focus();
- // help IE out by re-selecting what was selected before :(
- if (document.selection && !isOpera) { //IE
- ieSelect($.startPos, $.endPos);
- }
- });
- });
- }
+ return false;
+ });
+
+ $('#cancel').click(function() {
+ $.unblockUI();
+
+ txtarea.focus();
+ // help IE out by re-selecting what was selected before :(
+ if (document.selection && !isOpera) { //IE
+ ieSelect($.startPos, $.endPos);
+ }
+ });
return true;
}
@@ -361,4 +394,5 @@
range.select();
}
-addLoadEvent(natEditInit);
+// init on document ready
+$(natEditInit);
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/styles.css
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/styles.css 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/pub/TWiki/NatEditContrib/styles.css 2007-11-13 20:02:17 UTC (rev 15580)
@@ -17,7 +17,7 @@
ul.natEditHelpTools {
float:right;
}
-.natEditToolBar {
+.natEditHiddenToolBar {
visibility:hidden; /* becomes visible during load event */
}
@@ -30,19 +30,14 @@
display:none;
}
+.natEditToolBar a:hover,
.natEditToolBar a {
text-decoration:none;
+ background-color:transparent;
background-position:top left;
background-repeat:no-repeat;
float:left;
- display:block;
}
-.natEditToolBar a:hover {
- text-decoration:none;
- background-color:transparent;
- _background-color:white;
- border:0px;
-}
.natEditOptionTools {
font-size:12px;
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/editjavascript.natedit.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/editjavascript.natedit.tmpl 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/editjavascript.natedit.tmpl 2007-11-13 20:02:17 UTC (rev 15580)
@@ -105,16 +105,5 @@
win.focus();
}
-addLoadEvent(function() {
- if (typeof(tinyMCE) != 'undefined') {
- var elems = document.getElementsByName('hide_in_wysiwyg');
- for (var i = 0; i < elems.length; i++) {
- elems[i].style['display'] = 'none';
- }
- }
- var elem = document.getElementById('natEditToolBar');
- if (elem)
- elem.style['visibility'] = 'visible';
-});
</script>
<!-- //templatejavascript -->%TMPL:END%
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.natedit.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.natedit.tmpl 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.natedit.tmpl 2007-11-13 20:02:17 UTC (rev 15580)
@@ -1,4 +1,4 @@
-%TMPL:DEF{"edittoolbar"}%<div class="natEditToolBar" id="natEditToolBar">
+%TMPL:DEF{"edittoolbar"}%<div class="natEditToolBar natEditHiddenToolBar" id="natEditToolBar">
%TMPL:P{"helptools"}%
%TMPL:P{"headlinetools"}%
%TMPL:P{"texttools"}%
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.word.natedit.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.word.natedit.tmpl 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/edittoolbar.word.natedit.tmpl 2007-11-13 20:02:17 UTC (rev 15580)
@@ -2,7 +2,7 @@
%{ Word toolbar}%
-%TMPL:DEF{"edittoolbar"}%<div class="natEditToolBar" id="natEditToolBar">
+%TMPL:DEF{"edittoolbar"}%<div class="natEditToolBar natEditHiddenToolBar" id="natEditToolBar">
%{ exittools }%<ul class="natEditExitTools">
%TMPL:P{"savebutton"}%
%TMPL:P{"checkpointbutton"}%
Modified: twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/previewtoolbar.natedit.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/previewtoolbar.natedit.tmpl 2007-11-13 19:13:44 UTC (rev 15579)
+++ twiki/branches/MAIN/twikiplugins/NatEditContrib/templates/previewtoolbar.natedit.tmpl 2007-11-13 20:02:17 UTC (rev 15580)
@@ -1,5 +1,5 @@
%TMPL:INCLUDE{"edittoolbar"}%
-%TMPL:DEF{"previewtoolbar"}%<div class="natEditToolBar">%TMPL:P{"previewtools"}%</div>%TMPL:END%
+%TMPL:DEF{"previewtoolbar"}%<div class="natEditToolBar" id="natEditToolBar">%TMPL:P{"previewtools"}%</div>%TMPL:END%
%TMPL:DEF{"previewtools"}%<ul class="natEditPreviewTools">
%TMPL:P{"editbutton"}%
|