Changeset 1819
- Timestamp:
- 01/07/09 18:51:40 (4 years ago)
- Location:
- trunk/NatEditPlugin
- Files:
-
- 3 added
- 2 deleted
- 13 edited
-
data/TWiki/NatEditPlugin.txt (modified) (3 diffs)
-
lib/TWiki/Plugins/NatEditPlugin.pm (modified) (3 diffs)
-
lib/TWiki/Plugins/NatEditPlugin/MANIFEST (modified) (2 diffs)
-
lib/TWiki/Plugins/NatEditPlugin/build.pl (modified) (1 diff)
-
pub/TWiki/NatEditPlugin/edit.js (modified) (2 diffs)
-
pub/TWiki/NatEditPlugin/jquery.natedit.js (modified) (2 diffs)
-
pub/TWiki/NatEditPlugin/styles.css (modified) (3 diffs)
-
pub/TWiki/NatEditPlugin/word (deleted)
-
pub/TWiki/NatEditPlugin/word-natedit.jpg (deleted)
-
templates/edit.natedit.tmpl (modified) (4 diffs)
-
templates/editjavascript.natedit.tmpl (modified) (1 diff)
-
templates/edittext.natedit.tmpl (added)
-
templates/edittoolbar.natedit.tmpl (modified) (1 diff)
-
templates/form.natedit.tmpl (modified) (1 diff)
-
templates/preview.natedit.tmpl (modified) (1 diff)
-
templates/previewtoolbar.natedit.tmpl (modified) (1 diff)
-
templates/settings.natedit.tmpl (added)
-
templates/settingstoolbar.natedit.tmpl (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NatEditPlugin/data/TWiki/NatEditPlugin.txt
r1340 r1819 77 77 78 78 ---++ Plugin Info 79 Sponsored by [[http://www.trivadis.com][Trivadis AG]] & [[http://twiki.net][TWIKI.NET]]79 Sponsored by [[http://www.trivadis.com][Trivadis AG]] 80 80 81 81 | Author: | Michael Daum | 82 | Copyright ©: | 2007-200 8Michael Daum http://michaeldaumconsulting.com |82 | Copyright ©: | 2007-2009 Michael Daum http://michaeldaumconsulting.com | 83 83 | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | 84 | Version: | v3. 20 |84 | Version: | v3.30 | 85 85 | Change History: | | 86 | 07 Jan 2009 | support for <nop>TinyMCEPlugin wysiwyg editor; \ 87 removed non-maintained "word" style; \ 88 fixes for foswiki/compat; \ 89 added settings template; \ 90 distinguishing _restore revision_ from a normal _edit_; \ 91 made <nop>DBCachePlugin's topic title feature optional; \ 92 added "Show on screen" settings to easily switch off form, attachment or meta:comments (forthcoming); \ 93 fixed action=text; \ 94 removing <nop>TopicTitle formfield from the "Form" tab if it is already on the "Text" tab | 86 95 | 18 Nov 2008 | fixing form data being nulled on preview; \ 87 96 using jquery to submit the data | … … 108 117 added bullet and numbered lists buttons & Javascript \ 109 118 added create Table button and Javascript \ 110 work done by Sven i Dowideit [[http://DistributedINFORMATION.com][DistributedINFORMATION]] for [[http://twiki.net][TWIKI.NET]] |119 work done by Sven Dowideit [[http://DistributedINFORMATION.com][DistributedINFORMATION]] | 111 120 | 21 May 2007 | fixed display of toolbar buttons | 112 121 | 01 May 2007 | made natedit themable | … … 129 138 | Perl Version: | - | 130 139 | Plugin Home: | http://foswiki.org/Extensions/%TOPIC% | 131 | Feedback: | http://foswiki.org/Extensions/%TOPIC%Dev |132 140 133 141 %META:FILEATTACHMENT{name="wikiringlogo40x40.png" attr="h" autoattached="1" comment="" date="1207667571" path="wikiringlogo40x40.png" size="2571" user="ProjectContributor" version="1"}% -
trunk/NatEditPlugin/lib/TWiki/Plugins/NatEditPlugin.pm
r1340 r1819 1 # Copyright (C) 2007-2008 Michael Daum http://michaeldaumconsulting.com 2 # 3 # based on NatEditPlugin: 4 # Copyright (C) 2003-2008 MichaelDaum http://michaeldaumconsulting.com 1 # Copyright (C) 2007-2009 Michael Daum http://michaeldaumconsulting.com 5 2 # 6 3 # This program is free software; you can redistribute it and/or … … 64 61 unless ($skin =~ /\b(natedit)\b/) { 65 62 $skin = "natedit,$skin"; 66 $TWiki::Plugins::SESSION->{prefs}->pushPreferenceValues('SESSION', { SKIN => $skin } ); 63 my $prefs = $TWiki::Plugins::SESSION->{prefs} || $Foswiki::Plugins::SESSION->{prefs}; 64 $prefs->pushPreferenceValues('SESSION', { SKIN => $skin } ); 67 65 } 68 66 … … 289 287 } 290 288 291 292 289 1; -
trunk/NatEditPlugin/lib/TWiki/Plugins/NatEditPlugin/MANIFEST
r427 r1819 1 data/TWiki/NatEditPlugin.txt 0644 2 data/TWiki/NatEditPluginJSUnitTests.txt 0644 1 3 data/TWiki/NatEditHelpText.txt 0644 2 data/TWiki/NatEditPluginJSUnitTests.txt 06443 data/TWiki/NatEditPlugin.txt 06444 4 data/TWiki/NatEditWordHelpText.txt 0644 5 5 lib/TWiki/Plugins/NatEditPlugin.pm 0644 … … 31 31 templates/preview.natedit.tmpl 0644 32 32 templates/previewtoolbar.natedit.tmpl 0644 33 templates/settings.natedit.tmpl 0644 34 templates/edittext.natedit.tmpl 0644 35 templates/settingstoolbar.natedit.tmpl 0644 -
trunk/NatEditPlugin/lib/TWiki/Plugins/NatEditPlugin/build.pl
r1065 r1819 6 6 } 7 7 8 use TWiki::Contrib::Build;9 $build = new TWiki::Contrib::Build( 'NatEditPlugin' );8 use Foswiki::Contrib::Build; 9 $build = new Foswiki::Contrib::Build( 'NatEditPlugin' ); 10 10 $build->build($build->{target}); 11 11 -
trunk/NatEditPlugin/pub/TWiki/NatEditPlugin/edit.js
r776 r1819 4 4 5 5 function submitEditForm(script, action) { 6 $("#savearea").val($("#topic").val()); 7 $(".natEditBottomBar a").each(function () { 8 this.blur(); 9 }); 6 var topicText = $("#topic").val(); 7 $("#savearea").val(topicText); 10 8 if (typeof(beforeSubmitHandler) != 'undefined') { 11 9 beforeSubmitHandler(script, action); … … 26 24 27 25 $(function() { 28 window.setTimeout(function() { 29 var foundMce = $(".mceEditor").length; 30 if (foundMce) { 31 $(".natEditToolBar").hide(); 32 } 33 /* 34 if (TWikiTiny) { 35 TWikiTiny['switchToRaw'] = function (inst) { 36 alert("switch to raw"); 37 TWikiTiny.switchToRaw(inst); 38 $(".natEditToolBar").show(); 39 }; 40 alert("switchtoraw="+TWikiTiny['switchToRaw']); 41 } 42 */ 43 }, 1); 26 window.setTimeout(function() { 27 if (typeof(TWikiTiny) != 'undefined' || typeof(FoswikiTiny) != 'undefined') { 28 $(".natEditToolBar").hide(); /* switch off natedit toolbar */ 29 30 /* 31 var oldSwitchToRaw = TWikiTiny.switchToRaw; 32 TWikiTiny.switchToRaw = function(inst) { 33 $(".natEditToolBar").show(); 34 oldSwitchToRaw(inst); 35 }; 36 37 TWikiTiny['switchToRaw'] = function (inst) { 38 alert("switch to raw"); 39 TWikiTiny.switchToRaw(inst); 40 $(".natEditToolBar").show(); 41 }; 42 */ 43 } 44 }, 1); 44 45 }); -
trunk/NatEditPlugin/pub/TWiki/NatEditPlugin/jquery.natedit.js
r582 r1819 1 1 /* 2 * jQuery NatEdit plugin 1. 12 * jQuery NatEdit plugin 1.2 3 3 * 4 * Copyright (c) 2008 Michael Daum http://michaeldaumconsulting.com4 * Copyright (c) 2008-2009 Michael Daum http://michaeldaumconsulting.com 5 5 * 6 6 * Dual licensed under the MIT and GPL licenses: … … 642 642 if (foundNatEdit) { 643 643 var savetext = $("#savearea").val(); 644 if (savetext ) {644 if (savetext.length) { 645 645 $("#topic").val(savetext); 646 646 } -
trunk/NatEditPlugin/pub/TWiki/NatEditPlugin/styles.css
r1194 r1819 15 15 .natEditTextArea { 16 16 _width:99% !important; /* bloddy IE */ 17 font-family:"Bitstream Vera Sans Mono", "Andale Mono", Courier,monospace;17 font-family:"Bitstream Vera Sans Mono", "Andale Mono", monospace; 18 18 font-size:12px; 19 19 } … … 73 73 } 74 74 75 .foswikiForm, 75 76 .twikiForm { 76 77 clear:both; … … 93 94 94 95 /* pattern skin tweaks */ 96 .patternPreviewPage .patternTopic, 95 97 .patternPreviewPage .foswikiTopic, 98 .patternEditPage .patternTopic, 96 99 .patternEditPage .foswikiTopic { 97 100 margin:0px; 98 101 } 102 .patternEditPage .foswikiForm, 99 103 .patternEditPage .twikiForm { 100 104 margin:0px; -
trunk/NatEditPlugin/templates/edit.natedit.tmpl
r1340 r1819 4 4 %TMPL:INCLUDE{"edithelp"}%<!-- edithelp// --> 5 5 6 %TMPL:DEF{"titleaction"}% %MAKETEXT{"(edit)"}%%TMPL:END%6 %TMPL:DEF{"titleaction"}%(%IF{"defined 'rev'" then="%MAKETEXT{"restore"}%" else="%MAKETEXT{"edit"}%"}%)%TMPL:END% 7 7 %TMPL:DEF{"pagetitlestylewrapper"}%<!-- backwards compatibility -->%TMPL:END% 8 %TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">%TMPL:P{"pagetitle"}%</h1>%TMPL:END% 8 %TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">[[%WEB%.%TOPIC%][%TOPIC%]] (%IF{"defined 'rev'" then="%MAKETEXT{"restore"}%" else="%IF{"istopic '%WEB%.%TOPIC%'" then="%MAKETEXT{"edit"}%" else="%MAKETEXT{"new"}%"}%"}%)</h1>%TMPL:END% 9 10 %TMPL:DEF{"gettopictitle"}%%TMPL:P{context="DBCachePluginEnabled" then="gettopictitle_dbcache" else="gettopictitle_default"}%%TMPL:END% 11 %TMPL:DEF{"gettopictitle_default"}%%IF{"defined 'TOPICTITLE'" then="%TOPICTITLE%" else=""}%%TMPL:END% 12 %TMPL:DEF{"gettopictitle_dbcache"}%%GETTOPICTITLE{encode="entity" default=""}%%TMPL:END% 9 13 10 14 %TMPL:DEF{"content"}%<!-- content --> … … 44 48 45 49 %TMPL:DEF{"textarea"}%<!-- textarea --> 46 <textarea id="topic" class=" foswikiTextareanatEditTextArea natedit" name="text" style="width:99%" rows="22" cols="70">%TEXT%</textarea>50 <textarea id="topic" class="twikiTextarea foswikiTextarea foswikiWysiwygEdit natEditTextArea natedit" name="text" style="width:99%" rows="22" cols="70">%TEXT%</textarea> 47 51 <!-- //textarea -->%TMPL:END% 48 52 … … 71 75 <tr class="natEditTopicTitle"> 72 76 <th>Title:</th> 73 <td><input class="twikiInputField" type="text" name="TopicTitle" size="80" value="%URLPARAM{"TopicTitle" default="% GETTOPICTITLE{encode="entity" default=""}%"}%" /></td>77 <td><input class="twikiInputField" type="text" name="TopicTitle" size="80" value="%URLPARAM{"TopicTitle" default="%TMPL:P{"gettopictitle"}%"}%" /></td> 74 78 </tr> 75 79 </table> … … 95 99 96 100 %TMPL:DEF{"settings"}%<!-- settings --> 97 <b><label for="parent">%MAKETEXT{"Parent topic"}%:</b></label> 98 <input class="twikiInputField" type="text" id="parent" name="topicparent" size="40" value="%TOPICPARENT%" /> 101 <div class="twikiFormSteps foswikiFormSteps"> 102 <h2>Topic preferences:</h2> 103 <div class="twikiFormStep foswikiFormStep twikiFormLast"> 104 <h3>%MAKETEXT{"Parent topic"}%:</h3> 105 <input class="twikiInputField" type="text" name="topicparent" size="40" value="%TOPICPARENT%" /> 106 </div> 107 </div> 108 <div class="twikiFormSteps foswikiFormSteps"> 109 <h2>Show on screen:</h2> 110 <div class="twikiFormStep foswikiFormStep twikiFormLast"> 111 <label><input type="checkbox" class="twikiRadio foswikiRadio" name="Local+DISPLAYFORM" value="%IF{"'%VAR{"DISPLAYFORM"}%'='off'" then="on"}%" %IF{"$'DISPLAYFORM'='on' OR NOT defined 'DISPLAYFORM'" then="checked"}% />%MAKETEXT{"Data form"}%</label> 112 <input type="hidden" name="Local+DISPLAYFORM" value="%IF{"'%VAR{"DISPLAYFORM"}%'='off'" else="off"}%" /> 113 114 <label><input type="checkbox" class="twikiRadio foswikiRadio" name="Local+DISPLAYATTACHMENTS" value="%IF{"'%VAR{"DISPLAYATTACHMENTS"}%'='off'" then="on"}%" %IF{"$'DISPLAYATTACHMENTS'='on' OR NOT defined 'DISPLAYATTACHMENTS'" then="checked"}% />%MAKETEXT{"Attachments"}%</label> 115 <input type="hidden" name="Local+DISPLAYATTACHMENTS" value="%IF{"'%VAR{"DISPLAYATTACHMENTS"}%'='off'" else="off"}%" /> 116 117 <label><input type="checkbox" class="twikiRadio foswikiRadio" name="Local+DISPLAYCOMMENTS" value="%IF{"'%VAR{"DISPLAYCOMMENTS"}%'='off'" then="on"}%" %IF{"$'DISPLAYCOMMENTS'='on' OR NOT defined 'DISPLAYCOMMENTS'" then="checked"}% />%MAKETEXT{"Comments"}%</label> 118 <input type="hidden" name="Local+DISPLAYCOMMENTS" value="%IF{"'%VAR{"DISPLAYCOMMENTS"}%'='off'" else="off"}%" /> 119 </div> 120 </div> 121 99 122 <!-- //settings -->%TMPL:END% 100 123 -
trunk/NatEditPlugin/templates/editjavascript.natedit.tmpl
r1340 r1819 1 %TMPL:INCLUDE{"editjavascript"}%<!-- template: editjavascript.natedit.tmpl --> 2 %TMPL:DEF{"editjavascript"}%<!-- editjavascript --> 3 <script type="text/javascript"> 4 $(function() { 5 /* remove the second TopicTitle */ 6 $("[name='TopicTitle']:eq(1)").parents(".twikiFormStep").remove(); 7 }); 8 </script> 9 <!-- //editjavascript -->%TMPL:END% 10 %TMPL:DEF{"javascript"}%%TMPL:P{"defaultjavascript"}%%TMPL:P{"editjavascript"}%%TMPL:END% -
trunk/NatEditPlugin/templates/edittoolbar.natedit.tmpl
r1340 r1819 13 13 </div> 14 14 <!-- //bottomtopicactions -->%TMPL:END% 15 %TMPL:DEF{"savebutton"}%<li class="natEditSaveButton">%BUTTON{"%MAKETEXT{"Save"}%" title="%MAKETEXT{"Save and exit"}%" icon="tick" id="save" accesskey="s" onclick="submitEditForm('save', 'save')"}%</li>%TMPL:END% 16 %TMPL:DEF{"checkpointbutton"}%<li class="natEditCheckpointButton">%BUTTON{"%MAKETEXT{"Save and Continue"}%" title="%MAKETEXT{"Save and continue editing"}%" icon="disk" id="checkpoint" accesskey="w" onclick="submitEditForm('save', 'checkpoint')"}%</li>%TMPL:END% 15 %TMPL:DEF{"savebutton"}%<li class="natEditSaveButton">%IF{"defined 'rev'" 16 then="$percntBUTTON{\"%MAKETEXT{"Restore"}%\" title=\"%MAKETEXT{"Restore and exit"}%\" icon=\"arrow_undo\" id=\"save\" accesskey=\"r\" onclick=\"submitEditForm('save', 'save')\"}$percnt" 17 else="$percntBUTTON{\"%MAKETEXT{"Save"}%\" title=\"%MAKETEXT{"Save and exit"}%\" icon=\"tick\" id=\"save\" accesskey=\"s\" onclick=\"submitEditForm('save', 'save')\"}$percnt" 18 }%</li>%TMPL:END% 19 %TMPL:DEF{"checkpointbutton"}%<li class="natEditCheckpointButton">%IF{"defined 'rev'" 20 then="$percntBUTTON{\"%MAKETEXT{"Restore and Continue"}%\" title=\"%MAKETEXT{"Restore and continue editing"}%\" icon=\"disk\" id=\"checkpoint\" accesskey=\"w\" onclick=\"submitEditForm('save', 'checkpoint')\"}$percnt" 21 else="$percntBUTTON{\"%MAKETEXT{"Save and Continue"}%\" title=\"%MAKETEXT{"Save and continue editing"}%\" icon=\"disk\" id=\"checkpoint\" accesskey=\"w\" onclick=\"submitEditForm('save', 'checkpoint')\"}$percnt" 22 }%</li>%TMPL:END% 17 23 %TMPL:DEF{"previewbutton"}%<li class="natEditPreviewButton">%BUTTON{"%MAKETEXT{"Preview"}%" title="%MAKETEXT{"Preview your changes"}%" icon="eye" id="preview" accesskey="p" onclick="submitEditForm('preview', 'preview')"}%</li>%TMPL:END% 18 24 %TMPL:DEF{"cancelbutton"}%<li class="natEditCancelButton">%BUTTON{"%MAKETEXT{"Cancel"}%" title="%MAKETEXT{"Abandon changes and exit"}%" icon="cross" id="cancel" accesskey="c" onclick="submitEditForm('save', 'cancel')"}% </li>%TMPL:END% -
trunk/NatEditPlugin/templates/form.natedit.tmpl
r1340 r1819 2 2 %TMPL:DEF{"titleaction"}%%MAKETEXT{"(edit)"}% %TMPL:END% 3 3 4 %TMPL:DEF{"mandatory"}%<div class='twikiFormLegend' id="twikiFormMandatory"><span class=" twikiAlert">*</span> %MAKETEXT{"indicates mandatory fields"}% </div>%TMPL:END%4 %TMPL:DEF{"mandatory"}%<div class='twikiFormLegend' id="twikiFormMandatory"><span class="foswikiAlert twikiAlert">*</span> %MAKETEXT{"indicates mandatory fields"}% </div>%TMPL:END% 5 5 6 6 %TMPL:DEF{"repeatedformrows"}% %REPEAT% -
trunk/NatEditPlugin/templates/preview.natedit.tmpl
r1340 r1819 8 8 <div class="patternPreviewArea"> 9 9 <div class="patternContent"> 10 <div class=" foswikiTopic">10 <div class="patternTopic foswikiTopic"> 11 11 %TEXT% 12 12 </div> -
trunk/NatEditPlugin/templates/previewtoolbar.natedit.tmpl
r1340 r1819 9 9 </ul> 10 10 </div>%TMPL:END% 11 %TMPL:DEF{"editbutton"}%<li class="natEditEditButton">%BUTTON{"%MAKETEXT{"Edit"}%" accesskey="e" icon="pencil" onclick="history.back()" title="%MAKETEXT{"Continue editing"}%"}%</li>%TMPL:END%11 %TMPL:DEF{"editbutton"}%<li class="natEditEditButton">%BUTTON{"%MAKETEXT{"Edit"}%" accesskey="e" icon="pencil" href="javascript:history.back()" title="%MAKETEXT{"Continue editing"}%"}%</li>%TMPL:END% 12 12
Note: See TracChangeset
for help on using the changeset viewer.
