# HG changeset patch # User Dan # Date 1204854431 18000 # Node ID f26a69c40431a1ba0c9a7db51bb64ebd0bd64157 # Parent 51386f1852b87b8eab06924d4e3e04db547415b9 Upgraded to TinyMCE 3.0.3; made editor auto-init again but only on Safari diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/static/editor.js --- a/includes/clientside/static/editor.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/static/editor.js Thu Mar 06 20:47:11 2008 -0500 @@ -63,7 +63,11 @@ } } } -// addOnloadHook(initTinyMCE); +// Safari doesn't fire the init on demand so call it on page load +if ( is_Safari ) +{ + addOnloadHook(initTinyMCE); +} var editor_open = false; diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/advimage/js/image.js --- a/includes/clientside/tinymce/plugins/advimage/js/image.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/advimage/js/image.js Thu Mar 06 20:47:11 2008 -0500 @@ -117,6 +117,8 @@ insertAndClose : function() { var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el; + tinyMCEPopup.restoreSelection(); + // Fixes crash in Safari if (tinymce.isWebKit) ed.getWin().focus(); diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/advlink/js/advlink.js --- a/includes/clientside/tinymce/plugins/advlink/js/advlink.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/advlink/js/advlink.js Thu Mar 06 20:47:11 2008 -0500 @@ -344,6 +344,7 @@ function setAttrib(elm, attrib, value) { var formObj = document.forms[0]; var valueElm = formObj.elements[attrib.toLowerCase()]; + var dom = tinyMCEPopup.editor.dom; if (typeof(value) == "undefined" || value == null) { value = ""; @@ -352,21 +353,11 @@ value = valueElm.value; } - if (value != "") { - elm.setAttribute(attrib.toLowerCase(), value); - - if (attrib == "style") - attrib = "style.cssText"; + // Clean up the style + if (attrib == 'style') + value = dom.serializeStyle(dom.parseStyle(value)); -// if (attrib.substring(0, 2) == 'on') -// value = 'return true;' + value; - - if (attrib == "class") - attrib = "className"; - - elm[attrib] = value; - } else - elm.removeAttribute(attrib); + dom.setAttrib(elm, attrib, value); } function getAnchorListHTML(id, target) { diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/fullscreen/editor_plugin.js --- a/includes/clientside/tinymce/plugins/fullscreen/editor_plugin.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/fullscreen/editor_plugin.js Thu Mar 06 20:47:11 2008 -0500 @@ -1,1 +1,1 @@ -(function(){var DOM=tinymce.DOM;tinymce.create('tinymce.plugins.FullScreenPlugin',{init:function(ed,url){var t=this,s={},vp;t.editor=ed;ed.addCommand('mceFullScreen',function(){var win,de=document.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{window.setTimeout(function(){tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format:'raw'}),{format:'raw'});tinyMCE.remove(ed);DOM.remove('mce_fullscreen_container');de.style.overflow=ed.getParam('fullscreen_html_overflow');DOM.setStyle(document.body,'overflow',ed.getParam('fullscreen_overflow'));window.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));},10);}return;}if(ed.getParam('fullscreen_new_window')){win=window.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=no,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{s.fullscreen_overflow=DOM.getStyle(document.body,'overflow',1)||'auto';s.fullscreen_html_overflow=DOM.getStyle(de,'overflow',1);vp=DOM.getViewPort();s.fullscreen_scrollx=vp.x;s.fullscreen_scrolly=vp.y;if(tinymce.isOpera&&s.fullscreen_overflow=='visible')s.fullscreen_overflow='auto';if(tinymce.isIE&&s.fullscreen_overflow=='scroll')s.fullscreen_overflow='auto';if(s.fullscreen_overflow=='0px')s.fullscreen_overflow='';DOM.setStyle(document.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();window.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(document.body,'div',{id:'mce_fullscreen_container',style:'position:absolute;top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:150;'});DOM.add(n,'div',{id:'mce_fullscreen'});tinymce.each(ed.settings,function(v,n){s[n]=v;});s.id='mce_fullscreen';s.width=n.clientWidth;s.height=n.clientHeight-15;s.fullscreen_is_enabled=true;s.fullscreen_editor_id=ed.id;s.theme_advanced_resizing=false;s.save_onsavecallback=function(){ed.setContent(tinyMCE.get(s.id).getContent({format:'raw'}),{format:'raw'});ed.execCommand('mceSave');};tinymce.each(ed.getParam('fullscreen_settings'),function(v,k){s[k]=v;});if(s.theme_advanced_toolbar_location==='external')s.theme_advanced_toolbar_location='top';t.fullscreenEditor=new tinymce.Editor('mce_fullscreen',s);t.fullscreenEditor.onInit.add(function(){t.fullscreenEditor.setContent(ed.getContent());});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();}});ed.addButton('fullscreen',{title:'fullscreen.desc',cmd:'mceFullScreen'});ed.onNodeChange.add(function(ed,cm){cm.setActive('fullscreen',ed.getParam('fullscreen_is_enabled'));});},getInfo:function(){return{longname:'Fullscreen',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('fullscreen',tinymce.plugins.FullScreenPlugin);})(); \ No newline at end of file +(function(){var DOM=tinymce.DOM;tinymce.create('tinymce.plugins.FullScreenPlugin',{init:function(ed,url){var t=this,s={},vp;t.editor=ed;ed.addCommand('mceFullScreen',function(){var win,de=document.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{window.setTimeout(function(){tinymce.dom.Event.remove(window,'resize',t.resizeFunc);tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format:'raw'}),{format:'raw'});tinyMCE.remove(ed);DOM.remove('mce_fullscreen_container');de.style.overflow=ed.getParam('fullscreen_html_overflow');DOM.setStyle(document.body,'overflow',ed.getParam('fullscreen_overflow'));window.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));},10);}return;}if(ed.getParam('fullscreen_new_window')){win=window.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{s.fullscreen_overflow=DOM.getStyle(document.body,'overflow',1)||'auto';s.fullscreen_html_overflow=DOM.getStyle(de,'overflow',1);vp=DOM.getViewPort();s.fullscreen_scrollx=vp.x;s.fullscreen_scrolly=vp.y;if(tinymce.isOpera&&s.fullscreen_overflow=='visible')s.fullscreen_overflow='auto';if(tinymce.isIE&&s.fullscreen_overflow=='scroll')s.fullscreen_overflow='auto';if(s.fullscreen_overflow=='0px')s.fullscreen_overflow='';DOM.setStyle(document.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();window.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(document.body,'div',{id:'mce_fullscreen_container',style:'position:absolute;top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:150;'});DOM.add(n,'div',{id:'mce_fullscreen'});tinymce.each(ed.settings,function(v,n){s[n]=v;});s.id='mce_fullscreen';s.width=n.clientWidth;s.height=n.clientHeight-15;s.fullscreen_is_enabled=true;s.fullscreen_editor_id=ed.id;s.theme_advanced_resizing=false;s.save_onsavecallback=function(){ed.setContent(tinyMCE.get(s.id).getContent({format:'raw'}),{format:'raw'});ed.execCommand('mceSave');};tinymce.each(ed.getParam('fullscreen_settings'),function(v,k){s[k]=v;});if(s.theme_advanced_toolbar_location==='external')s.theme_advanced_toolbar_location='top';t.fullscreenEditor=new tinymce.Editor('mce_fullscreen',s);t.fullscreenEditor.onInit.add(function(){t.fullscreenEditor.setContent(ed.getContent());});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();t.resizeFunc=tinymce.dom.Event.add(window,'resize',function(){var vp=tinymce.DOM.getViewPort();t.fullscreenEditor.theme.resizeTo(vp.w,vp.h);});}});ed.addButton('fullscreen',{title:'fullscreen.desc',cmd:'mceFullScreen'});ed.onNodeChange.add(function(ed,cm){cm.setActive('fullscreen',ed.getParam('fullscreen_is_enabled'));});},getInfo:function(){return{longname:'Fullscreen',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('fullscreen',tinymce.plugins.FullScreenPlugin);})(); \ No newline at end of file diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/fullscreen/editor_plugin_src.js --- a/includes/clientside/tinymce/plugins/fullscreen/editor_plugin_src.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/fullscreen/editor_plugin_src.js Thu Mar 06 20:47:11 2008 -0500 @@ -1,5 +1,5 @@ /** - * $Id: editor_plugin_src.js 609 2008-02-18 16:19:27Z spocke $ + * $Id: editor_plugin_src.js 636 2008-02-25 13:38:28Z spocke $ * * @author Moxiecode * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved. @@ -23,6 +23,7 @@ closeFullscreen(); // Call to close in new window else { window.setTimeout(function() { + tinymce.dom.Event.remove(window, 'resize', t.resizeFunc); tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'}); tinyMCE.remove(ed); DOM.remove('mce_fullscreen_container'); @@ -36,7 +37,7 @@ } if (ed.getParam('fullscreen_new_window')) { - win = window.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=no,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight); + win = window.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight); try { win.resizeTo(screen.availWidth, screen.availHeight); } catch (e) { @@ -104,6 +105,12 @@ t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container'); t.fullscreenElement.update(); //document.body.overflow = 'hidden'; + + t.resizeFunc = tinymce.dom.Event.add(window, 'resize', function() { + var vp = tinymce.DOM.getViewPort(); + + t.fullscreenEditor.theme.resizeTo(vp.w, vp.h); + }); } }); diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/fullscreen/fullscreen.htm --- a/includes/clientside/tinymce/plugins/fullscreen/fullscreen.htm Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/fullscreen/fullscreen.htm Thu Mar 06 20:47:11 2008 -0500 @@ -64,9 +64,6 @@ window.close(); } - // Add onunload - tinymce.dom.Event.add(window, "beforeunload", unloadHandler); - function doParentSubmit() { moveContent(); @@ -77,6 +74,27 @@ return false; } + + function render() { + var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM; + + e.value = window.opener.tinyMCE.activeEditor.getContent(); + + vp = dom.getViewPort(); + settings.width = vp.w; + settings.height = vp.h - 15; + + tinymce.dom.Event.add(window, 'resize', function() { + var vp = dom.getViewPort(); + + tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h); + }); + + tinyMCE.init(settings); + } + + // Add onunload + tinymce.dom.Event.add(window, "beforeunload", unloadHandler); @@ -86,11 +104,7 @@ diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/inlinepopups/editor_plugin.js --- a/includes/clientside/tinymce/plugins/inlinepopups/editor_plugin.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/inlinepopups/editor_plugin.js Thu Mar 06 20:47:11 2008 -0500 @@ -1,1 +1,1 @@ -(function(){var DOM=tinymce.DOM,Element=tinymce.dom.Element,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.InlinePopups',{init:function(ed,url){ed.onBeforeRenderUI.add(function(){ed.windowManager=new tinymce.InlineWindowManager(ed);DOM.loadCSS(url+'/skins/'+(ed.settings.inlinepopups_skin||'clearlooks2')+"/window.css");});},getInfo:function(){return{longname:'InlinePopups',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager',{InlineWindowManager:function(ed){var t=this;t.parent(ed);t.zIndex=1000;},open:function(f,p){var t=this,id,opt='',ed=t.editor,dw=0,dh=0,vp,po,mdf,clf,we,w,u;f=f||{};p=p||{};if(!f.inline)return t.parent(f,p);t.bookmark=ed.selection.getBookmark('simple');id=DOM.uniqueId();vp=DOM.getViewPort();f.width=parseInt(f.width||320);f.height=parseInt(f.height||240)+(tinymce.isIE?8:0);f.min_width=parseInt(f.min_width||150);f.min_height=parseInt(f.min_height||100);f.max_width=parseInt(f.max_width||2000);f.max_height=parseInt(f.max_height||2000);f.left=f.left||Math.round(Math.max(vp.x,vp.x+(vp.w/ 2.0) - (f.width /2.0)));f.top=f.top||Math.round(Math.max(vp.y,vp.y+(vp.h/ 2.0) - (f.height /2.0)));f.movable=f.resizable=true;p.mce_width=f.width;p.mce_height=f.height;p.mce_inline=true;p.mce_window_id=id;t.features=f;t.params=p;t.onOpen.dispatch(t,f,p);if(f.type){opt+=' modal '+f.type;f.resizable=false;}if(f.statusbar)opt+=' statusbar';if(f.resizable)opt+=' resizable';if(f.minimizable)opt+=' minimizable';if(f.maximizable)opt+=' maximizable';if(f.movable)opt+=' movable';t._addAll(document.body,['div',{id:id,'class':ed.settings.inlinepopups_skin||'clearlooks2',style:'width:100px;height:100px'},['div',{id:id+'_wrapper','class':'wrapper'+opt},['div',{id:id+'_top','class':'top'},['div',{'class':'left'}],['div',{'class':'center'}],['div',{'class':'right'}],['span',{id:id+'_title'},f.title||'']],['div',{id:id+'_middle','class':'middle'},['div',{id:id+'_left','class':'left'}],['span',{id:id+'_content'}],['div',{id:id+'_right','class':'right'}]],['div',{id:id+'_bottom','class':'bottom'},['div',{'class':'left'}],['div',{'class':'center'}],['div',{'class':'right'}],['span',{id:id+'_status'},'Content']],['a',{'class':'move',href:'javascript:;'}],['a',{'class':'min',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'max',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'med',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'close',href:'javascript:;',onmousedown:'return false;'}],['a',{id:id+'_resize_n','class':'resize resize-n',href:'javascript:;'}],['a',{id:id+'_resize_s','class':'resize resize-s',href:'javascript:;'}],['a',{id:id+'_resize_w','class':'resize resize-w',href:'javascript:;'}],['a',{id:id+'_resize_e','class':'resize resize-e',href:'javascript:;'}],['a',{id:id+'_resize_nw','class':'resize resize-nw',href:'javascript:;'}],['a',{id:id+'_resize_ne','class':'resize resize-ne',href:'javascript:;'}],['a',{id:id+'_resize_sw','class':'resize resize-sw',href:'javascript:;'}],['a',{id:id+'_resize_se','class':'resize resize-se',href:'javascript:;'}]]]);DOM.setStyles(id,{top:-10000,left:-10000});if(tinymce.isGecko)DOM.setStyle(id,'overflow','auto');if(!f.type){dw+=DOM.get(id+'_left').clientWidth;dw+=DOM.get(id+'_right').clientWidth;dh+=DOM.get(id+'_top').clientHeight;dh+=DOM.get(id+'_bottom').clientHeight;}DOM.setStyles(id,{top:f.top,left:f.left,width:f.width+dw,height:f.height+dh});u=f.url||f.file;if(tinymce.relaxedDomain)u+=(u.indexOf('?')==-1?'?':'&')+'mce_rdomain='+tinymce.relaxedDomain;if(!f.type){DOM.add(id+'_content','iframe',{id:id+'_ifr',src:'javascript:""',frameBorder:0,style:'border:0;width:10px;height:10px'});DOM.setStyles(id+'_ifr',{width:f.width,height:f.height});DOM.setAttrib(id+'_ifr','src',u);}else{DOM.add(id+'_wrapper','a',{id:id+'_ok','class':'button ok',href:'javascript:;',onmousedown:'return false;'},'Ok');if(f.type=='confirm')DOM.add(id+'_wrapper','a',{'class':'button cancel',href:'javascript:;',onmousedown:'return false;'},'Cancel');DOM.add(id+'_middle','div',{'class':'icon'});DOM.setHTML(id+'_content',f.content.replace('\n','
'));}mdf=Event.add(id,'mousedown',function(e){var n=e.target,w,vp;w=t.windows[id];t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){if(n.className=='max'){w.oldPos=w.element.getXY();w.oldSize=w.element.getSize();vp=DOM.getViewPort();vp.w-=2;vp.h-=2;w.element.moveTo(vp.x,vp.y);w.element.resizeTo(vp.w,vp.h);DOM.setStyles(id+'_ifr',{width:vp.w-w.deltaWidth,height:vp.h-w.deltaHeight});DOM.addClass(id+'_wrapper','maximized');}else if(n.className=='med'){w.element.moveTo(w.oldPos.x,w.oldPos.y);w.element.resizeTo(w.oldSize.w,w.oldSize.h);w.iframeElement.resizeTo(w.oldSize.w-w.deltaWidth,w.oldSize.h-w.deltaHeight);DOM.removeClass(id+'_wrapper','maximized');}else if(n.className=='move')return t._startDrag(id,e,n.className);else if(DOM.hasClass(n,'resize'))return t._startDrag(id,e,n.className.substring(7));}});clf=Event.add(id,'click',function(e){var n=e.target;t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){switch(n.className){case'close':t.close(null,id);return Event.cancel(e);case'button ok':case'button cancel':f.button_func(n.className=='button ok');return Event.cancel(e);}}});t.windows=t.windows||{};w=t.windows[id]={id:id,mousedown_func:mdf,click_func:clf,element:new Element(id,{blocker:1,container:ed.getContainer()}),iframeElement:new Element(id+'_ifr'),features:f,deltaWidth:dw,deltaHeight:dh};w.iframeElement.on('focus',function(){t.focus(id);});t.focus(id);t._fixIELayout(id,1);return w;},focus:function(id){var t=this,w=t.windows[id];w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'focus');DOM.addClass(id,'focus');t.lastId=id;},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;iix){fw=w;ix=w.zIndex;}});if(fw)t.focus(fw.id);}},setTitle:function(ti,id){DOM.get(id+'_title').innerHTML=DOM.encode(ti);},alert:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'alert',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},confirm:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'confirm',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},_fixIELayout:function(id,s){var w,img;if(!tinymce.isIE6)return;each(['n','s','w','e','nw','ne','sw','se'],function(v){var e=DOM.get(id+'_resize_'+v);DOM.setStyles(e,{width:s?e.clientWidth:'',height:s?e.clientHeight:'',cursor:DOM.getStyle(e,'cursor',1)});DOM.setStyle(id+"_bottom",'bottom','-1px');e=0;});if(w=this.windows[id]){w.element.hide();w.element.show();each(DOM.select('div,a',id),function(e,i){if(e.currentStyle.backgroundImage!='none'){img=new Image();img.src=e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,'$1');}});DOM.get(id).style.filter='';}}});tinymce.PluginManager.add('inlinepopups',tinymce.plugins.InlinePopups);})(); \ No newline at end of file +(function(){var DOM=tinymce.DOM,Element=tinymce.dom.Element,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.InlinePopups',{init:function(ed,url){ed.onBeforeRenderUI.add(function(){ed.windowManager=new tinymce.InlineWindowManager(ed);DOM.loadCSS(url+'/skins/'+(ed.settings.inlinepopups_skin||'clearlooks2')+"/window.css");});},getInfo:function(){return{longname:'InlinePopups',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager',{InlineWindowManager:function(ed){var t=this;t.parent(ed);t.zIndex=1000;},open:function(f,p){var t=this,id,opt='',ed=t.editor,dw=0,dh=0,vp,po,mdf,clf,we,w,u;f=f||{};p=p||{};if(!f.inline)return t.parent(f,p);t.bookmark=ed.selection.getBookmark('simple');id=DOM.uniqueId();vp=DOM.getViewPort();f.width=parseInt(f.width||320);f.height=parseInt(f.height||240)+(tinymce.isIE?8:0);f.min_width=parseInt(f.min_width||150);f.min_height=parseInt(f.min_height||100);f.max_width=parseInt(f.max_width||2000);f.max_height=parseInt(f.max_height||2000);f.left=f.left||Math.round(Math.max(vp.x,vp.x+(vp.w/ 2.0) - (f.width /2.0)));f.top=f.top||Math.round(Math.max(vp.y,vp.y+(vp.h/ 2.0) - (f.height /2.0)));f.movable=f.resizable=true;p.mce_width=f.width;p.mce_height=f.height;p.mce_inline=true;p.mce_window_id=id;t.features=f;t.params=p;t.onOpen.dispatch(t,f,p);if(f.type){opt+=' mceModal';if(f.type)opt+=' mce'+f.type.substring(0,1).toUpperCase()+f.type.substring(1);f.resizable=false;}if(f.statusbar)opt+=' mceStatusbar';if(f.resizable)opt+=' mceResizable';if(f.minimizable)opt+=' mceMinimizable';if(f.maximizable)opt+=' mceMaximizable';if(f.movable)opt+=' mceMovable';t._addAll(document.body,['div',{id:id,'class':ed.settings.inlinepopups_skin||'clearlooks2',style:'width:100px;height:100px'},['div',{id:id+'_wrapper','class':'mceWrapper'+opt},['div',{id:id+'_top','class':'mceTop'},['div',{'class':'mceLeft'}],['div',{'class':'mceCenter'}],['div',{'class':'mceRight'}],['span',{id:id+'_title'},f.title||'']],['div',{id:id+'_middle','class':'mceMiddle'},['div',{id:id+'_left','class':'mceLeft'}],['span',{id:id+'_content'}],['div',{id:id+'_right','class':'mceRight'}]],['div',{id:id+'_bottom','class':'mceBottom'},['div',{'class':'mceLeft'}],['div',{'class':'mceCenter'}],['div',{'class':'mceRight'}],['span',{id:id+'_status'},'Content']],['a',{'class':'mceMove',href:'javascript:;'}],['a',{'class':'mceMin',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceMax',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceMed',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceClose',href:'javascript:;',onmousedown:'return false;'}],['a',{id:id+'_resize_n','class':'mceResize mceResizeN',href:'javascript:;'}],['a',{id:id+'_resize_s','class':'mceResize mceResizeS',href:'javascript:;'}],['a',{id:id+'_resize_w','class':'mceResize mceResizeW',href:'javascript:;'}],['a',{id:id+'_resize_e','class':'mceResize mceResizeE',href:'javascript:;'}],['a',{id:id+'_resize_nw','class':'mceResize mceResizeNW',href:'javascript:;'}],['a',{id:id+'_resize_ne','class':'mceResize mceResizeNE',href:'javascript:;'}],['a',{id:id+'_resize_sw','class':'mceResize mceResizeSW',href:'javascript:;'}],['a',{id:id+'_resize_se','class':'mceResize mceResizeSE',href:'javascript:;'}]]]);DOM.setStyles(id,{top:-10000,left:-10000});if(tinymce.isGecko)DOM.setStyle(id,'overflow','auto');if(!f.type){dw+=DOM.get(id+'_left').clientWidth;dw+=DOM.get(id+'_right').clientWidth;dh+=DOM.get(id+'_top').clientHeight;dh+=DOM.get(id+'_bottom').clientHeight;}DOM.setStyles(id,{top:f.top,left:f.left,width:f.width+dw,height:f.height+dh});u=f.url||f.file;if(tinymce.relaxedDomain)u+=(u.indexOf('?')==-1?'?':'&')+'mce_rdomain='+tinymce.relaxedDomain;if(!f.type){DOM.add(id+'_content','iframe',{id:id+'_ifr',src:'javascript:""',frameBorder:0,style:'border:0;width:10px;height:10px'});DOM.setStyles(id+'_ifr',{width:f.width,height:f.height});DOM.setAttrib(id+'_ifr','src',u);}else{DOM.add(id+'_wrapper','a',{id:id+'_ok','class':'mceButton mceOk',href:'javascript:;',onmousedown:'return false;'},'Ok');if(f.type=='confirm')DOM.add(id+'_wrapper','a',{'class':'mceButton mceCancel',href:'javascript:;',onmousedown:'return false;'},'Cancel');DOM.add(id+'_middle','div',{'class':'mceIcon'});DOM.setHTML(id+'_content',f.content.replace('\n','
'));}mdf=Event.add(id,'mousedown',function(e){var n=e.target,w,vp;w=t.windows[id];t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){if(n.className=='mceMax'){w.oldPos=w.element.getXY();w.oldSize=w.element.getSize();vp=DOM.getViewPort();vp.w-=2;vp.h-=2;w.element.moveTo(vp.x,vp.y);w.element.resizeTo(vp.w,vp.h);DOM.setStyles(id+'_ifr',{width:vp.w-w.deltaWidth,height:vp.h-w.deltaHeight});DOM.addClass(id+'_wrapper','mceMaximized');}else if(n.className=='mceMed'){w.element.moveTo(w.oldPos.x,w.oldPos.y);w.element.resizeTo(w.oldSize.w,w.oldSize.h);w.iframeElement.resizeTo(w.oldSize.w-w.deltaWidth,w.oldSize.h-w.deltaHeight);DOM.removeClass(id+'_wrapper','mceMaximized');}else if(n.className=='mceMove')return t._startDrag(id,e,n.className);else if(DOM.hasClass(n,'mceResize'))return t._startDrag(id,e,n.className.substring(13));}});clf=Event.add(id,'click',function(e){var n=e.target;t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){switch(n.className){case'mceClose':t.close(null,id);return Event.cancel(e);case'mceButton mceOk':case'mceButton mceCancel':f.button_func(n.className=='mceButton mceOk');return Event.cancel(e);}}});t.windows=t.windows||{};w=t.windows[id]={id:id,mousedown_func:mdf,click_func:clf,element:new Element(id,{blocker:1,container:ed.getContainer()}),iframeElement:new Element(id+'_ifr'),features:f,deltaWidth:dw,deltaHeight:dh};w.iframeElement.on('focus',function(){t.focus(id);});t.focus(id);t._fixIELayout(id,1);return w;},focus:function(id){var t=this,w=t.windows[id];w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'mceFocus');DOM.addClass(id,'mceFocus');t.lastId=id;},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;iix){fw=w;ix=w.zIndex;}});if(fw)t.focus(fw.id);}},setTitle:function(ti,id){DOM.get(id+'_title').innerHTML=DOM.encode(ti);},alert:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'alert',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},confirm:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'confirm',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},_fixIELayout:function(id,s){var w,img;if(!tinymce.isIE6)return;each(['n','s','w','e','nw','ne','sw','se'],function(v){var e=DOM.get(id+'_resize_'+v);DOM.setStyles(e,{width:s?e.clientWidth:'',height:s?e.clientHeight:'',cursor:DOM.getStyle(e,'cursor',1)});DOM.setStyle(id+"_bottom",'bottom','-1px');e=0;});if(w=this.windows[id]){w.element.hide();w.element.show();each(DOM.select('div,a',id),function(e,i){if(e.currentStyle.backgroundImage!='none'){img=new Image();img.src=e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,'$1');}});DOM.get(id).style.filter='';}}});tinymce.PluginManager.add('inlinepopups',tinymce.plugins.InlinePopups);})(); \ No newline at end of file diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/inlinepopups/editor_plugin_src.js --- a/includes/clientside/tinymce/plugins/inlinepopups/editor_plugin_src.js Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/inlinepopups/editor_plugin_src.js Thu Mar 06 20:47:11 2008 -0500 @@ -1,5 +1,5 @@ /** - * $Id: editor_plugin_src.js 602 2008-02-15 14:52:29Z spocke $ + * $Id: editor_plugin_src.js 644 2008-02-26 18:03:45Z spocke $ * * @author Moxiecode * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved. @@ -73,62 +73,66 @@ t.onOpen.dispatch(t, f, p); if (f.type) { - opt += ' modal ' + f.type; + opt += ' mceModal'; + + if (f.type) + opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1); + f.resizable = false; } if (f.statusbar) - opt += ' statusbar'; + opt += ' mceStatusbar'; if (f.resizable) - opt += ' resizable'; + opt += ' mceResizable'; if (f.minimizable) - opt += ' minimizable'; + opt += ' mceMinimizable'; if (f.maximizable) - opt += ' maximizable'; + opt += ' mceMaximizable'; if (f.movable) - opt += ' movable'; + opt += ' mceMovable'; // Create DOM objects t._addAll(document.body, ['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, - ['div', {id : id + '_wrapper', 'class' : 'wrapper' + opt}, - ['div', {id : id + '_top', 'class' : 'top'}, - ['div', {'class' : 'left'}], - ['div', {'class' : 'center'}], - ['div', {'class' : 'right'}], + ['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt}, + ['div', {id : id + '_top', 'class' : 'mceTop'}, + ['div', {'class' : 'mceLeft'}], + ['div', {'class' : 'mceCenter'}], + ['div', {'class' : 'mceRight'}], ['span', {id : id + '_title'}, f.title || ''] ], - ['div', {id : id + '_middle', 'class' : 'middle'}, - ['div', {id : id + '_left', 'class' : 'left'}], + ['div', {id : id + '_middle', 'class' : 'mceMiddle'}, + ['div', {id : id + '_left', 'class' : 'mceLeft'}], ['span', {id : id + '_content'}], - ['div', {id : id + '_right', 'class' : 'right'}] + ['div', {id : id + '_right', 'class' : 'mceRight'}] ], - ['div', {id : id + '_bottom', 'class' : 'bottom'}, - ['div', {'class' : 'left'}], - ['div', {'class' : 'center'}], - ['div', {'class' : 'right'}], + ['div', {id : id + '_bottom', 'class' : 'mceBottom'}, + ['div', {'class' : 'mceLeft'}], + ['div', {'class' : 'mceCenter'}], + ['div', {'class' : 'mceRight'}], ['span', {id : id + '_status'}, 'Content'] ], - ['a', {'class' : 'move', href : 'javascript:;'}], - ['a', {'class' : 'min', href : 'javascript:;', onmousedown : 'return false;'}], - ['a', {'class' : 'max', href : 'javascript:;', onmousedown : 'return false;'}], - ['a', {'class' : 'med', href : 'javascript:;', onmousedown : 'return false;'}], - ['a', {'class' : 'close', href : 'javascript:;', onmousedown : 'return false;'}], - ['a', {id : id + '_resize_n', 'class' : 'resize resize-n', href : 'javascript:;'}], - ['a', {id : id + '_resize_s', 'class' : 'resize resize-s', href : 'javascript:;'}], - ['a', {id : id + '_resize_w', 'class' : 'resize resize-w', href : 'javascript:;'}], - ['a', {id : id + '_resize_e', 'class' : 'resize resize-e', href : 'javascript:;'}], - ['a', {id : id + '_resize_nw', 'class' : 'resize resize-nw', href : 'javascript:;'}], - ['a', {id : id + '_resize_ne', 'class' : 'resize resize-ne', href : 'javascript:;'}], - ['a', {id : id + '_resize_sw', 'class' : 'resize resize-sw', href : 'javascript:;'}], - ['a', {id : id + '_resize_se', 'class' : 'resize resize-se', href : 'javascript:;'}] + ['a', {'class' : 'mceMove', href : 'javascript:;'}], + ['a', {'class' : 'mceMin', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {'class' : 'mceMax', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {'class' : 'mceMed', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {'class' : 'mceClose', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {id : id + '_resize_n', 'class' : 'mceResize mceResizeN', href : 'javascript:;'}], + ['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', href : 'javascript:;'}], + ['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', href : 'javascript:;'}], + ['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', href : 'javascript:;'}], + ['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', href : 'javascript:;'}], + ['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', href : 'javascript:;'}], + ['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', href : 'javascript:;'}], + ['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', href : 'javascript:;'}] ] ] ); @@ -159,12 +163,12 @@ DOM.setStyles(id + '_ifr', {width : f.width, height : f.height}); DOM.setAttrib(id + '_ifr', 'src', u); } else { - DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'button ok', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok'); + DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok'); if (f.type == 'confirm') - DOM.add(id + '_wrapper', 'a', {'class' : 'button cancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel'); + DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel'); - DOM.add(id + '_middle', 'div', {'class' : 'icon'}); + DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'}); DOM.setHTML(id + '_content', f.content.replace('\n', '
')); } @@ -176,7 +180,7 @@ t.focus(id); if (n.nodeName == 'A' || n.nodeName == 'a') { - if (n.className == 'max') { + if (n.className == 'mceMax') { w.oldPos = w.element.getXY(); w.oldSize = w.element.getSize(); @@ -189,18 +193,18 @@ w.element.moveTo(vp.x, vp.y); w.element.resizeTo(vp.w, vp.h); DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight}); - DOM.addClass(id + '_wrapper', 'maximized'); - } else if (n.className == 'med') { + DOM.addClass(id + '_wrapper', 'mceMaximized'); + } else if (n.className == 'mceMed') { // Reset to old size w.element.moveTo(w.oldPos.x, w.oldPos.y); w.element.resizeTo(w.oldSize.w, w.oldSize.h); w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight); - DOM.removeClass(id + '_wrapper', 'maximized'); - } else if (n.className == 'move') + DOM.removeClass(id + '_wrapper', 'mceMaximized'); + } else if (n.className == 'mceMove') return t._startDrag(id, e, n.className); - else if (DOM.hasClass(n, 'resize')) - return t._startDrag(id, e, n.className.substring(7)); + else if (DOM.hasClass(n, 'mceResize')) + return t._startDrag(id, e, n.className.substring(13)); } }); @@ -211,13 +215,13 @@ if (n.nodeName == 'A' || n.nodeName == 'a') { switch (n.className) { - case 'close': + case 'mceClose': t.close(null, id); return Event.cancel(e); - case 'button ok': - case 'button cancel': - f.button_func(n.className == 'button ok'); + case 'mceButton mceOk': + case 'mceButton mceCancel': + f.button_func(n.className == 'mceButton mceOk'); return Event.cancel(e); } } @@ -257,8 +261,8 @@ w.element.update(); id = id + '_wrapper'; - DOM.removeClass(t.lastId, 'focus'); - DOM.addClass(id, 'focus'); + DOM.removeClass(t.lastId, 'mceFocus'); + DOM.addClass(id, 'mceFocus'); t.lastId = id; }, @@ -308,7 +312,7 @@ return Event.cancel(e); }); - if (ac != 'move') + if (ac != 'Move') startMove(); function startMove() { @@ -331,7 +335,7 @@ sz = we.getSize(); sx = cp.x + p.x - vp.x; sy = cp.y + p.y - vp.y; - DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'placeholder', style : {left : sx, top : sy, width : sz.w, height : sz.h}}); + DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}}); ph = new Element('mcePlaceHolder'); }; @@ -345,41 +349,41 @@ y = e.screenY - sey; switch (ac) { - case 'resize-w': + case 'ResizeW': dx = x; dw = 0 - x; break; - case 'resize-e': + case 'ResizeE': dw = x; break; - case 'resize-n': - case 'resize-nw': - case 'resize-ne': - if (ac == "resize-nw") { + case 'ResizeN': + case 'ResizeNW': + case 'ResizeNE': + if (ac == "ResizeNW") { dx = x; dw = 0 - x; - } else if (ac == "resize-ne") + } else if (ac == "ResizeNE") dw = x; dy = y; dh = 0 - y; break; - case 'resize-s': - case 'resize-sw': - case 'resize-se': - if (ac == "resize-sw") { + case 'ResizeS': + case 'ResizeSW': + case 'ResizeSE': + if (ac == "ResizeSW") { dx = x; dw = 0 - x; - } else if (ac == "resize-se") + } else if (ac == "ResizeSE") dw = x; dh = y; break; - case 'move': + case 'mceMove': dx = x; dy = y; break; diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css --- a/includes/clientside/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css Thu Mar 06 20:47:11 2008 -0500 @@ -5,85 +5,85 @@ /* General */ .clearlooks2 {position:absolute} -.clearlooks2 .wrapper {position:static} +.clearlooks2 .mceWrapper {position:static} .mceEventBlocker {position:absolute; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%} -.clearlooks2 .placeholder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; filter:alpha(opacity=50)} +.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; filter:alpha(opacity=50)} /* Top */ -.clearlooks2 .top, .clearlooks2 .top div {top:0; width:100%; height:23px} -.clearlooks2 .top .left {width:6px; background:url(img/corners.gif)} -.clearlooks2 .top .center {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)} -.clearlooks2 .top .right {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0} -.clearlooks2 .top span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold} -.clearlooks2 .focus .top .left {background:url(img/corners.gif) -6px 0} -.clearlooks2 .focus .top .center {background:url(img/horizontal.gif) 0 -23px} -.clearlooks2 .focus .top .right {background:url(img/corners.gif) -18px 0} -.clearlooks2 .focus .top span {color:#FFF} +.clearlooks2 .mceTop, .clearlooks2 .mceTop div {top:0; width:100%; height:23px} +.clearlooks2 .mceTop .mceLeft {width:6px; background:url(img/corners.gif)} +.clearlooks2 .mceTop .mceCenter {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)} +.clearlooks2 .mceTop .mceRight {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0} +.clearlooks2 .mceTop span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold} +.clearlooks2 .mceFocus .mceTop .mceLeft {background:url(img/corners.gif) -6px 0} +.clearlooks2 .mceFocus .mceTop .mceCenter {background:url(img/horizontal.gif) 0 -23px} +.clearlooks2 .mceFocus .mceTop .mceRight {background:url(img/corners.gif) -18px 0} +.clearlooks2 .mceFocus .mceTop span {color:#FFF} /* Middle */ -.clearlooks2 .middle, .clearlooks2 .middle div {top:0} -.clearlooks2 .middle {width:100%; height:100%; clip:rect(23px auto auto auto)} -.clearlooks2 .middle .left {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0} -.clearlooks2 .middle span {top:23px; left:5px; width:100%; height:100%; background:#FFF} -.clearlooks2 .middle .right {right:0; width:5px; height:100%; background:url(img/vertical.gif)} +.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0} +.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)} +.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0} +.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF} +.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:url(img/vertical.gif)} /* Bottom */ -.clearlooks2 .bottom, .clearlooks2 .bottom div {height:6px} -.clearlooks2 .bottom {left:0; bottom:0; width:100%} -.clearlooks2 .bottom div {top:0} -.clearlooks2 .bottom .left {left:0; width:5px; background:url(img/corners.gif) -34px -6px} -.clearlooks2 .bottom .center {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px} -.clearlooks2 .bottom .right {right:0; width:5px; background: url(img/corners.gif) -34px 0} -.clearlooks2 .bottom span {display:none} -.clearlooks2 .statusbar .bottom, .clearlooks2 .statusbar .bottom div {height:23px} -.clearlooks2 .statusbar .bottom .left {background:url(img/corners.gif) -29px 0} -.clearlooks2 .statusbar .bottom .center {background:url(img/horizontal.gif) 0 -52px} -.clearlooks2 .statusbar .bottom .right {background:url(img/corners.gif) -24px 0} -.clearlooks2 .statusbar .bottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px} +.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px} +.clearlooks2 .mceBottom {left:0; bottom:0; width:100%} +.clearlooks2 .mceBottom div {top:0} +.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:url(img/corners.gif) -34px -6px} +.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px} +.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0} +.clearlooks2 .mceBottom span {display:none} +.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px} +.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0} +.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px} +.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0} +.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px} /* Actions */ .clearlooks2 a {width:29px; height:16px; top:3px;} -.clearlooks2 .close {right:6px; background:url(img/buttons.gif) -87px 0} -.clearlooks2 .min {display:none; right:68px; background:url(img/buttons.gif) 0 0} -.clearlooks2 .med {display:none; right:37px; background:url(img/buttons.gif) -29px 0} -.clearlooks2 .max {display:none; right:37px; background:url(img/buttons.gif) -58px 0} -.clearlooks2 .move {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px} -.clearlooks2 .movable .move {display:block} -.clearlooks2 .focus .close {right:6px; background:url(img/buttons.gif) -87px -16px} -.clearlooks2 .focus .min {right:68px; background:url(img/buttons.gif) 0 -16px} -.clearlooks2 .focus .med {right:37px; background:url(img/buttons.gif) -29px -16px} -.clearlooks2 .focus .max {right:37px; background:url(img/buttons.gif) -58px -16px} -.clearlooks2 .focus .close:hover {right:6px; background:url(img/buttons.gif) -87px -32px} -.clearlooks2 .focus .close:hover {right:6px; background:url(img/buttons.gif) -87px -32px} -.clearlooks2 .focus .min:hover {right:68px; background:url(img/buttons.gif) 0 -32px} -.clearlooks2 .focus .med:hover {right:37px; background:url(img/buttons.gif) -29px -32px} -.clearlooks2 .focus .max:hover {right:37px; background:url(img/buttons.gif) -58px -32px} +.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0} +.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0} +.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0} +.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0} +.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px} +.clearlooks2 .mceMovable .mceMove {display:block} +.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px} +.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px} +.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px} +.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px} +.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px} +.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px} +.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px} +.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px} +.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px} /* Resize */ -.clearlooks2 .resize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px} -.clearlooks2 .resizable .resize {display:block} -.clearlooks2 .resizable .min, .clearlooks2 .max {display:none} -.clearlooks2 .minimizable .min {display:block} -.clearlooks2 .maximizable .max {display:block} -.clearlooks2 .maximized .med {display:block} -.clearlooks2 .maximized .max {display:none} -.clearlooks2 a.resize-n {top:0; left:0; width:100%; cursor:n-resize} -.clearlooks2 a.resize-nw {top:0; left:0; cursor:nw-resize} -.clearlooks2 a.resize-ne {top:0; right:0; cursor:ne-resize} -.clearlooks2 a.resize-w {top:0; left:0; height:100%; cursor:w-resize;} -.clearlooks2 a.resize-e {top:0; right:0; height:100%; cursor:e-resize} -.clearlooks2 a.resize-s {bottom:0; left:0; width:100%; cursor:s-resize} -.clearlooks2 a.resize-sw {bottom:0; left:0; cursor:sw-resize} -.clearlooks2 a.resize-se {bottom:0; right:0; cursor:se-resize} +.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px} +.clearlooks2 .mceResizable .mceResize {display:block} +.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none} +.clearlooks2 .mceMinimizable .mceMin {display:block} +.clearlooks2 .mceMaximizable .mceMax {display:block} +.clearlooks2 .mceMaximized .mceMed {display:block} +.clearlooks2 .mceMaximized .mceMax {display:none} +.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize} +.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize} +.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize} +.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;} +.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize} +.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize} +.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize} +.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize} /* Alert/Confirm */ -.clearlooks2 .button {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0} -.clearlooks2 .middle .icon {left:15px; top:35px; width:32px; height:32px} -.clearlooks2 .alert .middle span, .clearlooks2 .confirm .middle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal} +.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0} +.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px} +.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal} .clearlooks2 a:hover {font-weight:bold;} -.clearlooks2 .alert .middle, .clearlooks2 .confirm .middle {background:#D6D7D5} -.clearlooks2 .alert .ok {left:50%; top:auto; margin-left: -40px} -.clearlooks2 .alert .icon {background:url(img/alert.gif)} -.clearlooks2 .confirm .ok {left:50%; top:auto; margin-left: -90px} -.clearlooks2 .confirm .cancel {left:50%; top:auto} -.clearlooks2 .confirm .icon {background:url(img/confirm.gif)} +.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5} +.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px} +.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)} +.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px} +.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto} +.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} \ No newline at end of file diff -r 51386f1852b8 -r f26a69c40431 includes/clientside/tinymce/plugins/inlinepopups/template.htm --- a/includes/clientside/tinymce/plugins/inlinepopups/template.htm Thu Mar 06 20:45:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/inlinepopups/template.htm Thu Mar 06 20:47:11 2008 -0500 @@ -8,320 +8,320 @@
-
-
-
-
-
+
+
+
+
+
Blured
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
+
+
+
+
+
Focused
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
+
+
+
+
+
Statusbar
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
+
+
+
+
+
Statusbar, Resizable
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
+
+
+
+
+
Resizable, Maximizable
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
+
+
+
+
+
Blurred, Maximizable, Statusbar, Resizable
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
- Maximized, Maximizable, Minimizable, Focused +
+
+
+
+
+ Maximized, Maximizable, Minimizable
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-
-
-
-
-
- Maximized, Maximizable, Minimizable +
+
+
+
+
+ Blured
-
-
+
+
Content -
+
-
-
-
-
+
+
+
+
Statusbar text.
- - - - - - - - - - - - - + + + + + + + + + + + + +
-