Index: openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 29 Aug 2008 17:42:39 -0000 1.9 +++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 12 Jul 2009 01:10:25 -0000 1.10 @@ -59,15 +59,15 @@ aa_register_case -cats {api smoke} util_close_html_tags { Tests closing HTML tags. } { - aa_equals "" [util_close_html_tags "Foobar"] "Foobar" + aa_equals "" [util_close_html_tags "Foobar"] "Foobar" aa_equals "" [util_close_html_tags "Foobar"] "Foobar" aa_equals "" [util_close_html_tags "Foobar is a very long word"] "Foobar is a very long word" - aa_equals "" [util_close_html_tags "Foobar is a very long word" 15] "Foobar is a" + aa_equals "" [util_close_html_tags "Foobar is a very long word" 15] "Foobar is a" - aa_equals "" [util_close_html_tags "Foobar is a very long word" 0 20 "..."] "Foobar is a very..." + aa_equals "" [util_close_html_tags "Foobar is a very long word" 0 20 "..."] "Foobar is a very..." } @@ -81,7 +81,7 @@ set string "What?\nNever mind, buddy" aa_equals "" [ad_html_text_convert -from "text/enhanced" -to "text/html" -truncate_len 14 -- $string] \ - [ad_enhanced_text_to_html "What?\nNever..."] + [ad_enhanced_text_to_html "What?\nNever..."] # The string is longer in plaintext, because the "_" symbol to denote italics is counted as well. aa_equals "" [ad_html_text_convert -from "text/enhanced" -to "text/plain" -truncate_len 15 -- $string] "What?\n_Never..." @@ -105,7 +105,7 @@ set string "What?\nNever mind, buddy" aa_equals "" [ad_html_text_convert -from "text/fixed-width" -to "text/html" -truncate_len 14 -- $string] \ - "
What?\nNever
..." + "
What?\nNever
..." aa_equals "" [ad_html_text_convert -from "text/fixed-width" -to "text/plain" -truncate_len 14 -- $string] \ "What?\nNever..." @@ -118,7 +118,7 @@ set string "What?
Never mind, buddy" aa_equals "" [ad_html_text_convert -from "text/html" -to "text/html" -truncate_len 14 -- $string] \ - "What?
Never..." + "What?
Never..." aa_equals "" [ad_html_text_convert -from "text/html" -to "text/plain" -truncate_len 15 -- $string] \ "What?\n_Never..." @@ -296,4 +296,4 @@ aa_equals "Some HTML with Comment ok" $result "*Bold* _Italic_" -} \ No newline at end of file +} Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v diff -u -r1.47 -r1.48 --- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 8 May 2009 21:05:19 -0000 1.47 +++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 12 Jul 2009 01:10:26 -0000 1.48 @@ -299,14 +299,20 @@ ad_proc -public template::widget::richtext { element_reference tag_attributes } { + +

Implements the richtext widget, which offers rich text editing options. - This version supports the xinha editor. + This version supports the xinha and tinymce + editors. If the acs-templating.UseHtmlAreaForRichtextP parameter is set to true (1), - this will use the htmlArea WYSIWYG editor widget. + this will use the WYSIWYG editor widget set in the acs-templating.RichTextEditor + parameter. Otherwise, it will use a normal textarea, with a drop-down to select a format. The available formats are: +

+ + +

You can also parameterize the richtext widget with a 'htmlarea_p' attribute, which can be true or false, and which will override the parameter setting.

- The default editor in wysigwig mode is rte. In oder to use xinha, one - has to use 'editor xinha' in the options of the form field. The following - options for xinha may be specified: + The available editors in wysigwig mode are xinha and tinymce. In order to + use xinha, one has to use 'editor xinha' in the options of the form field. + The following options for xinha may be specified:

