Changeset 5690


Ignore:
Timestamp:
12/01/09 13:33:31 (2 years ago)
Author:
PaulHarvey
Message:

Item1462: Show an error version of attach dialogue in WYSIWYG editor if trying to attach to an unsaved AUTOINC topic.

Location:
branches/Release01x00/TinyMCEPlugin
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/Release01x00/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST

    r5629 r5690  
    160160pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js 0644 
    161161pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach.htm 0644 
     162pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach_error_autoinc.htm 0644 
    162163pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/colours.htm 0644 
    163164pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/css/popup.css 0644 

  • branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach_error_autoinc.htm

    r5629 r5690  
    22<html xmlns="http://www.w3.org/1999/xhtml"> 
    33  <head> 
    4         <title>{#foswikibuttons_dlg.attach_dialog_title}</title> 
    5         <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script> 
    6         <script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script> 
    7         <script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script> 
    8         <script language="javascript" type="text/javascript" src="../../../../../foswiki_tiny.js"></script> 
    9         <script language="javascript" type="text/javascript" src="jscripts/attach.js"></script> 
    10         <link rel="stylesheet" type="text/css" href="css/popup.css" /> 
    11         <base target="_self" /> 
     4      <title>{#foswikibuttons_dlg.attach_dialog_title}</title> 
     5      <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script> 
     6      <script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script> 
     7      <script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script> 
     8      <script language="javascript" type="text/javascript" src="../../../../../foswiki_tiny.js"></script> 
     9      <script language="javascript" type="text/javascript" src="jscripts/attach.js"></script> 
     10      <link rel="stylesheet" type="text/css" href="css/popup.css" /> 
     11      <base target="_self" /> 
    1212  </head> 
    13     <body style="display: none"> 
    14       <div class="tabs"> 
    15         <ul> 
    16           <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#foswikibuttons_dlg.general_tab}</a></span></li> 
    17           <li id="upload_tab"><span><a href="javascript:mcTabs.displayTab('upload_tab','upload_panel');" onmousedown="return false;">{#foswikibuttons_dlg.upload_tab}</a></span></li> 
    18         </ul> 
    19       </div> 
     13  <body> 
    2014      <form id="upload_form" target="status_frame" enctype="multipart/form-data" method="post"> 
    21         <div class="panel_wrapper"> 
    22           <div id="general_panel" class="panel current"> 
    23             <fieldset> 
     15          <fieldset> 
    2416              <legend>{#foswikibuttons_dlg.fieldset_general_tab}</legend> 
    25               <table border="0" cellpadding="0" cellspacing="4"> 
    26                   <tr> 
    27                     <td class="label"><label id="attachments_selectlabel" for="attachments_select">{#foswikibuttons_dlg.insert_attachment_link}</label>:</td>  
    28                     <td> 
    29                       <select id="attachments_select" name="attachments_select" class="field" /> 
    30                       </select> 
    31                     </td>  
    32                   </tr> 
    33               </table> 
    34               <div style="float: left"> 
    35                 <input type="button" id="insert" name="insert" value="{#foswikibuttons_dlg.insert_attachment_link}" onclick="AttachDlg.insertLink();" /> 
     17              <div class="error"> 
     18                  {#foswikibuttons_dlg.attach_error_autoinc} 
    3619              </div> 
    37               <div style="float: right"> 
    38                 <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> 
    39               </div> 
    40             </fieldset> 
    41             <label>{#foswikibuttons_dlg.attach_help}</label> 
     20          </fieldset> 
     21          <br/> 
     22          <div style="float: right"> 
     23              <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> 
    4224          </div> 
    43           <div id="upload_panel" class="panel"> 
    44             <legend>{#foswikibuttons_dlg.fieldset_upload_tab}</legend> 
    45             <fieldset> 
    46               <table border="0" cellpadding="0" cellspacing="4"> 
    47                   <tr> 
    48                     <td class="label"><label id="filepathlabel" for="filepath">{#foswikibuttons_dlg.attach_file}</label>:</td>  
    49                     <td> 
    50                       <input id="filepath" name="filepath" type="file" value="" class="field" /> 
    51                     </td>  
    52                   </tr> 
    53                   <tr> 
    54                     <td class="label"><label id="filecommentlabel" for="filecomment">{#foswikibuttons_dlg.attach_comment}</label>:</td>  
    55                     <td><input id="filecomment" name="filecomment" type="text" value="" class="field" size="40"/></td>  
    56                   </tr> 
    57                   <tr> 
    58                     <td class="label"><label id="hidefilelabel" for="hidefile">{#foswikibuttons_dlg.attach_hide}</label>:</td>  
    59                     <td> 
    60                       <input id="hidefile" name="hidefile" type="checkbox" value="1" class="field" /> 
    61                     </td>  
    62                   </tr> 
    63               </table> 
    64               <input type="hidden" name="filename" value="" /> 
    65               <input type="hidden" name="topic" value="" id="upload_form_topic"/> 
    66               <input type="hidden" id="createlink" name="createlink" /> 
    67               <input type="hidden" name="noredirect" value="1" /> 
    68               <div style="float: left"> 
    69                 <input type="submit" id="insert" name="insert" value="{#foswikibuttons_dlg.upload}" /> 
    70               </div> 
    71               <div style="float: right"> 
    72                 <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> 
    73               </div> 
    74               <br clear="all" /> 
    75               <iframe name="status_frame" style="display: block" width="100%" height="50px"> 
    76                 <!-- frame used as target for output generated by uploads --> 
    77               </iframe> 
    78             </fieldset> 
    79           </div> 
    80         </div> 
    8125      </form> 
    82     </body> 
     26  </body> 
    8327</html> 

  • branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js

    r5629 r5690  
    11(function(){tinymce.PluginManager.requireLangPack('foswikibuttons');tinymce.create('tinymce.plugins.FoswikiButtons',{formats_lb:null,init:function(ed,url){ed.fw_formats=ed.getParam("foswikibuttons_formats");ed.fw_lb=null;ed.addCommand('foswikibuttonsTT',function(){if(!ed.selection.isCollapsed()) 
    22ed.execCommand('mceSetCSSClass',false,"WYSIWYG_TT");});ed.addButton('tt',{title:'foswikibuttons.tt_desc',cmd:'foswikibuttonsTT',image:url+'/img/tt.gif'});ed.addCommand('foswikibuttonsColour',function(){if(ed.selection.isCollapsed()) 
    3 return;ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/colours.htm',width:240,height:140,movable:true,popup_css:false,inline:true},{plugin_url:url});});ed.addButton('colour',{title:'foswikibuttons.colour_desc',cmd:'foswikibuttonsColour',image:url+'/img/colour.gif'});ed.addCommand('foswikibuttonsAttach',function(){ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/attach.htm',width:350,height:250,movable:true,inline:true},{plugin_url:url});});ed.addButton('attach',{title:'foswikibuttons.attach_desc',cmd:'foswikibuttonsAttach',image:url+'/img/attach.gif'});ed.addCommand('foswikibuttonsHide',function(){if(FoswikiTiny.saveEnabled){if(ed.getParam('fullscreen_is_enabled')){ed.onGetContent.add(function(){tinymce.DOM.win.setTimeout(function(){var e=tinyMCE.activeEditor;tinyMCE.execCommand("mceToggleEditor",true,e.id);FoswikiTiny.switchToRaw(e);},10);});ed.execCommand('mceFullScreen');} 
     3return;ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/colours.htm',width:240,height:140,movable:true,popup_css:false,inline:true},{plugin_url:url});});ed.addButton('colour',{title:'foswikibuttons.colour_desc',cmd:'foswikibuttonsColour',image:url+'/img/colour.gif'});ed.addCommand('foswikibuttonsAttach',function(){var htmpath='/attach.htm',htmheight=250;if(null!==foswiki.topic.match(/(X{10}|AUTOINC[0-9]+)/)){htmpath='/attach_error_autoinc.htm',htmheight=125;} 
     4ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+htmpath,width:350,height:htmheight,movable:true,inline:true},{plugin_url:url});});ed.addButton('attach',{title:'foswikibuttons.attach_desc',cmd:'foswikibuttonsAttach',image:url+'/img/attach.gif'});ed.addCommand('foswikibuttonsHide',function(){if(FoswikiTiny.saveEnabled){if(ed.getParam('fullscreen_is_enabled')){ed.onGetContent.add(function(){tinymce.DOM.win.setTimeout(function(){var e=tinyMCE.activeEditor;tinyMCE.execCommand("mceToggleEditor",true,e.id);FoswikiTiny.switchToRaw(e);},10);});ed.execCommand('mceFullScreen');} 
    45else{tinyMCE.execCommand("mceToggleEditor",true,ed.id);FoswikiTiny.switchToRaw(ed);}}});ed.addButton('hide',{title:'foswikibuttons.hide_desc',cmd:'foswikibuttonsHide',image:url+'/img/hide.gif'});ed.addCommand('foswikibuttonsFormat',function(ui,fn){var format=null;for(var i=0;i<ed.fw_formats.length;i++){if(ed.fw_formats[i].name==fn){format=ed.fw_formats[i];break;}} 
    56if(format.el!=null){var fmt=format.el;if(fmt.length) 

  • branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js

    r5629 r5690  
    6565 
    6666            ed.addCommand('foswikibuttonsAttach', function() { 
     67                var htmpath = '/attach.htm', 
     68                    htmheight = 250; 
     69 
     70                if (null !== foswiki.topic.match(/(X{10}|AUTOINC[0-9]+)/)) { 
     71                    htmpath = '/attach_error_autoinc.htm', 
     72                    htmheight = 125; 
     73                } 
    6774                ed.windowManager.open({ 
    6875                    location: false, 
    … …  
    7077                    toolbar: false, 
    7178                    status: false, 
    72                     url : url + '/attach.htm', 
     79                    url : url + htmpath, 
    7380                    width : 350, 
    74                     height : 250, 
     81                    height : htmheight, 
    7582                    movable : true, 
    7683                    inline : true 

  • branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/langs/en_dlg.js

    r5629 r5690  
    1111    attach_file : "Upload new attachment", 
    1212    attach_comment : "Comment", 
    13     attach_hide : "Hide attachment" 
     13    attach_hide : "Hide attachment", 
     14    attach_error_autoinc : "Unable to attach files to an unsaved AUTOINC topic. Save the topic and try again." 
    1415}); 
    15  
Note: See TracChangeset for help on using the changeset viewer.