Changeset 4907


Ignore:
Timestamp:
09/14/09 13:15:31 (2 years ago)
Author:
MichaelDaum
Message:

Item8264:Item8178:Item2017:

  • yet another attempt to support <nop>TinyMCEPlugin
  • don't take over raw edit automatically
  • added <nop>PatternSkin css fixes for edit dialogs
  • fixed DEPENDENCIES for ajax upload feature
Location:
trunk/NatEditPlugin
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/NatEditPlugin/data/System/NatEditHelpText.txt

    r1340 r4907  
    1717   * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/DataForms" target="_blank">%MAKETEXT{"Form based input"}%</a> 
    1818   * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/IncludeTopicsAndWebPages" target="_blank">%MAKETEXT{"Including"}%</a> 
     19<verbatim style="display:none"> 
    1920---+++ %MAKETEXT{"Plugins"}% 
    2021%STARTSUBST{pattern="(%SYSTEMWEB%)\.(\w+)\b" format="<a target='_blank' href='%SCRIPTURLPATH{view}%/$1/$2'>$2</a>"}% 
    … …  
    2223%STOPSUBST% 
    2324%STOPINCLUDE% 
     25</verbatim> 

  • trunk/NatEditPlugin/data/System/NatEditPlugin.txt

    r4699 r4907  
    8888|  Version: | %$VERSION% | 
    8989|  Change History: | | 
     90|  14 Sep 2009 | yet another attempt to support <nop>TinyMCEPlugin; \ 
     91                 don't take over raw edit automatically; \ 
     92                 added <nop>PatternSkin css fixes for edit dialogs | 
    9093|  20 Aug 2009 | added support for !ImagePlugin when inserting attachments | 
    9194|  03 Jul 2009 | IE fixes, !PatternSkin related fixes | 

  • trunk/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm

    r4699 r4907  
    2323 
    2424$VERSION = '$Rev$'; 
    25 $RELEASE = 'v4.10'; 
     25$RELEASE = 'v4.11'; 
    2626 
    2727$NO_PREFS_IN_TOPIC = 1; 
    … …  
    4545  Foswiki::Func::registerTagHandler('FORMBUTTON', \&handleFORMBUTTON); 
    4646  Foswiki::Func::registerTagHandler('NATFORMLIST', \&handleNATFORMLIST); 
    47  
    48   my $skin = Foswiki::Func::getPreferencesValue('SKIN'); 
    49   # not using Foswiki::Func::getSkin() to prevent  
    50   # getting the cover as well 
    51  
    52   unless ($skin =~ /\b(natedit)\b/) { 
    53     $skin = "natedit,$skin"; 
    54     Foswiki::Func::setPreferencesValue('SKIN', $skin); 
    55   } 
    5647 
    5748  # register the natedit jquery plugin 

  • trunk/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/DEPENDENCIES

    r4364 r4907  
    22Foswiki::Plugins::SetVariablePlugin,>=4287,perl,Required. 
    33Foswiki::Plugins::UploadPlugin,>=1340,perl,Required. 
     4Foswiki::Plugins::RenderPlugin,>=3644,perl,Required. 
     5Foswiki::Plugins::DBCachePlugin,>=4358,perl,Required. 

  • trunk/NatEditPlugin/pub/System/NatEditPlugin/edit.js

    r4363 r4907  
    55var editForm=$("#EditForm");if(action=='add form'){editForm.find("input[name='submitChangeForm']").val(action);} 
    66editForm.find("input[name='action_preview']").val('');editForm.find("input[name='action_save']").val('');editForm.find("input[name='action_checkpoint']").val('');editForm.find("input[name='action_addform']").val('');editForm.find("input[name='action_replaceform']").val('');editForm.find("input[name='action_cancel']").val('');editForm.find("input[name='action_"+action+"']").val('foobar');if(typeof(foswikiStrikeOne)!='undefined'){foswikiStrikeOne(editForm[0]);} 
     7if(typeof(tinyMCE)!=='undefined'&&typeof(tinyMCE.activeEditor)!=='undefined'){tinyMCE.activeEditor.onSubmit.dispatch();} 
    78editForm.submit();return false;} 
    89$(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();var oldSwitchToWYSIWYG=FoswikiTiny.switchToWYSIWYG;FoswikiTiny.switchToWYSIWYG=function(inst){$(".natEditToolBar").hide();$("#wysiwyg").hide();oldSwitchToWYSIWYG(inst);};var oldSwitchToRaw=FoswikiTiny.switchToRaw;var doneInit=false;FoswikiTiny.switchToRaw=function(inst){oldSwitchToRaw(inst);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);; 

  • trunk/NatEditPlugin/pub/System/NatEditPlugin/edit.uncompressed.js

    r4363 r4907  
    2828    if (typeof(foswikiStrikeOne) != 'undefined') { 
    2929      foswikiStrikeOne(editForm[0]); 
     30    } 
     31    if (typeof(tinyMCE) !== 'undefined' && typeof(tinyMCE.activeEditor) !== 'undefined') { 
     32      tinyMCE.activeEditor.onSubmit.dispatch(); 
    3033    } 
    3134    editForm.submit(); 

  • trunk/NatEditPlugin/pub/System/NatEditPlugin/styles.css

    r4699 r4907  
    44.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, 
    55.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;}.patternEditPage .foswikiForm{margin:0px;}.jqTabContents h3{margin-top:0px;}#patternPage .foswikiFormTable{width:99%;}#patternPage .jqTab{background:white;}.patternEditPage .foswikiFormSteps h2{margin-left:10px;}#natEditInsertTable{width:200px;}#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 .uploadContainer{overflow:auto;height:350px;}#natEditInsertAttachment .foswikiFormButtons{position:absolute;bottom:0px;width:100%;} 
     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;} 

  • trunk/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css

    r4699 r4907  
    9191} 
    9292 
    93 /* pattern skin tweaks */ 
    94 .patternEditPage .foswikiForm { 
    95   margin:0px; 
    96 } 
    97 .jqTabContents h3 { 
    98   margin-top:0px; 
    99 } 
    100  
    101 #patternPage .foswikiFormTable { 
    102   width:99%; 
    103 } 
    104 #patternPage .jqTab { 
    105   background:white; 
    106 } 
    107  
    108 .patternEditPage .foswikiFormSteps h2 { 
    109   margin-left:10px; 
    110 } 
    111  
    112 /* table dialog */ 
    113 #natEditInsertTable { 
    114   width:200px; 
    115 } 
    116  
    11793/* link dialog */ 
    11894#natEditInsertLink .jqTabContents { 
    … …  
    169145  margin-bottom:5px; 
    170146} 
    171 #natEditInsertAttachment .uploadContainer { 
    172   overflow:auto; 
    173   height:350px; 
    174 } 
    175147#natEditInsertAttachment .foswikiFormButtons { 
    176148  position:absolute; 
    … …  
    178150  width:100%; 
    179151} 
     152 
     153/* pattern skin tweaks */ 
     154.patternEditPage .foswikiForm { 
     155  margin:0px; 
     156} 
     157.jqTabContents h3 { 
     158  margin-top:0px; 
     159} 
     160 
     161#patternPage .foswikiFormTable { 
     162  width:99%; 
     163} 
     164#patternPage .jqTab { 
     165  background:white; 
     166} 
     167 
     168.patternEditPage .foswikiFormStep { 
     169  height:auto; 
     170} 
     171.patternEditPage .foswikiFormSteps hr { 
     172  display:none; 
     173} 
     174.patternEditPage .foswikiFormLast { 
     175  border-bottom:0px; 
     176} 
     177.patternEditPage .foswikiFormSteps h2 { 
     178  margin-bottom:1em; 
     179} 

  • trunk/NatEditPlugin/templates/edit.natedit.tmpl

    r4692 r4907  
    88%TMPL:DEF{"titleaction"}%(%IF{"defined 'rev'" then="%MAKETEXT{"restore"}%" else="%MAKETEXT{"edit"}%"}%)%TMPL:END% 
    99%TMPL:DEF{"pagetitlestylewrapper"}%<!-- backwards compatibility -->%TMPL:END% 
    10 %TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">%IF{"defined 'rev'" then="[[%WEB%.%TOPIC%][%TOPIC%]] (%MAKETEXT{"restore"}%)" else="%IF{"istopic '%WEB%.%TOPIC%'" then="[[%WEB%.%TOPIC%][%TOPIC%]] (%MAKETEXT{"edit"}%)" else="<nop>%TOPIC% (%MAKETEXT{"new"}%)"}%"}%</h1>%TMPL:END% 
     10%TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">%IF{"defined 'rev'" then="[[%WEB%.%TOPIC%][%TMPL:P{"topictitle"}%]] (%MAKETEXT{"restore"}%)" else="%IF{"istopic '%WEB%.%TOPIC%'" then="[[%WEB%.%TOPIC%][%TMPL:P{"topictitle"}%]] (%MAKETEXT{"edit"}%)" else="%TMPL:P{"topictitle"}% (%MAKETEXT{"new"}%)"}%"}%</h1>%TMPL:END% 
    1111 
    1212%TMPL:DEF{"topictitle"}%%TMPL:P{context="DBCachePluginEnabled" then="topictitle_dbcache" else="topictitle_default"}%%TMPL:END% 

  • trunk/NatEditPlugin/templates/editdialog.natedit.tmpl

    r4410 r4907  
    11%TMPL:INCLUDE{"dialog"}%<!-- template: editidialog.natedit.tmpl --> 
    2 %TMPL:DEF{"inserttable"}%<div id="natEditInsertTable" class="foswikiFormSteps" style="display:none"> 
     2%TMPL:DEF{"inserttable"}%<div id="natEditInsertTable" class="foswikiPage foswikiFormSteps" style="display:none"> 
    33  <script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/jquery.natedit.inserttable.js'></script> 
    44  <div class="foswikiFormStep"> 
    55    <h2>%MAKETEXT{"Create a new table:"}%</h2> 
    6     <table width="100%"> 
     6    <table class="foswikiLayoutTable" width="100%"> 
    77      <tr> 
    88        <th>%MAKETEXT{"Headings:"}%</th> 
    … …  
    2626</div>%TMPL:END% 
    2727 
    28 %TMPL:DEF{"insertlink"}%<div id="natEditInsertLink" class="foswikiFormSteps" style="display:none"> 
     28%TMPL:DEF{"insertlink"}%<div id="natEditInsertLink" class="foswikiPage foswikiFormSteps" style="display:none"> 
    2929  <script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/jquery.natedit.insertlink.js'></script> 
    3030  <input type="hidden" name="insertlinkflag" id="natEditInsertLinkFlag" value="topic" /> 
    … …  
    3333    %TABPANE% 
    3434    %TAB{"Topic" after="jQuery('#natEditInsertLinkFlag').val('topic');" }% 
    35       <table width="100%"> 
     35      <table class="foswikiLayoutTable" width="100%"> 
    3636        <tr> 
    3737          <th>%MAKETEXT{"Web:"}%</th> 
    … …  
    4949    %ENDTAB% 
    5050    %TAB{"External" after="jQuery('#natEditInsertLinkFlag').val('external');"}% 
    51       <table> 
     51      <table class="foswikiLayoutTable" > 
    5252        <tr> 
    5353          <th>%MAKETEXT{"Url:"}%</th> 
    … …  
    6969</div>%TMPL:END% 
    7070 
    71 %TMPL:DEF{"insertattachment"}%<div id="natEditInsertAttachment" class="foswikiFormSteps" style="display:none"> 
     71%TMPL:DEF{"insertattachment"}%<div id="natEditInsertAttachment" class="foswikiPage foswikiFormSteps" style="display:none"> 
    7272  <script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/jquery.natedit.insertattachment.js'></script> 
    7373  <div class="foswikiFormStep foswikiFormLast"> 
    … …  
    7676    %TAB{"Insert"}% 
    7777      <div class="foswikiFormStep"> 
    78         <table width="100%"> 
     78        <table class="foswikiLayoutTable" width="100%"> 
    7979          <tr> 
    8080            <th>%MAKETEXT{"Web:"}%</th> 
    … …  
    119119    %ENDTABPANE% 
    120120  </div> 
    121   <div class="foswikiFormStep foswikiFormLast foswikiFormButtons"> 
    122   </div> 
    123121</div>%TMPL:END% 
    124122 
Note: See TracChangeset for help on using the changeset viewer.