These options are used by the OacsFs plugin

  • javascript: provide javascript code to configure - the xinha widget and its plugins. The configure object is called xinha_config. + the xinha widget and its plugins. The configure object is called xinha_config. + + +

    Example to use xinha with only a few controls: +

         {options {editor xinha plugins {OacsFs} height 350px javascript {
             xinha_config.toolbar = [
                                     ['popupeditor', 'bold','italic','createlink','insertimage','separator'],
                                     ['killword','removeformat'] ];
         }}}
         
    - - - Example for the use of the xinha widget with options: + +

    + Example for the use of the xinha widget with options:

         text:richtext(richtext),nospell,optional 
         {label #xowiki.content#} 
         {options {editor xinha plugins OacsFs height 350px file_types %pdf%}}
         {html {rows 15 cols 50 style {width: 100%}}}
         
    +

    Caveat: the three adp-files needed for the OpenACS file selector (insert-image, insert-ilink and file-selector) are currently part of the xowiki package, since acs-templating is per default not mounted. This is hopefully only a temporal situation and we find a better place. +

    - Note that the rich-rext editor interacts with blank-master.tcl and - blank-master.adp. + Example for the use of the tinymce widget with options: +

    +    text:richtext(richtext),nospell,optional 
    +    {label #acs-subsite.Biography#} 
    +    {options {theme simple plugins "oacsimage,oacslink,style"}}
    +    {html {rows 15 cols 50 style {width: 100%}}}
    +    

    + See TinyMCE + documentation for a full list of available options +

    + Caveat: the scripts needed for the oacsimage and oacslink plugins require + acs-templating to be mounted. This is a temporary situation until we find + a better way to handle plugins. + +

    + Note that the richtext editors interact with blank-master.tcl and + blank-master.adp. +

    Derived from the htmlarea richtext widget for htmlarea by lars@pinds.com
    modified for RTE http://www.kevinroth.com/ by davis@xarg.net
    - xinha support by gustaf.neumann@wu-wien.ac.at + xinha support by gustaf.neumann@wu-wien.ac.at
    + tinymce support by oct@openacs.org } { upvar $element_reference element @@ -504,7 +535,7 @@ {relative_urls "false"} {height "450px" } {width "100%"} - {plugins "oacsimage,oacslink,style,layer,table,save,iespell,preview,zoom,media,searchreplace,print,contextmenu,paste,fullscreen,noneditable,visualchars,xhtmlxtras" } + {plugins "style,layer,table,save,iespell,preview,media,searchreplace,print,contextmenu,paste,fullscreen,noneditable,visualchars,xhtmlxtras" } {browsers "msie,gecko,safari,opera" } {apply_source_formatting "true" } {paste_auto_cleanup_on_paste true} @@ -518,19 +549,37 @@ {theme_openacs_resizing true} {theme_openacs_disable "styleselect"} {theme_openacs_buttons1_add_before "save,separator"} - {theme_openacs_buttons2_add "oacslink,separator,preview,separator,forecolor,backcolor"} + {theme_openacs_buttons2_add "separator,preview,separator,forecolor,backcolor"} {theme_openacs_buttons2_add_before "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator"} {theme_openacs_buttons3_add_before "tablecontrols,separator"} - {theme_openacs_buttons3_add "iespell,media,separator,print,separator,fullscreen"} - {extended_valid_elements "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"}} + {theme_openacs_buttons3_add "iespell,media,separator,print,separator,fullscreen"} + {extended_valid_elements "img[id|class|style|title|lang|onmouseover|onmouseout|src|alt|name|width|height],hr[id|class|style|title],span[id|class|style|title|lang]"} + {element_format "html"}} set tinymce_configs_list [parameter::get \ -package_id [apm_package_id_from_key "acs-templating"] \ -parameter "TinyMCEDefaultConfig" \ -default $tinymce_default_config] set pairslist [list] + ns_log notice "options [array get options]" foreach config_pair $tinymce_configs_list { - lappend pairslist "[lindex $config_pair 0]:\"[lindex $config_pair 1]\"" + set config_key [lindex $config_pair 0] + if {[info exists options($config_key)]} { + # override default values with individual + # widget specification + set config_value $options($config_key) + unset options($config_key) + } else { + set config_value [lindex $config_pair 1] + } + ns_log notice "key $config_key value $config_value" + lappend pairslist "${config_key}:\"${config_value}\"" } + foreach name [array names options] { + ns_log notice "NAME $name" + # add any additional options not specified in the + # default config + lappend pairslist "${name}:\"$options($name)\"" + } lappend pairslist "elements : \"[join $::acs_blank_master__htmlareas ","]\"" set tinymce_configs_js [join $pairslist ","] set ::acs_blank_master(tinymce.config) $tinymce_configs_js Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/changelog'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/changelog.txt'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce.js 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce.js 12 Jul 2009 01:10:26 -0000 1.3 @@ -1 +1 @@ -var tinymce={majorVersion:"3",minorVersion:"2.2.3",releaseDate:"2009-03-26",_init:function(){var o=this,k=document,l=window,j=navigator,b=j.userAgent,h,a,g,f,e,m;o.isOpera=l.opera&&opera.buildNumber;o.isWebKit=/WebKit/.test(b);o.isIE=!o.isWebKit&&!o.isOpera&&(/MSIE/gi).test(b)&&(/Explorer/gi).test(j.appName);o.isIE6=o.isIE&&/MSIE [56]/.test(b);o.isGecko=!o.isWebKit&&/Gecko/.test(b);o.isMac=b.indexOf("Mac")!=-1;o.isAir=/adobeair/i.test(b);if(l.tinyMCEPreInit){o.suffix=tinyMCEPreInit.suffix;o.baseURL=tinyMCEPreInit.base;o.query=tinyMCEPreInit.query;return}o.suffix="";a=k.getElementsByTagName("base");for(h=0;h=c.length){for(e=0,b=g.length;e=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}g.push(f[c])}c=e.length-b;if(c<=0){return"/"+g.reverse().join("/")+d}return"/"+e.slice(0,c).join("/")+"/"+g.reverse().join("/")+d},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(c){var e=c.each,b=c.is;var d=c.isWebKit,a=c.isIE;c.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(i,g){var f=this;f.doc=i;f.win=window;f.files={};f.cssFlicker=false;f.counter=0;f.boxModel=!c.isIE||i.compatMode=="CSS1Compat";f.stdMode=i.documentMode===8;this.settings=g=c.extend({keep_values:false,hex_colors:1,process_html:1},g);if(c.isIE6){try{i.execCommand("BackgroundImageCache",false,true)}catch(h){f.cssFlicker=true}}c.addUnload(f.destroy,f)},getRoot:function(){var f=this,g=f.settings;return(g&&f.get(g.root_element))||f.doc.body},getViewPort:function(g){var h,f;g=!g?this.win:g;h=g.document;f=this.boxModel?h.documentElement:h.body;return{x:g.pageXOffset||f.scrollLeft,y:g.pageYOffset||f.scrollTop,w:g.innerWidth||f.clientWidth,h:g.innerHeight||f.clientHeight}},getRect:function(i){var h,f=this,g;i=f.get(i);h=f.getPos(i);g=f.getSize(i);return{x:h.x,y:h.y,w:g.w,h:g.h}},getSize:function(j){var g=this,f,i;j=g.get(j);f=g.getStyle(j,"width");i=g.getStyle(j,"height");if(f.indexOf("px")===-1){f=0}if(i.indexOf("px")===-1){i=0}return{w:parseInt(f)||j.offsetWidth||j.clientWidth,h:parseInt(i)||j.offsetHeight||j.clientHeight}},is:function(g,f){return c.dom.Sizzle.matches(f,g.nodeType?[g]:g).length>0},getParent:function(i,h,g){return this.getParents(i,h,g,false)},getParents:function(p,k,i,m){var h=this,g,j=h.settings,l=[];p=h.get(p);m=m===undefined;if(j.strict_root){i=i||h.getRoot()}if(b(k,"string")){g=k;if(k==="*"){k=function(f){return f.nodeType==1}}else{k=function(f){return h.is(f,g)}}}while(p){if(p==i){break}if(!k||k(p)){if(m){l.push(p)}else{return p}}p=p.parentNode}return m?l:null},get:function(f){var g;if(f&&this.doc&&typeof(f)=="string"){g=f;f=this.doc.getElementById(f);if(f&&f.id!==g){return this.doc.getElementsByName(g)[1]}}return f},select:function(h,g){var f=this;return c.dom.Sizzle(h,f.get(g)||f.get(f.settings.root_element)||f.doc,[])},add:function(j,l,f,i,k){var g=this;return this.run(j,function(n){var m,h;m=b(l,"string")?g.doc.createElement(l):l;g.setAttribs(m,f);if(i){if(i.nodeType){m.appendChild(i)}else{g.setHTML(m,i)}}return !k?n.appendChild(m):m})},create:function(i,f,g){return this.add(this.doc.createElement(i),i,f,g,1)},createHTML:function(m,f,j){var l="",i=this,g;l+="<"+m;for(g in f){if(f.hasOwnProperty(g)){l+=" "+g+'="'+i.encode(f[g])+'"'}}if(c.is(j)){return l+">"+j+""}return l+" />"},remove:function(h,f){var g=this;return this.run(h,function(m){var l,k,j;l=m.parentNode;if(!l){return null}if(f){for(j=m.childNodes.length-1;j>=0;j--){g.insertAfter(m.childNodes[j],m)}}if(g.fixPsuedoLeaks){l=m.cloneNode(true);f="IELeakGarbageBin";k=g.get(f)||g.add(g.doc.body,"div",{id:f,style:"display:none"});k.appendChild(m);k.innerHTML="";return l}return l.removeChild(m)})},setStyle:function(i,f,g){var h=this;return h.run(i,function(l){var k,j;k=l.style;f=f.replace(/-(\D)/g,function(n,m){return m.toUpperCase()});if(h.pixelStyles.test(f)&&(c.is(g,"number")||/^[\-0-9\.]+$/.test(g))){g+="px"}switch(f){case"opacity":if(a){k.filter=g===""?"":"alpha(opacity="+(g*100)+")";if(!i.currentStyle||!i.currentStyle.hasLayout){k.display="inline-block"}}k[f]=k["-moz-opacity"]=k["-khtml-opacity"]=g||"";break;case"float":a?k.styleFloat=g:k.cssFloat=g;break;default:k[f]=g||""}if(h.settings.update_styles){h.setAttrib(l,"mce_style")}})},getStyle:function(i,f,h){i=this.get(i);if(!i){return false}if(this.doc.defaultView&&h){f=f.replace(/[A-Z]/g,function(j){return"-"+j});try{return this.doc.defaultView.getComputedStyle(i,null).getPropertyValue(f)}catch(g){return null}}f=f.replace(/-(\D)/g,function(k,j){return j.toUpperCase()});if(f=="float"){f=a?"styleFloat":"cssFloat"}if(i.currentStyle&&h){return i.currentStyle[f]}return i.style[f]},setStyles:function(i,j){var g=this,h=g.settings,f;f=h.update_styles;h.update_styles=0;e(j,function(k,l){g.setStyle(i,l,k)});h.update_styles=f;if(h.update_styles){g.setAttrib(i,h.cssText)}},setAttrib:function(h,i,f){var g=this;if(!h||!i){return}if(g.settings.strict){i=i.toLowerCase()}return this.run(h,function(k){var j=g.settings;switch(i){case"style":if(!b(f,"string")){e(f,function(l,m){g.setStyle(k,m,l)});return}if(j.keep_values){if(f&&!g._isRes(f)){k.setAttribute("mce_style",f,2)}else{k.removeAttribute("mce_style",2)}}k.style.cssText=f;break;case"class":k.className=f||"";break;case"src":case"href":if(j.keep_values){if(j.url_converter){f=j.url_converter.call(j.url_converter_scope||g,f,i,k)}g.setAttrib(k,"mce_"+i,f,2)}break;case"shape":k.setAttribute("mce_style",f);break}if(b(f)&&f!==null&&f.length!==0){k.setAttribute(i,""+f,2)}else{k.removeAttribute(i,2)}})},setAttribs:function(g,h){var f=this;return this.run(g,function(i){e(h,function(j,k){f.setAttrib(i,k,j)})})},getAttrib:function(i,j,h){var f,g=this;i=g.get(i);if(!i||i.nodeType!==1){return false}if(!b(h)){h=""}if(/^(src|href|style|coords|shape)$/.test(j)){f=i.getAttribute("mce_"+j);if(f){return f}}if(a&&g.props[j]){f=i[g.props[j]];f=f&&f.nodeValue?f.nodeValue:f}if(!f){f=i.getAttribute(j,2)}if(j==="style"){f=f||i.style.cssText;if(f){f=g.serializeStyle(g.parseStyle(f));if(g.settings.keep_values&&!g._isRes(f)){i.setAttribute("mce_style",f)}}}if(d&&j==="class"&&f){f=f.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(a){switch(j){case"rowspan":case"colspan":if(f===1){f=""}break;case"size":if(f==="+0"||f===20||f===0){f=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(f===0){f=""}break;case"hspace":if(f===-1){f=""}break;case"maxlength":case"tabindex":if(f===32768||f===2147483647||f==="32768"){f=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(f===65535){return j}return h;case"shape":f=f.toLowerCase();break;default:if(j.indexOf("on")===0&&f){f=(""+f).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(f!==undefined&&f!==null&&f!=="")?""+f:h},getPos:function(l){var g=this,f=0,k=0,i,j=g.doc,h;l=g.get(l);if(l&&a&&!g.stdMode){l=l.getBoundingClientRect();i=g.boxModel?j.documentElement:j.body;f=g.getStyle(g.select("html")[0],"borderWidth");f=(f=="medium"||g.boxModel&&!g.isIE6)&&2||f;l.top+=g.win.self!=g.win.top?2:0;return{x:l.left+i.scrollLeft-f,y:l.top+i.scrollTop-f}}h=l;while(h){f+=h.offsetLeft||0;k+=h.offsetTop||0;h=h.offsetParent}h=l;while(h){if(!/^table-row|inline.*/i.test(g.getStyle(h,"display",1))){f-=h.scrollLeft||0;k-=h.scrollTop||0}h=h.parentNode;if(!h.nodeType||h.nodeType==9||h.nodeName.toLowerCase()=="body"){break}}return{x:f,y:k}},parseStyle:function(h){var i=this,j=i.settings,k={};if(!h){return k}function f(w,q,v){var o,u,m,n;o=k[w+"-top"+q];if(!o){return}u=k[w+"-right"+q];if(o!=u){return}m=k[w+"-bottom"+q];if(u!=m){return}n=k[w+"-left"+q];if(m!=n){return}k[v]=n;delete k[w+"-top"+q];delete k[w+"-right"+q];delete k[w+"-bottom"+q];delete k[w+"-left"+q]}function g(n,m,l,p){var o;o=k[m];if(!o){return}o=k[l];if(!o){return}o=k[p];if(!o){return}k[n]=k[m]+" "+k[l]+" "+k[p];delete k[m];delete k[l];delete k[p]}h=h.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");e(h.split(";"),function(m){var l,n=[];if(m){m=m.replace(/_MCE_SEMI_/g,";");m=m.replace(/url\([^\)]+\)/g,function(o){n.push(o);return"url("+n.length+")"});m=m.split(":");l=c.trim(m[1]);l=l.replace(/url\(([^\)]+)\)/g,function(p,o){return n[parseInt(o)-1]});l=l.replace(/rgb\([^\)]+\)/g,function(o){return i.toHex(o)});if(j.url_converter){l=l.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(o,p){return"url("+j.url_converter.call(j.url_converter_scope||i,i.decode(p),"style",null)+")"})}k[c.trim(m[0]).toLowerCase()]=l}});f("border","","border");f("border","-width","border-width");f("border","-color","border-color");f("border","-style","border-style");f("padding","","padding");f("margin","","margin");g("border","border-width","border-style","border-color");if(a){if(k.border=="medium none"){k.border=""}}return k},serializeStyle:function(g){var f="";e(g,function(i,h){if(h&&i){if(c.isGecko&&h.indexOf("-moz-")===0){return}switch(h){case"color":case"background-color":i=i.toLowerCase();break}f+=(f?" ":"")+h+": "+i+";"}});return f},loadCSS:function(f){var g=this,h=g.doc;if(!f){f=""}e(f.split(","),function(i){if(g.files[i]){return}g.files[i]=true;g.add(g.select("head")[0],"link",{rel:"stylesheet",href:c._addVer(i)})})},addClass:function(f,g){return this.run(f,function(h){var i;if(!g){return 0}if(this.hasClass(h,g)){return h.className}i=this.removeClass(h,g);return h.className=(i!=""?(i+" "):"")+g})},removeClass:function(h,i){var f=this,g;return f.run(h,function(k){var j;if(f.hasClass(k,i)){if(!g){g=new RegExp("(^|\\s+)"+i+"(\\s+|$)","g")}j=k.className.replace(g," ");return k.className=c.trim(j!=" "?j:"")}return k.className})},hasClass:function(g,f){g=this.get(g);if(!g||!f){return false}return(" "+g.className+" ").indexOf(" "+f+" ")!==-1},show:function(f){return this.setStyle(f,"display","block")},hide:function(f){return this.setStyle(f,"display","none")},isHidden:function(f){f=this.get(f);return !f||f.style.display=="none"||this.getStyle(f,"display")=="none"},uniqueId:function(f){return(!f?"mce_":f)+(this.counter++)},setHTML:function(i,g){var f=this;return this.run(i,function(m){var h,k,j,q,l,h;g=f.processHTML(g);if(a){function o(){try{m.innerHTML="
    "+g;m.removeChild(m.firstChild)}catch(n){while(m.firstChild){m.firstChild.removeNode()}h=f.create("div");h.innerHTML="
    "+g;e(h.childNodes,function(r,p){if(p){m.appendChild(r)}})}}if(f.settings.fix_ie_paragraphs){g=g.replace(/

    <\/p>|]+)><\/p>|/gi,' 

    ')}o();if(f.settings.fix_ie_paragraphs){j=m.getElementsByTagName("p");for(k=j.length-1,h=0;k>=0;k--){q=j[k];if(!q.hasChildNodes()){if(!q.mce_keep){h=1;break}q.removeAttribute("mce_keep")}}}if(h){g=g.replace(/

    ]+)>|

    /g,'

    ');g=g.replace(/<\/p>/g,"
    ");o();if(f.settings.fix_ie_paragraphs){j=m.getElementsByTagName("DIV");for(k=j.length-1;k>=0;k--){q=j[k];if(q.mce_tmp){l=f.doc.createElement("p");q.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(p,n){var r;if(n!=="mce_tmp"){r=q.getAttribute(n);if(!r&&n==="class"){r=q.className}l.setAttribute(n,r)}});for(h=0;h|]+)>/gi,"<$1b$2>");j=j.replace(/<(\/?)em>|]+)>/gi,"<$1i$2>")}else{if(a){j=j.replace(/'/g,"'");j=j.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,"")}}j=j.replace(/]+)\/>|/gi,"");if(i.keep_values){if(/)/g,"\n");h=h.replace(/^[\r\n]*|[\r\n]*$/g,"");h=h.replace(/^\s*(\/\/\s*|\]\]>|-->|\]\]-->)\s*$/g,"");return h}j=j.replace(/]+|)>([\s\S]*?)<\/script>/g,function(l,k,h){h=f(h);if(!k){k=' type="text/javascript"'}if(h){h=""}return""+h+""});j=j.replace(/]+|)>([\s\S]*?)<\/style>/g,function(l,k,h){h=f(h);return"'+h+""})}j=j.replace(//g,"");j=j.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi,function(h,l){function k(o,n,q){var p=q;if(h.indexOf("mce_"+n)!=-1){return o}if(n=="style"){if(g._isRes(q)){return o}if(i.hex_colors){p=p.replace(/rgb\([^\)]+\)/g,function(m){return g.toHex(m)})}if(i.url_converter){p=p.replace(/url\([\'\"]?([^\)\'\"]+)\)/g,function(m,r){return"url("+g.encode(i.url_converter.call(i.url_converter_scope||g,g.decode(r),n,l))+")"})}}else{if(n!="coords"&&n!="shape"){if(i.url_converter){p=g.encode(i.url_converter.call(i.url_converter_scope||g,g.decode(q),n,l))}}}return" "+n+'="'+q+'" mce_'+n+'="'+p+'"'}h=h.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi,k);h=h.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi,k);return h.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi,k)})}return j},getOuterHTML:function(f){var g;f=this.get(f);if(!f){return null}if(f.outerHTML!==undefined){return f.outerHTML}g=(f.ownerDocument||this.doc).createElement("body");g.appendChild(f.cloneNode(true));return g.innerHTML},setOuterHTML:function(i,g,j){var f=this;return this.run(i,function(h){var l,k;h=f.get(h);j=j||h.ownerDocument||f.doc;if(a&&h.nodeType==1){h.outerHTML=g}else{k=j.createElement("body");k.innerHTML=g;l=k.lastChild;while(l){f.insertAfter(l.cloneNode(true),h);l=l.previousSibling}f.remove(h)}})},decode:function(g){var h,i,f;if(/&[^;]+;/.test(g)){h=this.doc.createElement("div");h.innerHTML=g;i=h.firstChild;f="";if(i){do{f+=i.nodeValue}while(i.nextSibling)}return f||g}return g},encode:function(f){return f?(""+f).replace(/[<>&\"]/g,function(h,g){switch(h){case"&":return"&";case'"':return""";case"<":return"<";case">":return">"}return h}):f},insertAfter:function(h,g){var f=this;g=f.get(g);return this.run(h,function(k){var j,i;j=g.parentNode;i=g.nextSibling;if(i){j.insertBefore(k,i)}else{j.appendChild(k)}return k})},isBlock:function(f){if(f.nodeType&&f.nodeType!==1){return false}f=f.nodeName||f;return/^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TR|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(f)},replace:function(i,h,f){var g=this;if(b(h,"array")){i=i.cloneNode(true)}return g.run(h,function(j){if(f){e(j.childNodes,function(k){i.appendChild(k.cloneNode(true))})}if(g.fixPsuedoLeaks&&j.nodeType===1){j.parentNode.insertBefore(i,j);g.remove(j);return i}return j.parentNode.replaceChild(i,j)})},findCommonAncestor:function(h,f){var i=h,g;while(i){g=f;while(g&&i!=g){g=g.parentNode}if(i==g){break}i=i.parentNode}if(!i&&h.ownerDocument){return h.ownerDocument.documentElement}return i},toHex:function(f){var h=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(f);function g(i){i=parseInt(i).toString(16);return i.length>1?i:"0"+i}if(h){f="#"+g(h[1])+g(h[2])+g(h[3]);return f}return f},getClasses:function(){var l=this,g=[],k,m={},n=l.settings.class_filter,j;if(l.classes){return l.classes}function o(f){e(f.imports,function(i){o(i)});e(f.cssRules||f.rules,function(i){switch(i.type||1){case 1:if(i.selectorText){e(i.selectorText.split(","),function(p){p=p.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(p)||!/\.[\w\-]+$/.test(p)){return}j=p;p=p.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(n&&!(p=n(p,j))){return}if(!m[p]){g.push({"class":p});m[p]=1}})}break;case 3:o(i.styleSheet);break}})}try{e(l.doc.styleSheets,o)}catch(h){}if(g.length>0){l.classes=g}return g},run:function(j,i,h){var g=this,k;if(g.doc&&typeof(j)==="string"){j=g.get(j)}if(!j){return false}h=h||this;if(!j.nodeType&&(j.length||j.length===0)){k=[];e(j,function(l,f){if(l){if(typeof(l)=="string"){l=g.doc.getElementById(l)}k.push(i.call(h,l,f))}});return k}return i.call(h,j)},getAttribs:function(g){var f;g=this.get(g);if(!g){return[]}if(a){f=[];if(g.nodeName=="OBJECT"){return g.attributes}g.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi,function(i,h){f.push({specified:1,nodeName:h})});return f}return g.attributes},destroy:function(g){var f=this;f.win=f.doc=f.root=null;if(!g){c.removeUnload(f.destroy)}},createRng:function(){var f=this.doc;return f.createRange?f.createRange():new c.dom.Range(this)},split:function(k,j,n){var o=this,f=o.createRng(),l,i,m;function g(q,p){q=q[p];if(q&&q[p]&&q[p].nodeType==1&&h(q[p])){o.remove(q[p])}}function h(p){p=o.getOuterHTML(p);p=p.replace(/<(img|hr|table)/gi,"-");p=p.replace(/<[^>]+>/g,"");return p.replace(/[ \t\r\n]+| | /g,"")==""}if(k&&j){f.setStartBefore(k);f.setEndBefore(j);l=f.extractContents();f=o.createRng();f.setStartAfter(j);f.setEndAfter(k);i=f.extractContents();m=k.parentNode;g(l,"lastChild");if(!h(l)){m.insertBefore(l,k)}if(n){m.replaceChild(n,j)}else{m.insertBefore(j,k)}g(i,"firstChild");if(!h(i)){m.insertBefore(i,k)}o.remove(k);return n||j}},_isRes:function(f){return/^(top|left|bottom|right|width|height)/i.test(f)||/;\s*(top|left|bottom|right|width|height)/i.test(f)}});c.DOM=new c.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(f){var h=0,c=1,e=2,d=tinymce.extend;function g(m,k){var j,l;if(m.parentNode!=k){return -1}for(l=k.firstChild,j=0;l!=m;l=l.nextSibling){j++}return j}function b(k){var j=0;while(k.previousSibling){j++;k=k.previousSibling}return j}function i(j,k){var l;if(j.nodeType==3){return j}if(k<0){return j}l=j.firstChild;while(l!=null&&k>0){--k;l=l.nextSibling}if(l!=null){return l}return j}function a(k){var j=k.doc;d(this,{dom:k,startContainer:j,startOffset:0,endContainer:j,endOffset:0,collapsed:true,commonAncestorContainer:j,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3})}d(a.prototype,{setStart:function(k,j){this._setEndPoint(true,k,j)},setEnd:function(k,j){this._setEndPoint(false,k,j)},setStartBefore:function(j){this.setStart(j.parentNode,b(j))},setStartAfter:function(j){this.setStart(j.parentNode,b(j)+1)},setEndBefore:function(j){this.setEnd(j.parentNode,b(j))},setEndAfter:function(j){this.setEnd(j.parentNode,b(j)+1)},collapse:function(k){var j=this;if(k){j.endContainer=j.startContainer;j.endOffset=j.startOffset}else{j.startContainer=j.endContainer;j.startOffset=j.endOffset}j.collapsed=true},selectNode:function(j){this.setStartBefore(j);this.setEndAfter(j)},selectNodeContents:function(j){this.setStart(j,0);this.setEnd(j,j.nodeType===1?j.childNodes.length:j.nodeValue.length)},compareBoundaryPoints:function(m,n){var l=this,p=l.startContainer,o=l.startOffset,k=l.endContainer,j=l.endOffset;if(m===0){return l._compareBoundaryPoints(p,o,p,o)}if(m===1){return l._compareBoundaryPoints(p,o,k,j)}if(m===2){return l._compareBoundaryPoints(k,j,k,j)}if(m===3){return l._compareBoundaryPoints(k,j,p,o)}},deleteContents:function(){this._traverse(e)},extractContents:function(){return this._traverse(h)},cloneContents:function(){return this._traverse(c)},insertNode:function(m){var j=this,l,k;if(m.nodeType===3||m.nodeType===4){l=j.startContainer.splitText(j.startOffset);j.startContainer.parentNode.insertBefore(m,l)}else{if(j.startContainer.childNodes.length>0){k=j.startContainer.childNodes[j.startOffset]}j.startContainer.insertBefore(m,k)}},surroundContents:function(l){var j=this,k=j.extractContents();j.insertNode(l);l.appendChild(k);j.selectNode(l)},cloneRange:function(){var j=this;return d(new a(j.dom),{startContainer:j.startContainer,startOffset:j.startOffset,endContainer:j.endContainer,endOffset:j.endOffset,collapsed:j.collapsed,commonAncestorContainer:j.commonAncestorContainer})},_isCollapsed:function(){return(this.startContainer==this.endContainer&&this.startOffset==this.endOffset)},_compareBoundaryPoints:function(m,p,k,o){var q,l,j,r,t,s;if(m==k){if(p==o){return 0}else{if(p0){l.collapse(k)}}l.collapsed=l._isCollapsed();l.commonAncestorContainer=l.dom.findCommonAncestor(l.startContainer,l.endContainer)},_traverse:function(r){var s=this,q,m=0,v=0,k,o,l,n,j,u;if(s.startContainer==s.endContainer){return s._traverseSameContainer(r)}for(q=s.endContainer,k=q.parentNode;k!=null;q=k,k=k.parentNode){if(k==s.startContainer){return s._traverseCommonStartContainer(q,r)}++m}for(q=s.startContainer,k=q.parentNode;k!=null;q=k,k=k.parentNode){if(k==s.endContainer){return s._traverseCommonEndContainer(q,r)}++v}o=v-m;l=s.startContainer;while(o>0){l=l.parentNode;o--}n=s.endContainer;while(o<0){n=n.parentNode;o++}for(j=l.parentNode,u=n.parentNode;j!=u;j=j.parentNode,u=u.parentNode){l=j;n=u}return s._traverseCommonAncestors(l,n,r)},_traverseSameContainer:function(o){var r=this,q,u,j,k,l,p,m;if(o!=e){q=r.dom.doc.createDocumentFragment()}if(r.startOffset==r.endOffset){return q}if(r.startContainer.nodeType==3){u=r.startContainer.nodeValue;j=u.substring(r.startOffset,r.endOffset);if(o!=c){r.startContainer.deleteData(r.startOffset,r.endOffset-r.startOffset);r.collapse(true)}if(o==e){return null}q.appendChild(r.dom.doc.createTextNode(j));return q}k=i(r.startContainer,r.startOffset);l=r.endOffset-r.startOffset;while(l>0){p=k.nextSibling;m=r._traverseFullySelected(k,o);if(q){q.appendChild(m)}--l;k=p}if(o!=c){r.collapse(true)}return q},_traverseCommonStartContainer:function(j,p){var s=this,r,k,l,m,q,o;if(p!=e){r=s.dom.doc.createDocumentFragment()}k=s._traverseRightBoundary(j,p);if(r){r.appendChild(k)}l=g(j,s.startContainer);m=l-s.startOffset;if(m<=0){if(p!=c){s.setEndBefore(j);s.collapse(false)}return r}k=j.previousSibling;while(m>0){q=k.previousSibling;o=s._traverseFullySelected(k,p);if(r){r.insertBefore(o,r.firstChild)}--m;k=q}if(p!=c){s.setEndBefore(j);s.collapse(false)}return r},_traverseCommonEndContainer:function(m,p){var s=this,r,o,j,k,q,l;if(p!=e){r=s.dom.doc.createDocumentFragment()}j=s._traverseLeftBoundary(m,p);if(r){r.appendChild(j)}o=g(m,s.endContainer);++o;k=s.endOffset-o;j=m.nextSibling;while(k>0){q=j.nextSibling;l=s._traverseFullySelected(j,p);if(r){r.appendChild(l)}--k;j=q}if(p!=c){s.setStartAfter(m);s.collapse(true)}return r},_traverseCommonAncestors:function(p,j,s){var w=this,l,v,o,q,r,k,u,m;if(s!=e){v=w.dom.doc.createDocumentFragment()}l=w._traverseLeftBoundary(p,s);if(v){v.appendChild(l)}o=p.parentNode;q=g(p,o);r=g(j,o);++q;k=r-q;u=p.nextSibling;while(k>0){m=u.nextSibling;l=w._traverseFullySelected(u,s);if(v){v.appendChild(l)}u=m;--k}l=w._traverseRightBoundary(j,s);if(v){v.appendChild(l)}if(s!=c){w.setStartAfter(p);w.collapse(true)}return v},_traverseRightBoundary:function(p,q){var s=this,l=i(s.endContainer,s.endOffset-1),r,o,n,j,k;var m=l!=s.endContainer;if(l==p){return s._traverseNode(l,m,false,q)}r=l.parentNode;o=s._traverseNode(r,false,false,q);while(r!=null){while(l!=null){n=l.previousSibling;j=s._traverseNode(l,m,false,q);if(q!=e){o.insertBefore(j,o.firstChild)}m=true;l=n}if(r==p){return o}l=r.previousSibling;r=r.parentNode;k=s._traverseNode(r,false,false,q);if(q!=e){k.appendChild(o)}o=k}return null},_traverseLeftBoundary:function(p,q){var s=this,m=i(s.startContainer,s.startOffset);var n=m!=s.startContainer,r,o,l,j,k;if(m==p){return s._traverseNode(m,n,true,q)}r=m.parentNode;o=s._traverseNode(r,false,true,q);while(r!=null){while(m!=null){l=m.nextSibling;j=s._traverseNode(m,n,true,q);if(q!=e){o.appendChild(j)}n=true;m=l}if(r==p){return o}m=r.nextSibling;r=r.parentNode;k=s._traverseNode(r,false,true,q);if(q!=e){k.appendChild(o)}o=k}return null},_traverseNode:function(j,o,r,s){var u=this,m,l,p,k,q;if(o){return u._traverseFullySelected(j,s)}if(j.nodeType==3){m=j.nodeValue;if(r){k=u.startOffset;l=m.substring(k);p=m.substring(0,k)}else{k=u.endOffset;l=m.substring(0,k);p=m.substring(k)}if(s!=c){j.nodeValue=p}if(s==e){return null}q=j.cloneNode(false);q.nodeValue=l;return q}if(s==e){return null}return j.cloneNode(false)},_traverseFullySelected:function(l,k){var j=this;if(k!=e){return k==c?l.cloneNode(true):l}l.parentNode.removeChild(l);return null}});f.Range=a})(tinymce.dom);(function(){function a(c){var b=this;function d(){var k=c.dom,j=c.getRng(),e=k.createRng(),g={},f={};if(j.item){e.setStartBefore(j.item(0));e.setEndAfter(j.item(0));return e}function h(q,p,o){var m,l,n;m=q.duplicate();m.collapse(p);element=m.parentElement();if(element.currentStyle.display=="block"){m=q.duplicate();l=q.duplicate();if(p){m.moveStart("character",1)}else{m.moveEnd("character",-1)}if(m.text!=l.text){m=l}m.collapse(p);element=m.parentElement()}o.parent=element;o.range=m}function i(r){var o=r.range,p,n,m,q,l=0;r.offset=0;r.parent=o.parentElement();o.pasteHTML('');m=k.get("_mce");n=r.parent.childNodes;for(p=0;p0&&(n[p].nodeType!=3||n[p-1].nodeType!=3)){l++}}q=m.previousSibling;if(q){if(q.nodeType===3){do{r.offset+=q.nodeValue.length}while((q=q.previousSibling)&&q.nodeType==3)}else{r.index++}}k.remove(m);return r}h(j,true,g);h(j,false,f);i(g);i(f);g.parent.normalize();f.parent.normalize();e.setStart(g.parent.childNodes[g.index],g.offset);e.setEnd(f.parent.childNodes[f.index],f.offset);b.addRange(e);return e}this.addRange=function(g){var j,i,h,e=c.dom.doc.body;if(g.startContainer.nodeType==1){j=e.createControlRange();j.addElement(g.startContainer.childNodes[g.startOffset]);return}function f(p){var m,n,l,o;m=p?g.startContainer:g.endContainer;n=p?g.startOffset:g.endOffset;m.nodeValue=m.nodeValue.substring(0,n)+"\uFEFF"+m.nodeValue.substring(n);l=e.createTextRange();l.moveToElementText(m.parentNode);o=l.text.indexOf("\uFEFF");m.nodeValue=m.nodeValue.replace(/\uFEFF/,"");if(p){i=o}else{h=o}}function k(n){var l,m=n?g.startContainer:g.endContainer;l=e.createTextRange();l.moveToElementText(m.parentNode);l.collapse(true);l.move("character",n?i:h);if(n){j.setEndPoint("StartToStart",l)}else{j.setEndPoint("EndToStart",l)}}j=e.createTextRange();f(true);f(false);k(true);k(false);j.select()};this.getRangeAt=function(){return d()}}tinymce.dom.TridentSelection=a})();(function(){var l=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,m=0,o=Object.prototype.toString,f=Array.prototype.splice,r=Array.prototype.push,g=Array.prototype.sort;var b=function(F,v,C,x){C=C||[];var e=v=v||document;if(v.nodeType!==1&&v.nodeType!==9){return[]}if(!F||typeof F!=="string"){return C}var D=[],E,A,I,H,B,u,t=true,y=c(v);l.lastIndex=0;while((E=l.exec(F))!==null){D.push(E[1]);if(E[2]){u=RegExp.rightContext;break}}if(D.length>1&&h.exec(F)){if(D.length===2&&i.relative[D[0]]){A=p(D[0]+D[1],v)}else{A=i.relative[D[0]]?[v]:b(D.shift(),v);while(D.length){F=D.shift();if(i.relative[F]){F+=D.shift()}A=p(F,A)}}}else{if(!x&&D.length>1&&v.nodeType===9&&!y&&i.match.ID.test(D[0])&&!i.match.ID.test(D[D.length-1])){var J=b.find(D.shift(),v,y);v=J.expr?b.filter(J.expr,J.set)[0]:J.set[0]}if(v){var J=x?{expr:D.pop(),set:k(x)}:b.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&v.parentNode?v.parentNode:v,y);A=J.expr?b.filter(J.expr,J.set):J.set;if(D.length>0){I=k(A)}else{t=false}while(D.length){var w=D.pop(),z=w;if(!i.relative[w]){w=""}else{z=D.pop()}if(z==null){z=v}i.relative[w](I,z,y)}}else{I=D=[]}}if(!I){I=A}if(!I){throw"Syntax error, unrecognized expression: "+(w||F)}if(o.call(I)==="[object Array]"){if(!t){r.apply(C,I)}else{if(v&&v.nodeType===1){for(var G=0;I[G]!=null;G++){if(I[G]&&(I[G]===true||I[G].nodeType===1&&j(v,I[G]))){r.call(C,A[G])}}}else{for(var G=0;I[G]!=null;G++){if(I[G]&&I[G].nodeType===1){r.call(C,A[G])}}}}}else{k(I,C)}if(u){b(u,e,C,x);b.uniqueSort(C)}return C};b.uniqueSort=function(t){if(n){hasDuplicate=false;g.call(t,n);if(hasDuplicate){for(var e=1;e":function(y,t,z){var w=typeof t==="string";if(w&&!/\W/.test(t)){t=z?t:t.toUpperCase();for(var u=0,e=y.length;u=0)){if(!u){e.push(x)}}else{if(u){t[w]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(t,e){for(var u=0;e[u]===false;u++){}return e[u]&&c(e[u])?t[1]:t[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var t=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(t[1]+(t[2]||1))-0;e[3]=t[3]-0}e[0]=m++;return e},ATTR:function(w,t,u,e,x,y){var v=w[1].replace(/\\/g,"");if(!y&&i.attrMap[v]){w[1]=i.attrMap[v]}if(w[2]==="~="){w[4]=" "+w[4]+" "}return w},PSEUDO:function(w,t,u,e,x){if(w[1]==="not"){if(w[3].match(l).length>1||/^\w/.test(w[3])){w[3]=b(w[3],null,null,t)}else{var v=b.filter(w[3],t,u,true^x);if(!u){e.push.apply(e,v)}return false}}else{if(i.match.POS.test(w[0])||i.match.CHILD.test(w[0])){return true}}return w},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(u,t,e){return !!b(e[3],u).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(t,e){return e===0},last:function(u,t,e,v){return t===v.length-1},even:function(t,e){return e%2===0},odd:function(t,e){return e%2===1},lt:function(u,t,e){return te[3]-0},nth:function(u,t,e){return e[3]-0==t},eq:function(u,t,e){return e[3]-0==t}},filter:{PSEUDO:function(y,u,v,z){var t=u[1],w=i.filters[t];if(w){return w(y,v,u,z)}else{if(t==="contains"){return(y.textContent||y.innerText||"").indexOf(u[3])>=0}else{if(t==="not"){var x=u[3];for(var v=0,e=x.length;v=0)}}},ID:function(t,e){return t.nodeType===1&&t.getAttribute("id")===e},TAG:function(t,e){return(e==="*"&&t.nodeType===1)||t.nodeName===e},CLASS:function(t,e){return(" "+(t.className||t.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(x,v){var u=v[1],e=i.attrHandle[u]?i.attrHandle[u](x):x[u]!=null?x[u]:x.getAttribute(u),y=e+"",w=v[2],t=v[4];return e==null?w==="!=":w==="="?y===t:w==="*="?y.indexOf(t)>=0:w==="~="?(" "+y+" ").indexOf(t)>=0:!t?y&&e!==false:w==="!="?y!=t:w==="^="?y.indexOf(t)===0:w==="$="?y.substr(y.length-t.length)===t:w==="|="?y===t||y.substr(0,t.length+1)===t+"-":false},POS:function(w,t,u,x){var e=t[2],v=i.setFilters[e];if(v){return v(w,u,t,x)}}}};var h=i.match.POS;for(var d in i.match){i.match[d]=new RegExp(i.match[d].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var k=function(t,e){t=Array.prototype.slice.call(t);if(e){r.apply(e,t);return e}return t};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(s){k=function(w,v){var t=v||[];if(o.call(w)==="[object Array]"){Array.prototype.push.apply(t,w)}else{if(typeof w.length==="number"){for(var u=0,e=w.length;u";var e=document.documentElement;e.insertBefore(t,e.firstChild);if(!!document.getElementById(u)){i.find.ID=function(w,x,y){if(typeof x.getElementById!=="undefined"&&!y){var v=x.getElementById(w[1]);return v?v.id===w[1]||typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id").nodeValue===w[1]?[v]:undefined:[]}};i.filter.ID=function(x,v){var w=typeof x.getAttributeNode!=="undefined"&&x.getAttributeNode("id");return x.nodeType===1&&w&&w.nodeValue===v}}e.removeChild(t)})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){i.find.TAG=function(t,x){var w=x.getElementsByTagName(t[1]);if(t[1]==="*"){var v=[];for(var u=0;w[u];u++){if(w[u].nodeType===1){v.push(w[u])}}w=v}return w}}e.innerHTML="";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){i.attrHandle.href=function(t){return t.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var e=b,u=document.createElement("div");u.innerHTML="

    ";if(u.querySelectorAll&&u.querySelectorAll(".TEST").length===0){return}b=function(y,x,v,w){x=x||document;if(!w&&x.nodeType===9&&!c(x)){try{return k(x.querySelectorAll(y),v)}catch(z){}}return e(y,x,v,w)};for(var t in e){b[t]=e[t]}})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="
    ";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}i.order.splice(1,0,"CLASS");i.find.CLASS=function(t,u,v){if(typeof u.getElementsByClassName!=="undefined"&&!v){return u.getElementsByClassName(t[1])}}})()}function a(t,y,x,C,z,B){var A=t=="previousSibling"&&!B;for(var v=0,u=C.length;v0){w=e;break}}}e=e[t]}C[v]=w}}}var j=document.compareDocumentPosition?function(t,e){return t.compareDocumentPosition(e)&16}:function(t,e){return t!==e&&(t.contains?t.contains(e):true)};var c=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var p=function(e,z){var v=[],w="",x,u=z.nodeType?[z]:z;while((x=i.match.PSEUDO.exec(e))){w+=x[0];e=e.replace(i.match.PSEUDO,"")}e=i.relative[e]?e+"*":e;for(var y=0,t=u.length;y=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},_unload:function(){var g=a;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(){var g=a;if(g.domLoaded){return}g._remove(window,"DOMContentLoaded",g._pageInit);g.domLoaded=true;f(g.inits,function(h){h()});g.inits=[]},_wait:function(){var g;if(window.tinyMCE_GZ&&tinyMCE_GZ.loaded){a.domLoaded=1;return}if(b&&document.location.protocol!="https:"){document.write(" - -
    -
    {#paste.paste_text_desc}
    + + +
    {#paste.paste_text_desc}
    -
    - -
    +
    + +
    -
    +
    -
    {#paste_dlg.text_title}
    +
    {#paste_dlg.text_title}
    - + -
    -
    - -
    +
    +
    + +
    -
    - +
    + +
    -
    - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm 8 May 2009 18:18:34 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm 12 Jul 2009 01:12:28 -0000 1.3 @@ -4,10 +4,9 @@ {#paste.paste_word_desc} - - -
    + +
    {#paste.paste_word_desc}
    {#paste_dlg.word_title}
    @@ -16,7 +15,7 @@
    - +
    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js 12 Jul 2009 01:12:28 -0000 1.2 @@ -1,42 +1,36 @@ tinyMCEPopup.requireLangPack(); -function saveContent() { - if (document.forms[0].htmlSource.value == '') { - tinyMCEPopup.close(); - return false; - } +var PasteTextDialog = { + init : function() { + this.resize(); + }, - tinyMCEPopup.execCommand('mcePasteText', false, { - html : document.forms[0].htmlSource.value, - linebreaks : document.forms[0].linebreaks.checked - }); + insert : function() { + var h = tinyMCEPopup.dom.encode(document.getElementById('content').value), lines; - tinyMCEPopup.close(); -} + // Convert linebreaks into paragraphs + if (document.getElementById('linebreaks').checked) { + lines = h.split(/\r?\n/); + if (lines.length > 1) { + h = ''; + tinymce.each(lines, function(row) { + h += '

    ' + row + '

    '; + }); + } + } -function onLoadInit() { - tinyMCEPopup.resizeToInnerSize(); + tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h); + tinyMCEPopup.close(); + }, - // Remove Gecko spellchecking - if (tinymce.isGecko) - document.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck"); + resize : function() { + var vp = tinyMCEPopup.dom.getViewPort(window), el; - resizeInputs(); -} + el = document.getElementById('content'); -var wHeight=0, wWidth=0, owHeight=0, owWidth=0; - -function resizeInputs() { - if (!tinymce.isIE) { - wHeight = self.innerHeight-80; - wWidth = self.innerWidth-17; - } else { - wHeight = document.body.clientHeight-80; - wWidth = document.body.clientWidth-17; + el.style.width = (vp.w - 20) + 'px'; + el.style.height = (vp.h - 90) + 'px'; } +}; - document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px'; - document.forms[0].htmlSource.style.width = Math.abs(wWidth) + 'px'; -} - -tinyMCEPopup.onInit.add(onLoadInit); \ No newline at end of file +tinyMCEPopup.onInit.add(PasteTextDialog.init, PasteTextDialog); Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js 12 Jul 2009 01:12:28 -0000 1.2 @@ -1,56 +1,51 @@ tinyMCEPopup.requireLangPack(); -function saveContent() { - var html = document.getElementById("frmData").contentWindow.document.body.innerHTML; +var PasteWordDialog = { + init : function() { + var ed = tinyMCEPopup.editor, el = document.getElementById('iframecontainer'), ifr, doc, css, cssHTML = ''; - if (html == ''){ - tinyMCEPopup.close(); - return false; - } + // Create iframe + el.innerHTML = ''; + ifr = document.getElementById('iframe'); + doc = ifr.contentWindow.document; - tinyMCEPopup.execCommand('mcePasteWord', false, html); - tinyMCEPopup.close(); -} + // Force absolute CSS urls + css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")]; + css = css.concat(tinymce.explode(ed.settings.content_css) || []); + tinymce.each(css, function(u) { + cssHTML += ''; + }); -function onLoadInit() { - tinyMCEPopup.resizeToInnerSize(); + // Write content into iframe + doc.open(); + doc.write('' + cssHTML + ''); + doc.close(); - // Fix for endless reloading in FF - window.setTimeout(createIFrame, 10); -} + doc.designMode = 'on'; + this.resize(); -function createIFrame() { - document.getElementById('iframecontainer').innerHTML = ''; -} + window.setTimeout(function() { + ifr.contentWindow.focus(); + }, 10); + }, -var wHeight=0, wWidth=0, owHeight=0, owWidth=0; + insert : function() { + var h = document.getElementById('iframe').contentWindow.document.body.innerHTML; -function initIframe(doc) { - var dir = tinyMCEPopup.editor.settings.directionality; + tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h); + tinyMCEPopup.close(); + }, - doc.body.dir = dir; + resize : function() { + var vp = tinyMCEPopup.dom.getViewPort(window), el; - // Remove Gecko spellchecking - if (tinymce.isGecko) - doc.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck"); + el = document.getElementById('iframe'); - resizeInputs(); -} - -function resizeInputs() { - if (!tinymce.isIE) { - wHeight = self.innerHeight - 80; - wWidth = self.innerWidth - 18; - } else { - wHeight = document.body.clientHeight - 80; - wWidth = document.body.clientWidth - 18; + if (el) { + el.style.width = (vp.w - 20) + 'px'; + el.style.height = (vp.h - 90) + 'px'; + } } +}; - var elm = document.getElementById('frmData'); - if (elm) { - elm.style.height = Math.abs(wHeight) + 'px'; - elm.style.width = Math.abs(wWidth) + 'px'; - } -} - -tinyMCEPopup.onInit.add(onLoadInit); +tinyMCEPopup.onInit.add(PasteWordDialog.init, PasteWordDialog); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/paste/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js 12 Jul 2009 01:12:28 -0000 1.2 @@ -1 +1 @@ -(function(){var a=tinymce.dom.Event,c=tinymce.grep,d=tinymce.each,b=tinymce.inArray;function e(j,i,h){var g,k;g=j.createTreeWalker(i,NodeFilter.SHOW_ALL,null,false);while(k=g.nextNode()){if(h){if(!h(k)){return false}}if(k.nodeType==3&&k.nodeValue&&/[^\s\u00a0]+/.test(k.nodeValue)){return false}if(k.nodeType==1&&/^(HR|IMG|TABLE)$/.test(k.nodeName)){return false}}return true}tinymce.create("tinymce.plugins.Safari",{init:function(f){var g=this,h;if(!tinymce.isWebKit){return}g.editor=f;g.webKitFontSizes=["x-small","small","medium","large","x-large","xx-large","-webkit-xxx-large"];g.namedFontSizes=["xx-small","x-small","small","medium","large","x-large","xx-large"];f.addCommand("CreateLink",function(k,j){var m=f.selection.getNode(),l=f.dom,i;if(m&&(/^(left|right)$/i.test(l.getStyle(m,"float",1))||/^(left|right)$/i.test(l.getAttrib(m,"align")))){i=l.create("a",{href:j},m.cloneNode());m.parentNode.replaceChild(i,m);f.selection.select(i)}else{f.getDoc().execCommand("CreateLink",false,j)}});f.onPaste.add(function(i,k){function j(l){l=l.target;if(l.nodeType==1){l.style.cssText="";d(i.dom.select("*",l),function(m){m.style.cssText=""})}}a.add(i.getDoc(),"DOMNodeInserted",j);window.setTimeout(function(){a.remove(i.getDoc(),"DOMNodeInserted",j)},0)});f.onKeyUp.add(function(j,o){var l,i,m,p,k;if(o.keyCode==46||o.keyCode==8){i=j.getBody();l=i.innerHTML;k=j.selection;if(i.childNodes.length==1&&!/<(img|hr)/.test(l)&&tinymce.trim(l.replace(/<[^>]+>/g,"")).length==0){j.setContent('


    ',{format:"raw"});p=i.firstChild;m=k.getRng();m.setStart(p,0);m.setEnd(p,0);k.setRng(m)}}});f.addCommand("FormatBlock",function(j,i){var l=f.dom,k=l.getParent(f.selection.getNode(),l.isBlock);if(k){l.replace(l.create(i),k,1)}else{f.getDoc().execCommand("FormatBlock",false,i)}});f.addCommand("mceInsertContent",function(j,i){f.getDoc().execCommand("InsertText",false,"mce_marker");f.getBody().innerHTML=f.getBody().innerHTML.replace(/mce_marker/g,f.dom.processHTML(i)+'XX');f.selection.select(f.dom.get("_mce_tmp"));f.getDoc().execCommand("Delete",false," ")});f.onKeyPress.add(function(o,p){var q,v,r,l,j,k,i,u,m,t,s;if(p.keyCode==13){i=o.selection;q=i.getNode();if(p.shiftKey||o.settings.force_br_newlines&&q.nodeName!="LI"){g._insertBR(o);a.cancel(p)}if(v=h.getParent(q,"LI")){r=h.getParent(v,"OL,UL");u=o.getDoc();s=h.create("p");h.add(s,"br",{mce_bogus:"1"});if(e(u,v)){if(k=h.getParent(r.parentNode,"LI,OL,UL")){return}k=h.getParent(r,"p,h1,h2,h3,h4,h5,h6,div")||r;l=u.createRange();l.setStartBefore(k);l.setEndBefore(v);j=u.createRange();j.setStartAfter(v);j.setEndAfter(k);m=l.cloneContents();t=j.cloneContents();if(!e(u,t)){h.insertAfter(t,k)}h.insertAfter(s,k);if(!e(u,m)){h.insertAfter(m,k)}h.remove(k);k=s.firstChild;l=u.createRange();l.setStartBefore(k);l.setEndBefore(k);i.setRng(l);return a.cancel(p)}}}});f.onExecCommand.add(function(i,k){var j,m,n,l;if(k=="InsertUnorderedList"||k=="InsertOrderedList"){j=i.selection;m=i.dom;if(n=m.getParent(j.getNode(),function(o){return/^(H[1-6]|P|ADDRESS|PRE)$/.test(o.nodeName)})){l=j.getBookmark();m.remove(n,1);j.moveToBookmark(l)}}});f.onClick.add(function(i,j){j=j.target;if(j.nodeName=="IMG"){g.selElm=j;i.selection.select(j)}else{g.selElm=null}});f.onInit.add(function(){g._fixWebKitSpans()});f.onSetContent.add(function(){h=f.dom;d(["strong","b","em","u","strike","sub","sup","a"],function(i){d(c(h.select(i)).reverse(),function(l){var k=l.nodeName.toLowerCase(),j;if(k=="a"){if(l.name){h.replace(h.create("img",{mce_name:"a",name:l.name,"class":"mceItemAnchor"}),l)}return}switch(k){case"b":case"strong":if(k=="b"){k="strong"}j="font-weight: bold;";break;case"em":j="font-style: italic;";break;case"u":j="text-decoration: underline;";break;case"sub":j="vertical-align: sub;";break;case"sup":j="vertical-align: super;";break;case"strike":j="text-decoration: line-through;";break}h.replace(h.create("span",{mce_name:k,style:j,"class":"Apple-style-span"}),l,1)})})});f.onPreProcess.add(function(i,j){h=i.dom;d(c(j.node.getElementsByTagName("span")).reverse(),function(m){var k,l;if(j.get){if(h.hasClass(m,"Apple-style-span")){l=m.style.backgroundColor;switch(h.getAttrib(m,"mce_name")){case"font":if(!i.settings.convert_fonts_to_spans){h.setAttrib(m,"style","")}break;case"strong":case"em":case"sub":case"sup":h.setAttrib(m,"style","");break;case"strike":case"u":if(!i.settings.inline_styles){h.setAttrib(m,"style","")}else{h.setAttrib(m,"mce_name","")}break;default:if(!i.settings.inline_styles){h.setAttrib(m,"style","")}}if(l){m.style.backgroundColor=l}}}if(h.hasClass(m,"mceItemRemoved")){h.remove(m,1)}})});f.onPostProcess.add(function(i,j){j.content=j.content.replace(/
    <\/(h[1-6]|div|p|address|pre)>/g,"");j.content=j.content.replace(/ id=\"undefined\"/g,"")})},getInfo:function(){return{longname:"Safari compatibility",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_fixWebKitSpans:function(){var g=this,f=g.editor;a.add(f.getDoc(),"DOMNodeInserted",function(h){h=h.target;if(h&&h.nodeType==1){g._fixAppleSpan(h)}})},_fixAppleSpan:function(l){var g=this.editor,m=g.dom,i=this.webKitFontSizes,f=this.namedFontSizes,j=g.settings,h,k;if(m.getAttrib(l,"mce_fixed")){return}if(l.nodeName=="SPAN"&&l.className=="Apple-style-span"){h=l.style;if(!j.convert_fonts_to_spans){if(h.fontSize){m.setAttrib(l,"mce_name","font");m.setAttrib(l,"size",b(i,h.fontSize)+1)}if(h.fontFamily){m.setAttrib(l,"mce_name","font");m.setAttrib(l,"face",h.fontFamily)}if(h.color){m.setAttrib(l,"mce_name","font");m.setAttrib(l,"color",m.toHex(h.color))}if(h.backgroundColor){m.setAttrib(l,"mce_name","font");m.setStyle(l,"background-color",h.backgroundColor)}}else{if(h.fontSize){m.setStyle(l,"fontSize",f[b(i,h.fontSize)])}}if(h.fontWeight=="bold"){m.setAttrib(l,"mce_name","strong")}if(h.fontStyle=="italic"){m.setAttrib(l,"mce_name","em")}if(h.textDecoration=="underline"){m.setAttrib(l,"mce_name","u")}if(h.textDecoration=="line-through"){m.setAttrib(l,"mce_name","strike")}if(h.verticalAlign=="super"){m.setAttrib(l,"mce_name","sup")}if(h.verticalAlign=="sub"){m.setAttrib(l,"mce_name","sub")}m.setAttrib(l,"mce_fixed","1")}},_insertBR:function(f){var j=f.dom,h=f.selection,i=h.getRng(),g;i.insertNode(g=j.create("br"));i.setStartAfter(g);i.setEndAfter(g);h.setRng(i);if(h.getSel().focusNode==g.previousSibling){h.select(j.insertAfter(j.doc.createTextNode("\u00a0"),g));h.collapse(1)}f.getWin().scrollTo(0,j.getPos(h.getRng().startContainer).y)}});tinymce.PluginManager.add("safari",tinymce.plugins.Safari)})(); \ No newline at end of file +(function(){var a=tinymce.dom.Event,c=tinymce.grep,d=tinymce.each,b=tinymce.inArray;function e(j,i,h){var g,k;g=j.createTreeWalker(i,NodeFilter.SHOW_ALL,null,false);while(k=g.nextNode()){if(h){if(!h(k)){return false}}if(k.nodeType==3&&k.nodeValue&&/[^\s\u00a0]+/.test(k.nodeValue)){return false}if(k.nodeType==1&&/^(HR|IMG|TABLE)$/.test(k.nodeName)){return false}}return true}tinymce.create("tinymce.plugins.Safari",{init:function(f){var g=this,h;if(!tinymce.isWebKit){return}g.editor=f;g.webKitFontSizes=["x-small","small","medium","large","x-large","xx-large","-webkit-xxx-large"];g.namedFontSizes=["xx-small","x-small","small","medium","large","x-large","xx-large"];f.addCommand("CreateLink",function(k,j){var m=f.selection.getNode(),l=f.dom,i;if(m&&(/^(left|right)$/i.test(l.getStyle(m,"float",1))||/^(left|right)$/i.test(l.getAttrib(m,"align")))){i=l.create("a",{href:j},m.cloneNode());m.parentNode.replaceChild(i,m);f.selection.select(i)}else{f.getDoc().execCommand("CreateLink",false,j)}});f.onKeyUp.add(function(j,o){var l,i,m,p,k;if(o.keyCode==46||o.keyCode==8){i=j.getBody();l=i.innerHTML;k=j.selection;if(i.childNodes.length==1&&!/<(img|hr)/.test(l)&&tinymce.trim(l.replace(/<[^>]+>/g,"")).length==0){j.setContent('


    ',{format:"raw"});p=i.firstChild;m=k.getRng();m.setStart(p,0);m.setEnd(p,0);k.setRng(m)}}});f.addCommand("FormatBlock",function(j,i){var l=f.dom,k=l.getParent(f.selection.getNode(),l.isBlock);if(k){l.replace(l.create(i),k,1)}else{f.getDoc().execCommand("FormatBlock",false,i)}});f.addCommand("mceInsertContent",function(j,i){f.getDoc().execCommand("InsertText",false,"mce_marker");f.getBody().innerHTML=f.getBody().innerHTML.replace(/mce_marker/g,f.dom.processHTML(i)+'XX');f.selection.select(f.dom.get("_mce_tmp"));f.getDoc().execCommand("Delete",false," ")});f.onKeyPress.add(function(o,p){var q,v,r,l,j,k,i,u,m,t,s;if(p.keyCode==13){i=o.selection;q=i.getNode();if(p.shiftKey||o.settings.force_br_newlines&&q.nodeName!="LI"){g._insertBR(o);a.cancel(p)}if(v=h.getParent(q,"LI")){r=h.getParent(v,"OL,UL");u=o.getDoc();s=h.create("p");h.add(s,"br",{mce_bogus:"1"});if(e(u,v)){if(k=h.getParent(r.parentNode,"LI,OL,UL")){return}k=h.getParent(r,"p,h1,h2,h3,h4,h5,h6,div")||r;l=u.createRange();l.setStartBefore(k);l.setEndBefore(v);j=u.createRange();j.setStartAfter(v);j.setEndAfter(k);m=l.cloneContents();t=j.cloneContents();if(!e(u,t)){h.insertAfter(t,k)}h.insertAfter(s,k);if(!e(u,m)){h.insertAfter(m,k)}h.remove(k);k=s.firstChild;l=u.createRange();l.setStartBefore(k);l.setEndBefore(k);i.setRng(l);return a.cancel(p)}}}});f.onExecCommand.add(function(i,k){var j,m,n,l;if(k=="InsertUnorderedList"||k=="InsertOrderedList"){j=i.selection;m=i.dom;if(n=m.getParent(j.getNode(),function(o){return/^(H[1-6]|P|ADDRESS|PRE)$/.test(o.nodeName)})){l=j.getBookmark();m.remove(n,1);j.moveToBookmark(l)}}});f.onClick.add(function(i,j){j=j.target;if(j.nodeName=="IMG"){g.selElm=j;i.selection.select(j)}else{g.selElm=null}});f.onInit.add(function(){g._fixWebKitSpans()});f.onSetContent.add(function(){h=f.dom;d(["strong","b","em","u","strike","sub","sup","a"],function(i){d(c(h.select(i)).reverse(),function(l){var k=l.nodeName.toLowerCase(),j;if(k=="a"){if(l.name){h.replace(h.create("img",{mce_name:"a",name:l.name,"class":"mceItemAnchor"}),l)}return}switch(k){case"b":case"strong":if(k=="b"){k="strong"}j="font-weight: bold;";break;case"em":j="font-style: italic;";break;case"u":j="text-decoration: underline;";break;case"sub":j="vertical-align: sub;";break;case"sup":j="vertical-align: super;";break;case"strike":j="text-decoration: line-through;";break}h.replace(h.create("span",{mce_name:k,style:j,"class":"Apple-style-span"}),l,1)})})});f.onPreProcess.add(function(i,j){h=i.dom;d(c(j.node.getElementsByTagName("span")).reverse(),function(m){var k,l;if(j.get){if(h.hasClass(m,"Apple-style-span")){l=m.style.backgroundColor;switch(h.getAttrib(m,"mce_name")){case"font":if(!i.settings.convert_fonts_to_spans){h.setAttrib(m,"style","")}break;case"strong":case"em":case"sub":case"sup":h.setAttrib(m,"style","");break;case"strike":case"u":if(!i.settings.inline_styles){h.setAttrib(m,"style","")}else{h.setAttrib(m,"mce_name","")}break;default:if(!i.settings.inline_styles){h.setAttrib(m,"style","")}}if(l){m.style.backgroundColor=l}}}if(h.hasClass(m,"mceItemRemoved")){h.remove(m,1)}})});f.onPostProcess.add(function(i,j){j.content=j.content.replace(/
    <\/(h[1-6]|div|p|address|pre)>/g,"");j.content=j.content.replace(/ id=\"undefined\"/g,"")})},getInfo:function(){return{longname:"Safari compatibility",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_fixWebKitSpans:function(){var g=this,f=g.editor;a.add(f.getDoc(),"DOMNodeInserted",function(h){h=h.target;if(h&&h.nodeType==1){g._fixAppleSpan(h)}})},_fixAppleSpan:function(l){var g=this.editor,m=g.dom,i=this.webKitFontSizes,f=this.namedFontSizes,j=g.settings,h,k;if(m.getAttrib(l,"mce_fixed")){return}if(l.nodeName=="SPAN"&&l.className=="Apple-style-span"){h=l.style;if(!j.convert_fonts_to_spans){if(h.fontSize){m.setAttrib(l,"mce_name","font");m.setAttrib(l,"size",b(i,h.fontSize)+1)}if(h.fontFamily){m.setAttrib(l,"mce_name","font");m.setAttrib(l,"face",h.fontFamily)}if(h.color){m.setAttrib(l,"mce_name","font");m.setAttrib(l,"color",m.toHex(h.color))}if(h.backgroundColor){m.setAttrib(l,"mce_name","font");m.setStyle(l,"background-color",h.backgroundColor)}}else{if(h.fontSize){m.setStyle(l,"fontSize",f[b(i,h.fontSize)])}}if(h.fontWeight=="bold"){m.setAttrib(l,"mce_name","strong")}if(h.fontStyle=="italic"){m.setAttrib(l,"mce_name","em")}if(h.textDecoration=="underline"){m.setAttrib(l,"mce_name","u")}if(h.textDecoration=="line-through"){m.setAttrib(l,"mce_name","strike")}if(h.verticalAlign=="super"){m.setAttrib(l,"mce_name","sup")}if(h.verticalAlign=="sub"){m.setAttrib(l,"mce_name","sub")}m.setAttrib(l,"mce_fixed","1")}},_insertBR:function(f){var j=f.dom,h=f.selection,i=h.getRng(),g;i.insertNode(g=j.create("br"));i.setStartAfter(g);i.setEndAfter(g);h.setRng(i);if(h.getSel().focusNode==g.previousSibling){h.select(j.insertAfter(j.doc.createTextNode("\u00a0"),g));h.collapse(1)}f.getWin().scrollTo(0,j.getPos(h.getRng().startContainer).y)}});tinymce.PluginManager.add("safari",tinymce.plugins.Safari)})(); \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js 12 Jul 2009 01:12:28 -0000 1.2 @@ -55,6 +55,8 @@ ed.getDoc().execCommand("CreateLink", false, v); }); +/* + // WebKit generates spans out of thin air this patch used to remove them but it will also remove styles we want so it's disabled for now ed.onPaste.add(function(ed, e) { function removeStyles(e) { e = e.target; @@ -74,7 +76,7 @@ Event.remove(ed.getDoc(), 'DOMNodeInserted', removeStyles); }, 0); }); - +*/ ed.onKeyUp.add(function(ed, e) { var h, b, r, n, s; @@ -116,6 +118,14 @@ ed.selection.select(ed.dom.get('_mce_tmp')); ed.getDoc().execCommand("Delete", false, ' '); }); + + /* ed.onKeyDown.add(function(ed, e) { + // Ctrl+A select all will fail on WebKit since if you paste the contents you selected it will produce a odd div wrapper + if ((e.ctrlKey || e.metaKey) && e.keyCode == 65) { + ed.selection.select(ed.getBody(), 1); + return Event.cancel(e); + } + });*/ ed.onKeyPress.add(function(ed, e) { var se, li, lic, r1, r2, n, sel, doc, be, af, pa; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/js/props.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/js/props.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/js/props.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/js/props.js 12 Jul 2009 01:12:28 -0000 1.2 @@ -10,9 +10,9 @@ "Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif"; var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger"; -var defaultMeasurement = "+pixels=px;points=pt;em;in;cm;mm;picas;ems;exs;%"; -var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%"; -var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%"; +var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%"; +var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%"; +var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%"; var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900"; var defaultTextStyle = "normal;italic;oblique"; var defaultVariant = "normal;small-caps"; @@ -247,12 +247,12 @@ } function getMeasurement(s) { - return s.replace(/^([0-9]+)(.*)$/, "$2"); + return s.replace(/^([0-9.]+)(.*)$/, "$2"); } function getNum(s) { - if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s)) - return s.replace(/[^0-9]/g, ''); + if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s)) + return s.replace(/[^0-9.]/g, ''); return s; } @@ -478,7 +478,7 @@ ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : ""); ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : ""); } else - ce.style.borderWidth = f.border_width_top.value; + ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : ""); if (!f.border_color_same.checked) { ce.style.borderTopColor = f.border_color_top.value; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/style/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js 12 Jul 2009 01:12:29 -0000 1.2 @@ -1 +1 @@ -(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.EditorManager.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",tinyMCE.activeEditor.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})(); \ No newline at end of file +(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.EditorManager.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})(); \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js 12 Jul 2009 01:12:29 -0000 1.2 @@ -87,7 +87,7 @@ ed.onKeyDown.add(tabHandler); ed.onInit.add(function() { - each(DOM.select('a:first,a:last', tinyMCE.activeEditor.getContainer()), function(n) { + each(DOM.select('a:first,a:last', ed.getContainer()), function(n) { Event.add(n, 'focus', function() {ed.focus();}); }); }); Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/js/table.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/js/table.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/js/table.js 8 May 2009 17:38:39 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/js/table.js 12 Jul 2009 01:12:29 -0000 1.2 @@ -156,6 +156,10 @@ if (style) style += '; '; + // Force px + if (/^[0-9\.]+$/.test(width)) + width += 'px'; + style += 'width: ' + width; } else html += makeAttrib('width', width); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/table/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/template/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/bg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ca.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/da.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/de.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/el.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/es.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/et.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/fa.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/fi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/fr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/gl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/hr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/hu.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/is.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/it.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ja.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ko.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/lt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/lv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ms.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/nl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/nn.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/no.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/pl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/pt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ro.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ru.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/si.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/sr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/sv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/th.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/tr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/uk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/zh.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,23 +1,23 @@ - {#advanced_dlg.about_title} + {#openacs_dlg.about_title}
    -

    {#advanced_dlg.about_title}

    +

    {#openacs_dlg.about_title}

    Version: ()

    TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.

    @@ -33,7 +33,7 @@
    -

    {#advanced_dlg.about_loaded}

    +

    {#openacs_dlg.about_loaded}

    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,18 +1,18 @@ - {#advanced_dlg.anchor_title} + {#openacs_dlg.anchor_title} - + - +
    {#advanced_dlg.anchor_title}{#openacs_dlg.anchor_title}
    {#advanced_dlg.anchor_name}:{#openacs_dlg.anchor_name}:
    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,15 +1,15 @@ - {#advanced_dlg.charmap_title} + {#openacs_dlg.charmap_title} - +
    {#advanced_dlg.charmap_title}{#openacs_dlg.charmap_title}
    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,7 +1,7 @@ - {#advanced_dlg.colorpicker_title} + {#openacs_dlg.colorpicker_title} @@ -10,16 +10,16 @@
    - {#advanced_dlg.colorpicker_picker_title} + {#openacs_dlg.colorpicker_picker_title}
     @@ -34,7 +34,7 @@
    - {#advanced_dlg.colorpicker_palette_title} + {#openacs_dlg.colorpicker_palette_title}
    @@ -45,15 +45,15 @@
    - {#advanced_dlg.colorpicker_named_title} + {#openacs_dlg.colorpicker_named_title}

    - {#advanced_dlg.colorpicker_name} + {#openacs_dlg.colorpicker_name}
    @@ -67,7 +67,7 @@
    - +
    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template.js,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template.js 8 May 2009 17:34:11 -0000 1.3 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template.js 12 Jul 2009 01:12:30 -0000 1.4 @@ -68,7 +68,7 @@ theme_openacs_path : true, theme_openacs_toolbar_location : 'bottom', theme_openacs_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect", - theme_openacs_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code", + theme_openacs_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,cleanup,help,code", theme_openacs_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap", theme_openacs_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6", theme_openacs_toolbar_align : "center", Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template_src.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template_src.js,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template_src.js 8 May 2009 17:34:11 -0000 1.3 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/editor_template_src.js 12 Jul 2009 01:12:30 -0000 1.4 @@ -68,7 +68,7 @@ theme_openacs_path : true, theme_openacs_toolbar_location : 'bottom', theme_openacs_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect", - theme_openacs_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code", + theme_openacs_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,cleanup,help,code", theme_openacs_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap", theme_openacs_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6", theme_openacs_toolbar_align : "center", Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,7 +1,7 @@ - {#advanced_dlg.image_title} + {#openacs_dlg.image_title} @@ -11,15 +11,15 @@
    - + - + - + - + - + - + - + - +
    @@ -28,43 +28,43 @@
    x
    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,7 +1,7 @@ - {#advanced_dlg.link_title} + {#openacs_dlg.link_title} @@ -12,7 +12,7 @@ @@ -21,7 +21,7 @@ - + - + - + - + Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm 12 Jul 2009 01:12:30 -0000 1.3 @@ -1,16 +1,16 @@ - {#advanced_dlg.code_title} + {#openacs_dlg.code_title} -
    {#advanced_dlg.code_title}
    +
    {#openacs_dlg.code_title}
    - +

    Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js 8 May 2009 17:53:05 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js 12 Jul 2009 01:12:31 -0000 1.2 @@ -16,9 +16,9 @@ html += '
    @@ -30,15 +30,15 @@
    '; html += ''; html += ''; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; + html += ''; html += ''; html += ''; html += ''; Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js 8 May 2009 17:53:05 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js 12 Jul 2009 01:12:31 -0000 1.2 @@ -90,10 +90,10 @@ }, checkPrefix : function(n) { - if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email'))) + if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('openacs_dlg.link_is_email'))) n.value = 'mailto:' + n.value; - if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external'))) + if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('openacs_dlg.link_is_external'))) n.value = 'http://' + n.value; }, @@ -140,8 +140,8 @@ var dom = tinyMCEPopup.dom, lst = dom.get(id), v; lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), ''); - lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self'); - lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank'); + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('openacs_dlg.link_target_same'), '_self'); + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('openacs_dlg.link_target_blank'), '_blank'); if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) { tinymce.each(v.split(','), function(v) { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/bg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/bg_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ca.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ca_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/da.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/da_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/de.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/de_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/el.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/el_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/en.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/en.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/en.js 8 May 2009 17:34:11 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/en.js 12 Jul 2009 01:12:31 -0000 1.3 @@ -59,4 +59,12 @@ newdocument:"Are you sure you want clear all contents?", toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X", more_colors:"More colors" +}); +tinyMCE.addI18n('en.advanced',{ +cut_desc:"Cut", +copy_desc:"Copy", +paste_desc:"Paste", +link_desc:"Insert/edit link", +unlink_desc:"Unlink", +image_desc:"Insert image" }); \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/es.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/es_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/et.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/et_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/fa.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/fa_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/fi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/fi_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/fr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/fr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/gl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/gl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/hr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/hr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/hu.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/hu_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/is.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/is_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/it.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/it_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ja.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ja_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ko.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ko_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/lt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/lt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/lv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/lv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ms.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ms_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/nl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/nl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/nn.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/nn_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/no.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/no_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/pl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/pl_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/pt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/pt_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ro.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ro_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ru.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/ru_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/si.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/si_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/sr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/sr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/sv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/sv_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/th.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/th_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/tr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/tr_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/uk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/uk_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/zh.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/langs/zh_dlg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/bg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/ca.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/da.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/de.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/el.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/es.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/et.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/fa.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/fi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/fr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/gl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/hr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/hu.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/is.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/it.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/ja.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/ko.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/lt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/lv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/ms.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/nl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/nn.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/no.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/pl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/pt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/ro.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/ru.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/si.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/sr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/sv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/th.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/tr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/uk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/langs/zh.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl 15 May 2009 16:47:50 -0000 1.15 +++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl 12 Jul 2009 01:12:32 -0000 1.16 @@ -22,7 +22,7 @@ # if user has write permission, create image upload form, -if {![info exists parent_id]} { +if {![info exists parent_id] || $parent_id eq ""} { set parent_id $user_id set write_p 1 } else { @@ -33,6 +33,19 @@ -privilege "write"] } +if {!$write_p} { + # if parent_id does not exist yet, let's use the pacakage_id + if { ![db_0or1row "check_parent" "select object_id from acs_objects where object_id=:parent_id"] } { + set parent_id $package_id + } + + # item might not exist! + set write_p [permission::permission_p \ + -party_id $user_id \ + -object_id $package_id \ + -privilege "write"] +} + if {$write_p} { # set recent files set recent_files_options [list] @@ -82,7 +95,6 @@ } } \ -on_submit { - ns_log notice "ATTACH FILE ON SUBMIT" if {$f_href eq ""} { set f_href $f_url element set_value upload_form f_href $f_href @@ -199,7 +211,7 @@ set file_name [regsub -all {<.*?>} $file_name {}] } } - + set file_name [string trim $file_name] if {$f_title eq "" && [info exists file_name]} { element set_value upload_form f_title $file_name } @@ -219,9 +231,10 @@ set f_href "/file/${item_id}/${file_name}" } } + element set_value upload_form f_href $f_href + element set_value upload_form f_title $f_title } - ns_log notice "F_HREF= $f_href" - element set_value upload_form f_href $f_href + } } else { @@ -245,7 +258,7 @@ var selector_window; // window.resizeTo(450, 300); - function Init() { + function attachFileInit() { __dlg_init(); var f_href = document.getElementById('f_href'); @@ -326,6 +339,7 @@ var f_href = document.getElementById('f_href'); var url = f_href.value; if (url !='') { + insertAction(); } @@ -366,7 +380,7 @@ .form-error { color : red} " - template::add_body_handler \ - -event onload \ - -script "attachFileInit()" -} \ No newline at end of file +} +template::add_body_handler \ + -event onload \ + -script "attachFileInit()" Index: openacs-4/packages/notifications/www/doc/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/doc/index.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/notifications/www/doc/index.adp 6 Jul 2004 18:08:44 -0000 1.1 +++ openacs-4/packages/notifications/www/doc/index.adp 12 Jul 2009 01:12:32 -0000 1.2 @@ -1,173 +1,167 @@ -

    Notifications Package

    -

    +

    Notifications Package

    The Idea

    +

    The Zawinski's Law:

    - -Every program attempts to expand until it can read mail.
    -Those programs which cannot so expand are replaced by ones which can.
    -
    --- Zawinski's Law - +

    +Every program attempts to expand until it can read mail. Those programs which cannot so expand are replaced by ones which can. +

    -

    +

    The OpenACS Corollary to Zawinski's Law:

    - -Every web-based application attempts to expand until it can send mail.
    -Those applications which cannot so expand are replaced by ones which can.
    -
    --- The OpenACS Corollary to Zawinski's Law +

    +Every web-based application attempts to expand until it can send mail. Those applications which cannot so expand are replaced by ones which can. +

    -At some point, your web application - your OpenACS package, that is - -needs to send email to your users. The usual way to do this is to: -
      -
    • add a bunch of ns_sendmail calls to your code +

      At some point, your web application - your OpenACS package, that is - +needs to send email to your users. The usual way to do this is to:

      +
        +
      • add a bunch of ns_sendmail calls to your code
      • suddenly realize that the users are getting too much email: find a way to -batch up the emails using a sweeper proc +batch up the emails using a sweeper proc
      • suddenly note that different alerts have different priorities: -add user preferences for immediate notifications or batched alerts +add user preferences for immediate notifications or batched alerts
      • slap your forehead when you note that you've reimplemented bboard -notifications. +notifications.

      - -The goal of the Notifications package is to provide the +The goal of the Notifications package is to provide the following functionality: +

      +
      • a generalized means of creating notification types (e.g. "bboard -notifications") - +notifications")
      • a generalized means of subscribing to notification types -(e.g. "subscribe to OpenACS 4.0 Design Forum") +(e.g. "subscribe to OpenACS Design Forum")
      • a generalized means for a user to control his notifications: -frequency, format (HTML, text), delivery method (email, IM, etc..). -
      • a generalized and simple means for an application to add to the +frequency, format (HTML, text), delivery method (email, IM, etc..).
      • +
      • a generalized and simple means for an application to add to the notification queue for a given notification type (e.g. "notify all interested parties that a new message has been added to the OpenACS -4.0 Design Forum"). +Design Forum").
      -

      -

      Use Cases

      -There are two main actors of the notifications package: +

      There are two main actors of the notifications package:

        -
      • OpenACS end-users -
      • OpenACS packages that want to notify users +
      • OpenACS end-users
      • +
      • OpenACS packages that want to notify users

      +Success for this package will be gauged by how many packages choose +to use it instead of going the ns_sendmail/iteration route. -Success for this package will be gauged by how many packages choose -to use it instead of going the ns_sendmail/iteration route. +

      Web Application End-User

      -

      Web Application End-User

      +

      A web application end-user can:

      -A web application end-user can:
        -
      • view all of his notifications, organized by category - -
      • edit frequency and format of notifications -
      • remove notification requests -
      • suspend notifications for a while (i.e. vacation) +
      • view all of his notifications, organized by category
      • +
      • edit frequency and format of notifications
      • +
      • remove notification requests
      • +
      • suspend notifications for a while (i.e. vacation)
      -

      Sample Package: Forums

      +

      Sample Package: Forums

      -The Forums package will need to use notifications, specifically as -follows: +

      The Forums package will need to use notifications, specifically as +follows:

        -
      • set up notifications for a user who is subscribed to a forum or thread -
      • easily add a message to the notification queue for a forum or thread - +
      • set up notifications for a user who is subscribed to a forum or thread
      • +
      • easily add a message to the notification queue for a forum or thread

      Data Types

      -

      Notification Type

      +

      Notification Type

      -A notification type is a category of notifications that fit a +

      +A notification type is a category of notifications that fit a certain application. "Forum Notifications" is one example. It is conceivable that one application would have more than one notification type if it performs very different types of notifications. - +

      - A notification type may store additional data about the notification itself. Thus, a "notification type" is also characterized by the specific data it must keep track of. +

      -

      Notification Request

      +

      Notification Request

      +

      Given a certain notification type (e.g. "Forum Notificaton"), a notification request is an association of a party, a notification type, and an object for which this notification type applies. - +

      - An example would be "Ben Adida requests a Forum -Notification on OpenACS 4.x Design": +Notification on OpenACS Design": +

      +
        -
      • The Party ID: Ben Adida -
      • The Notification Type: Forum Notification -
      • The Object ID: The OpenACS 4.0 Design Forum +
      • The Party ID: Ben Adida
      • +
      • The Notification Type: Forum Notification
      • +
      • The Object ID: The OpenACS Design Forum
      -

      Notification Preferences

      +

      Notification Preferences

      +

      A user or party may request certain preferences on their notification requests. Some of these preferences will be on a per request basis. Others will be on a party-wide basis: +

        -
      • frequency of notifications -
      • format of notification (HTML or text) -
      • destination of notification (which email address, or which IM) +
      • frequency of notifications
      • +
      • format of notification (HTML or text)
      • +
      • destination of notification (which email address, or which IM)
      -

      Notification

      - -The notification is the actual message that goes out and +

      Notification

      +

      +The notification is the actual message that goes out and summarizes information that needs to be communicated. A notification is the result of processing all the messages for a particular notification type, and sending them to all the parties who have requested this notification type, using the preferences indicated. +

      - -

      -

      Under The Hood: OpenACS Constructs

      -The Notification package declares an initial notification_request -OpenACS object type. This is the base type for all notification -requests. Creating a new notification type involves subtyping - -notification_request. For ease of programming, an additional -table notification_types is kept which mirrors that -acs_object_types table for all subtypes of notification_request. -

      +The Notification package declares an initial notification_request +OpenACS object type. This is the base type for all notification +requests. Creating a new notification type involves subtyping +notification_request. For ease of programming, an additional +table notification_types is kept which mirrors that +acs_object_types table for all subtypes of notification_request. +

      +

      Notification messages are queued as individual OpenACS objects. A -mapping table of which notification messages have been sent to +mapping table of which notification messages have been sent to which users is kept. Whenever the pending list of users for a particular notification is emptied, the notification object and its associated mapping table rows are removed. There is no need to keep a history of these notifications (not now). +

      - -The process for delivering a notification is implemented as a +The process for delivering a notification is implemented as a service contract in order to enable other means of notification (IM, SMS, snail mail - who knows!). Instead of attempting to make the notifications package too smart, we expect packages to come up with @@ -176,16 +170,19 @@ probably not a good idea. But we can't expect the Notification package to be super smart about "summarizing" information down to a smaller message. +

      +Email delivery is implemented using acs-mail-lite for reliability. +

      -Email delivery is implemented using acs-mail-lite for reliability. -

      Supplemental discussions

      -There are some additional docs and discussions on the forums at -here and -here +There are some additional docs and discussions on the forums in the following threads:

      +

      © 2002 OpenForce, Inc.

      Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl 13 Mar 2009 18:57:19 -0000 1.26 +++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl 12 Jul 2009 01:12:33 -0000 1.27 @@ -275,8 +275,8 @@ regsub {(\w+?)\s*(!)} $query {\1 \& !} query # if there is )( then insert an & between them # or if there is )\w or \w( insert an & between them - regsub {(\))([\(\w])} $query {\1\ & \2} query - regsub {([\)\w])(\()} $query {\1\ & \2} query + regsub {(\))([\(\w])} $query {\1 \& \2} query + regsub {([\)\w])(\()} $query {\1 \& \2} query if {[regsub {!|\||\&} $query {}] eq ""} { set query "" } Index: openacs-4/www/blank-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v diff -u -r1.47 -r1.48 --- openacs-4/www/blank-master.tcl 9 May 2009 22:27:53 -0000 1.47 +++ openacs-4/www/blank-master.tcl 12 Jul 2009 01:12:33 -0000 1.48 @@ -170,11 +170,25 @@ foreach htmlarea_id [lsort -unique $::acs_blank_master__htmlareas] { lappend tinymce_elements $htmlarea_id } - set tinymce_config $::acs_blank_master(tinymce.config) + set tinymce_config $::acs_blank_master(tinymce.config) + # Figure out the language to use + # 1st is the user language, if not available then the system one, + # fallback to english which is provided by default + + set tinymce_relpath "packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce" + set lang_list [list [lang::user::language] [lang::system::language]] + set tinymce_lang "en" + foreach elm $lang_list { + if { [file exists [acs_root_dir]/${tinymce_relpath}/langs/${elm}.js] } { + set tinymce_lang $elm + break + } + } + # TODO : each element should have it's own init template::head::add_javascript -script " - tinyMCE.init(\{$tinymce_config\}); + tinyMCE.init(\{language: \"$tinymce_lang\", $tinymce_config\}); " -order tinymceZ }
    ' + ed.getLang('advanced_dlg.about_plugin') + '' + ed.getLang('advanced_dlg.about_author') + '' + ed.getLang('advanced_dlg.about_version') + '' + ed.getLang('openacs_dlg.about_plugin') + '' + ed.getLang('openacs_dlg.about_author') + '' + ed.getLang('openacs_dlg.about_version') + '