Changeset 5550
- Timestamp:
- 11/17/09 15:13:28 (3 years ago)
- Location:
- trunk/NatEditPlugin
- Files:
-
- 19 edited
-
data/System/NatEditPlugin.txt (modified) (1 diff)
-
lib/Foswiki/Plugins/NatEditPlugin.pm (modified) (1 diff)
-
lib/Foswiki/Plugins/NatEditPlugin/NATEDIT.pm (modified) (1 diff)
-
pub/System/NatEditPlugin/default/styles.css.gz (modified) (previous)
-
pub/System/NatEditPlugin/edit.js (modified) (1 diff)
-
pub/System/NatEditPlugin/edit.js.gz (modified) (previous)
-
pub/System/NatEditPlugin/edit.uncompressed.js (modified) (3 diffs)
-
pub/System/NatEditPlugin/jquery.natedit.insertattachment.js (modified) (1 diff)
-
pub/System/NatEditPlugin/jquery.natedit.insertattachment.js.gz (modified) (previous)
-
pub/System/NatEditPlugin/jquery.natedit.insertlink.js (modified) (2 diffs)
-
pub/System/NatEditPlugin/jquery.natedit.insertlink.js.gz (modified) (previous)
-
pub/System/NatEditPlugin/jquery.natedit.inserttable.js.gz (modified) (previous)
-
pub/System/NatEditPlugin/jquery.natedit.js.gz (modified) (previous)
-
pub/System/NatEditPlugin/styles.css (modified) (1 diff)
-
pub/System/NatEditPlugin/styles.css.gz (modified) (previous)
-
pub/System/NatEditPlugin/styles.uncompressed.css (modified) (1 diff)
-
templates/edit.natedit.tmpl (modified) (2 diffs)
-
templates/editdialog.natedit.tmpl (modified) (5 diffs)
-
templates/editform.natedit.tmpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NatEditPlugin/data/System/NatEditPlugin.txt
r5416 r5550 88 88 | Version: | %$VERSION% | 89 89 | Change History: | | 90 | 17 Nov 2009 | Foswikitask:Item2368 toolbar not always hidden (PH) \; 91 improved usability of upload and insert-link dialog | 90 92 | 02 Nov 2009 | Foswikitask:Item2281: attempt to make <nop>TinyMCE resize \ 91 93 automatically as <nop>NatEdit does | -
trunk/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
r4907 r5550 23 23 24 24 $VERSION = '$Rev$'; 25 $RELEASE = 'v4. 11';25 $RELEASE = 'v4.20'; 26 26 27 27 $NO_PREFS_IN_TOPIC = 1; -
trunk/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/NATEDIT.pm
r4692 r5550 47 47 puburl => '%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin', 48 48 css => ['styles.css'], 49 documentation => "$Foswiki::cfg{SystemWebName}.NatEditPlugin", 49 50 javascript => ['edit.js', 'jquery.natedit.js'], 50 51 dependencies => ['simplemodal', 'textboxlist', 'form'], 51 52 ), $class); 52 53 $this->{summary} = <<'HERE';54 HERE55 53 56 54 return $this; -
trunk/NatEditPlugin/pub/System/NatEditPlugin/edit.js
r5416 r5550 7 7 if(typeof(tinyMCE)!=='undefined'&&typeof(tinyMCE.activeEditor)!=='undefined'){tinyMCE.activeEditor.onSubmit.dispatch();} 8 8 editForm.submit();return false;} 9 $(function(){$("input[name='TopicTitle']:eq(1)").parents(".foswikiFormStep").remove();$("input[name='Summary']:eq(1)").parents(".foswikiFormStep").remove();$("#save").click(function(){return submitEditForm('save','save')});$("#checkpoint").click(function(){return submitEditForm('save','checkpoint')});$("#preview").click(function(){return submitEditForm('preview','preview')});$("#cancel").click(function(){return submitEditForm('save','cancel')});$("#replaceform").click(function(){return submitEditForm('save','replaceform')});$("#addform").click(function(){return submitEditForm('save','addform')}); window.setTimeout(function(){if($("#topic_ifr").length){$(".natEditToolBar").hide();$("#topic_fullscreen").parent().remove();var oldSwitchToWYSIWYG=FoswikiTiny.switchToWYSIWYG;FoswikiTiny.switchToWYSIWYG=function(inst){$(".natEditToolBar").hide();$("#wysiwyg").hide();oldSwitchToWYSIWYG(inst);$(window).trigger('resize.natedit');};var oldSwitchToRaw=FoswikiTiny.switchToRaw;var doneInit=false;FoswikiTiny.switchToRaw=function(inst){oldSwitchToRaw(inst);$(window).trigger("resize");var oldWysiwygButton=$("#topic_2WYSIWYG");var newWysiwygButton=$("#wysiwyg");$(".natEditToolBar").show();if(!doneInit){doneInit=true;var onClickHandler=oldWysiwygButton.attr('onclick');oldWysiwygButton.replaceWith(newWysiwygButton);newWysiwygButton.click(onClickHandler).show();}else{oldWysiwygButton.hide();newWysiwygButton.show();}};}},100);});})(jQuery);;9 $(function(){$("input[name='TopicTitle']:eq(1)").parents(".foswikiFormStep").remove();$("input[name='Summary']:eq(1)").parents(".foswikiFormStep").remove();$("#save").click(function(){return submitEditForm('save','save')});$("#checkpoint").click(function(){return submitEditForm('save','checkpoint')});$("#preview").click(function(){return submitEditForm('preview','preview')});$("#cancel").click(function(){return submitEditForm('save','cancel')});$("#replaceform").click(function(){return submitEditForm('save','replaceform')});$("#addform").click(function(){return submitEditForm('save','addform')});jQuery(window).load(function(){if((typeof(tinyMCE)==='object')&&typeof(tinyMCE.activeEditor==='object')){$(".natEditToolBar").hide();$("#topic_fullscreen").parent().remove();var oldSwitchToWYSIWYG=FoswikiTiny.switchToWYSIWYG;FoswikiTiny.switchToWYSIWYG=function(inst){$(".natEditToolBar").hide();$("#wysiwyg").hide();oldSwitchToWYSIWYG(inst);$(window).trigger('resize.natedit');};var oldSwitchToRaw=FoswikiTiny.switchToRaw;var doneInit=false;FoswikiTiny.switchToRaw=function(inst){oldSwitchToRaw(inst);$(window).trigger("resize");var oldWysiwygButton=$("#topic_2WYSIWYG");var newWysiwygButton=$("#wysiwyg");$(".natEditToolBar").show();if(!doneInit){doneInit=true;var onClickHandler=oldWysiwygButton.attr('onclick');oldWysiwygButton.replaceWith(newWysiwygButton);newWysiwygButton.click(onClickHandler).show();}else{oldWysiwygButton.hide();newWysiwygButton.show();}};}});});})(jQuery);; -
trunk/NatEditPlugin/pub/System/NatEditPlugin/edit.uncompressed.js
r5416 r5550 41 41 /* remove the second Summary */ 42 42 $("input[name='Summary']:eq(1)").parents(".foswikiFormStep").remove(); 43 43 44 44 /* add click handler */ 45 45 $("#save").click(function() {return submitEditForm('save', 'save')}); … … 51 51 52 52 53 window.setTimeout(function() {54 if ( $("#topic_ifr").length) {53 jQuery(window).load(function() { 54 if ((typeof(tinyMCE) === 'object') && typeof(tinyMCE.activeEditor === 'object')) { 55 55 $(".natEditToolBar").hide(); /* switch off natedit toolbar */ 56 56 $("#topic_fullscreen").parent().remove(); /* remove full-screen feature ... til fixed */ 57 57 58 58 var oldSwitchToWYSIWYG = FoswikiTiny.switchToWYSIWYG; 59 59 FoswikiTiny.switchToWYSIWYG = function(inst) { … … 82 82 } 83 83 }; 84 85 84 } 86 } , 100);85 }); 87 86 }); 88 87 -
trunk/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.insertattachment.js
r4699 r5550 25 25 26 26 $("#natEditInsertAttachmentWeb").autocomplete( 27 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=web ;contenttype=text/plain;skin=text", {27 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=web&contenttype=text/plain&skin=text", { 28 28 matchCase: true 29 29 }); 30 30 31 31 $("#natEditInsertAttachmentTopic").autocomplete( 32 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=topic ;contenttype=text/plain;skin=text", {32 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=topic&contenttype=text/plain&skin=text", { 33 33 matchCase: true, 34 34 extraParams: { -
trunk/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.insertlink.js
r4692 r5550 4 4 */ 5 5 $.natedit.initInsertLink = function(nateditor) { 6 $("#natEditInsertLink input[type=text]").not(".selection").val(''); 6 var $inserter = $("#natEditInsertLink"); 7 8 $inserter.find(".empty").val(''); 9 $inserter.find(".baseweb").each(function() { 10 var val = $(this).val(); 11 if (!val) { 12 $(this).val(foswiki.web); 13 } 14 }); 7 15 8 16 $("#natEditInsertLinkWeb").autocomplete( 9 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=web ;contenttype=text/plain;skin=text", {17 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=web&contenttype=text/plain&skin=text", { 10 18 matchCase: true 11 19 }); 12 20 13 21 $("#natEditInsertLinkTopic").autocomplete( 14 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=topic ;contenttype=text/plain;skin=text", {22 foswiki.scriptUrlPath+"/view/"+foswiki.systemWebName+"/JQueryAjaxHelper?section=topic&contenttype=text/plain&skin=text", { 15 23 matchCase: true, 16 24 extraParams: { … … 33 41 var web = $("#natEditInsertLinkWeb").val(); 34 42 var topic = $("#natEditInsertLinkTopic").val(); 35 var linktext = $("#natEditInsertLinkTextTopic").val() || topic; 36 markup = "[["+web+"."+topic+"]["+linktext+"]]"; 43 var linktext = $("#natEditInsertLinkTextTopic").val(); 44 if (linktext) { 45 if (web == foswiki.web) { 46 markup = "[["+topic+"]["+linktext+"]]"; 47 } else { 48 markup = "[["+web+"."+topic+"]["+linktext+"]]"; 49 } 50 } else if (web == foswiki.web) { 51 markup = "[["+topic+"]]"; 52 } else { 53 markup = "[["+web+"."+topic+"]["+topic+"]]"; 54 } 37 55 } else { 38 56 var url = $("#natEditInsertLinkUrl").val(); -
trunk/NatEditPlugin/pub/System/NatEditPlugin/styles.css
r4907 r5550 4 4 .natEditToolBar a{text-decoration:none;background-color:transparent;background-position:top left;background-repeat:no-repeat;float:left;}.natEditTopicInfo{margin:0em 0em 0.5em;}.natEditForceNewRevision label, 5 5 .natEditForceNewRevision input{margin:4px;_margin:0px;border:0px;vertical-align:middle;}.natEditFontButtons{margin:0.5em;float:right;}.foswikiForm{clear:both;}.revComment{margin:0.5em 0px;}.revComment label{font-weight:bold;}.revComment input{width:80%;}.natEditDoneButton img, 6 .natEditCancelButton img{border:0px;}#natEditInsertLink .jqTabContents{width:480px;height:150px;}#natEditInsertLink .foswikiFormStep hr{margin:1em 0em;}#natEditInsertAttachment .jqTabContents{width:570px;height:410px;}#natEditInsertAttachment label{float:left;border:1px solid #aaa;background:#fff;margin:0px 10px 10px 0px;padding:5px;width:70px;height:82px;overflow:hidden;}#natEditInsertAttachment .imgContainer{width:70px;height:70px;overflow:hidden;display:block;}#natEditInsertAttachment img{width:70px;}#natEditInsertAttachment label.selected{border:1px solid red;}#natEditInsertAttachments{overflow:auto;height:200px;}#natEditInsertAttachments label span{text-align:center;display:block;}#natEditInsertAttachments input{display:none;} #natEditInsertAttachment .jqTabContents{position:relative;}#natEditInsertAttachment hr{margin-top:5px;margin-bottom:5px;}#natEditInsertAttachment .foswikiFormButtons{position:absolute;bottom:0px;width:100%;}.patternEditPage .foswikiForm{margin:0px;}.jqTabContents h3{margin-top:0px;}#patternPage .foswikiFormTable{width:99%;}#patternPage .jqTab{background:white;}.patternEditPage .foswikiFormStep{height:auto;}.patternEditPage .foswikiFormSteps hr{display:none;}.patternEditPage .foswikiFormLast{border-bottom:0px;}.patternEditPage .foswikiFormSteps h2{margin-bottom:1em;}6 .natEditCancelButton img{border:0px;}#natEditInsertLink .jqTabContents{width:480px;height:150px;}#natEditInsertLink .foswikiFormStep hr{margin:1em 0em;}#natEditInsertAttachment .jqTabContents{width:570px;height:410px;}#natEditInsertAttachment label{float:left;border:1px solid #aaa;background:#fff;margin:0px 10px 10px 0px;padding:5px;width:70px;height:82px;overflow:hidden;}#natEditInsertAttachment .imgContainer{width:70px;height:70px;overflow:hidden;display:block;}#natEditInsertAttachment img{width:70px;}#natEditInsertAttachment label.selected{border:1px solid red;}#natEditInsertAttachments{overflow:auto;height:200px;}#natEditInsertAttachments label span{text-align:center;display:block;}#natEditInsertAttachments input{display:none;}.patternEditPage .foswikiForm{margin:0px;}.jqTabContents h3{margin-top:0px;}#patternPage .foswikiFormTable{width:99%;}#patternPage .jqTab{background:white;}.patternEditPage .foswikiFormStep{height:auto;}.patternEditPage .foswikiFormSteps hr{display:none;}.patternEditPage .foswikiFormLast{border-bottom:0px;}.patternEditPage .foswikiFormSteps h2{margin-bottom:1em;} -
trunk/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css
r4907 r5550 138 138 display:none; 139 139 } 140 #natEditInsertAttachment .jqTabContents {141 position:relative;142 }143 #natEditInsertAttachment hr {144 margin-top:5px;145 margin-bottom:5px;146 }147 #natEditInsertAttachment .foswikiFormButtons {148 position:absolute;149 bottom:0px;150 width:100%;151 }152 140 153 141 /* pattern skin tweaks */ -
trunk/NatEditPlugin/templates/edit.natedit.tmpl
r4907 r5550 34 34 <input type="hidden" name="action_replaceform" value="" /> 35 35 <input type="hidden" name="action_save" value="" /> 36 <input type="hidden" name="action" value="%URLPARAM{"action"}%" /> 36 37 <input type="hidden" name="cmd" value="%CMD%" /> 37 38 <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" /> … … 46 47 <input type="hidden" name="templatetopic" value="%TEMPLATETOPIC%" /> 47 48 <input type="hidden" name="template" value="%URLPARAM{"template"}%" /> 48 <input type="hidden" name="editaction" value="%URLPARAM{"action"}%" />49 49 <textarea rows="5" cols="22" style="display:none" id="savearea"></textarea> 50 50 <!-- //formstart -->%TMPL:END% -
trunk/NatEditPlugin/templates/editdialog.natedit.tmpl
r4907 r5550 36 36 <tr> 37 37 <th>%MAKETEXT{"Web:"}%</th> 38 <td><input type="text" id="natEditInsertLinkWeb" size="40" name="web" class="foswikiInputField " value="%BASEWEB%" /></td>38 <td><input type="text" id="natEditInsertLinkWeb" size="40" name="web" class="foswikiInputField baseweb" value="%BASEWEB%" /></td> 39 39 </tr> 40 40 <tr> 41 41 <th>%MAKETEXT{"Topic:"}%</th> 42 <td><input type="text" id="natEditInsertLinkTopic" size="40" name="topic" class="foswikiInputField " value="" /></td>42 <td><input type="text" id="natEditInsertLinkTopic" size="40" name="topic" class="foswikiInputField empty" value="" /></td> 43 43 </tr> 44 44 <tr> … … 52 52 <tr> 53 53 <th>%MAKETEXT{"Url:"}%</th> 54 <td><input type="text" id="natEditInsertLinkUrl" size="40" name="url" class="foswikiInputField " value="" /></td>54 <td><input type="text" id="natEditInsertLinkUrl" size="40" name="url" class="foswikiInputField empty" value="" /></td> 55 55 </tr> 56 56 <tr> … … 71 71 %TMPL:DEF{"insertattachment"}%<div id="natEditInsertAttachment" class="foswikiPage foswikiFormSteps" style="display:none"> 72 72 <script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/jquery.natedit.insertattachment.js'></script> 73 <div class="foswikiFormStep foswikiFormLast">73 <div class="foswikiFormStep"> 74 74 <h2>%MAKETEXT{"Attachment:"}%</h2> 75 75 %TABPANE% 76 %TAB{"Insert" }%76 %TAB{"Insert" after="jQuery('#ok_button').show();jQuery('#upload_button').hide()"}% 77 77 <div class="foswikiFormStep"> 78 78 <table class="foswikiLayoutTable" width="100%"> 79 79 <tr> 80 80 <th>%MAKETEXT{"Web:"}%</th> 81 <td><input type="text" id="natEditInsertAttachmentWeb" size="40" name="web" class="foswikiInputField " value="%BASEWEB%" /></td>81 <td><input type="text" id="natEditInsertAttachmentWeb" size="40" name="web" class="foswikiInputField baseweb" value="%BASEWEB%" /></td> 82 82 </tr> 83 83 <tr> … … 101 101 </div> 102 102 </div> 103 <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">104 <hr />105 %BUTTON{"%MAKETEXT{"Ok"}%" class="submit" icon="tick"}%106 %BUTTON{"%MAKETEXT{"Cancel"}%" class="cancel" icon="cross"}%107 %CLEAR%108 </div>109 103 %ENDTAB% 110 %TAB{" Upload"}%104 %TAB{"%MAKETEXT{"Upload"}%" after="jQuery('#ok_button').hide();jQuery('#upload_button').show()"}% 111 105 <div class="jqUploader"> 112 106 <form name="upload" enctype="multipart/form-data" action="%SCRIPTURLPATH{"rest"}%/UploadPlugin/upload" method="post"> 113 107 <input type="hidden" name="topic" value="%BASEWEB%.%BASETOPIC%" /> 114 %UPLOADFORM{embed="on" comment="off" target="off" ajax="on" }%108 %UPLOADFORM{embed="on" comment="off" target="off" ajax="on" submit="off"}% 115 109 </form> 116 110 <div id="msg"></div> … … 118 112 %ENDTAB% 119 113 %ENDTABPANE% 114 </div> 115 <div class="foswikiFormStep foswikiFormButtons foswikiFormLast"> 116 <hr /> 117 %BUTTON{"%MAKETEXT{"Ok"}%" class="submit" icon="tick" id="ok_button"}% 118 %BUTTON{"%MAKETEXT{"Upload"}%" icon="attach" onclick="jQuery('.jqUploader form').submit();" style="display:none" id="upload_button"}% 119 %BUTTON{"%MAKETEXT{"Cancel"}%" class="cancel" icon="cross"}% 120 %CLEAR% 120 121 </div> 121 122 </div>%TMPL:END% -
trunk/NatEditPlugin/templates/editform.natedit.tmpl
r4410 r5550 5 5 %TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">%TMPL:P{"pagetitle"}%</h1>%TMPL:END% 6 6 %TMPL:DEF{"firsttab"}%%TMPL:END% 7 %TMPL:DEF{"settingstab"}%%TMPL:END%8 7 %TMPL:DEF{"formfields"}%%FORMFIELDS%%TMPL:END%
Note: See TracChangeset
for help on using the changeset viewer.
