From 4fc74b36e77c617e8733181a7cdf6cddcf3dc2a9 Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Thu, 11 Sep 2014 11:24:53 +0200
Subject: [PATCH] [gen] Some changes in ckeditor config.

---
 gen/ui/ckeditor/AppyReadme                           | 10 ++++++++--
 gen/ui/ckeditor/config.js                            |  4 ++--
 gen/ui/ckeditor/contents.css                         |  4 ++--
 gen/ui/ckeditor/plugins/wsc/dialogs/tmpFrameset.html |  8 ++++----
 gen/ui/ckeditor/plugins/wsc/dialogs/wsc.js           |  4 ++--
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/gen/ui/ckeditor/AppyReadme b/gen/ui/ckeditor/AppyReadme
index 52b2ee0..fa7b287 100644
--- a/gen/ui/ckeditor/AppyReadme
+++ b/gen/ui/ckeditor/AppyReadme
@@ -1,5 +1,11 @@
 This is ckeditor 4.4.4 (standard package), integrated into Appy on 2014/09/11.
 
-Readme files (*.md), build-config.js, sub-folders "samples" and "adapters" have been deleted.
+Readme files (*.md), build-config.js, sub-folders "samples" and "adapters"
+ have been deleted.
 Files config.js, contents.css and styles.js have been modified.
-Files named _translationstatus.txt have been removed (for Zope compatibility) because of their leading "_".
+Files named _translationstatus.txt have been removed (for Zope compatibility)
+ because of their leading "_".
+
+ckeditor/plugins/wsc/dialogs/tmpFrameset.html has been modified because Zope
+ complains that, in this file, frame tags are defined with an ending tag. So I've
+ replaced every <frame..></frame> occurrence by <frame.../>.
diff --git a/gen/ui/ckeditor/config.js b/gen/ui/ckeditor/config.js
index bd71bdd..d5aee5e 100644
--- a/gen/ui/ckeditor/config.js
+++ b/gen/ui/ckeditor/config.js
@@ -6,7 +6,8 @@ CKEDITOR.editorConfig = function(config) {
   config.toolbar = 'Appy';
   config.toolbar_Appy = [
     { name: 'basicstyles',
-      items: ["Format", "Bold", "Italic", "Underline"]},
+      items: ["Format", "Bold", "Italic", "Underline", "Subscript",
+              "Superscript", "RemoveFormat"]},
     { name: 'paragraph',
       items: ["NumberedList", "BulletedList", "Outdent", "Indent"]},
     { name: 'clipboard',
@@ -24,4 +25,3 @@ CKEDITOR.editorConfig = function(config) {
   config.scayt_uiTabs = '0,1,0';
   config.removeDialogTabs = 'image:advanced;link:advanced';
 };
-
diff --git a/gen/ui/ckeditor/contents.css b/gen/ui/ckeditor/contents.css
index 307d086..dd1757d 100644
--- a/gen/ui/ckeditor/contents.css
+++ b/gen/ui/ckeditor/contents.css
@@ -2,8 +2,8 @@
    For licensing, see LICENSE.html or http://ckeditor.com/license */
 
 /* From ckeditor default contents.css */
-body { font-family: sans-serif, Arial, Verdana, "Trebuchet MS"; font-size: 12px;
-       color: #333; background-color: #fff; margin: 20px }
+body { font-family: sans-serif, Arial, Verdana, "Trebuchet MS"; font-size: 11px;
+       color: #333; background-color: #fff; margin: 10px }
 .cke_editable { font-size: 13px; line-height: 1.6 }
 blockquote {
   font-style: italic; font-family: Georgia, Times, "Times New Roman", serif;
diff --git a/gen/ui/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/gen/ui/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
index 61203e0..9961692 100644
--- a/gen/ui/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+++ b/gen/ui/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
@@ -44,9 +44,9 @@ function tryLoad()
 </head>
 
 <frameset id="itFrameset" onload="tryLoad();" border="0" rows="30,*,*,0">
-    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="2" src="" name="navbar"></frame>
-    <frame scrolling="auto" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="0" src="" name="mid"></frame>
-    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="bot"></frame>
-    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="spellsuggestall"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="2" src="" name="navbar"/>
+    <frame scrolling="auto" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="0" src="" name="mid"/>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="bot"/>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="spellsuggestall"/>
 </frameset>
 </html>
diff --git a/gen/ui/ckeditor/plugins/wsc/dialogs/wsc.js b/gen/ui/ckeditor/plugins/wsc/dialogs/wsc.js
index 443145c..845b714 100644
--- a/gen/ui/ckeditor/plugins/wsc/dialogs/wsc.js
+++ b/gen/ui/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -34,7 +34,7 @@ d.getItem(g),e.misc.isVisible(h.$)){try{h.$.focus()}catch(i){}break}},0)};CKEDIT
 return{title:b.config.wsc_dialogTitle||b.lang.wsc.title,minWidth:560,minHeight:444,buttons:[CKEDITOR.dialog.cancelButton],onLoad:function(){a.dialog=this;t();m();o()},onShow:function(){b.lockSelection(b.getSelection());a.TextAreaNumber="cke_textarea_"+CKEDITOR.currentInstance.name;e.postMessage.init(x);a.dataTemp=CKEDITOR.currentInstance.getData();a.OverlayPlace=a.dialog.parts.tabs.getParent().$;if(CKEDITOR&&CKEDITOR.config){a.wsc_customerId=b.config.wsc_customerId;a.cust_dic_ids=b.config.wsc_customDictionaryIds;
 a.userDictionaryName=b.config.wsc_userDictionaryName;a.defaultLanguage=CKEDITOR.config.defaultLanguage;var c="file:"==document.location.protocol?"http:":document.location.protocol;CKEDITOR.scriptLoader.load(b.config.wsc_customLoaderScript||c+"//loader.webspellchecker.net/sproxy_fck/sproxy.php?plugin=fck2&customerid="+a.wsc_customerId+"&cmd=script&doc=wsc&schema=22",function(c){CKEDITOR.config&&CKEDITOR.config.wsc&&CKEDITOR.config.wsc.DefaultParams?(a.serverLocationHash=CKEDITOR.config.wsc.DefaultParams.serviceHost,
 a.logotype=CKEDITOR.config.wsc.DefaultParams.logoPath,a.loadIcon=CKEDITOR.config.wsc.DefaultParams.iconPath,a.loadIconEmptyEditor=CKEDITOR.config.wsc.DefaultParams.iconPathEmptyEditor,a.LangComparer=new CKEDITOR.config.wsc.DefaultParams._SP_FCK_LangCompare):(a.serverLocationHash=DefaultParams.serviceHost,a.logotype=DefaultParams.logoPath,a.loadIcon=DefaultParams.iconPath,a.loadIconEmptyEditor=DefaultParams.iconPathEmptyEditor,a.LangComparer=new _SP_FCK_LangCompare);a.pluginPath=CKEDITOR.getUrl(b.plugins.wsc.path);
-a.iframeNumber=a.TextAreaNumber;a.templatePath=a.pluginPath+"dialogs/tmp.html";a.LangComparer.setDefaulLangCode(a.defaultLanguage);a.currentLang=b.config.wsc_lang||a.LangComparer.getSPLangCode(b.langCode);a.selectingLang=a.currentLang;a.div_overlay=new r({opacity:"1",background:"#fff url("+a.loadIcon+") no-repeat 50% 50%",target:a.OverlayPlace});var d=a.dialog.parts.tabs.getId(),d=CKEDITOR.document.getById(d);d.setStyle("width","97%");d.getElementsByTag("DIV").count()||d.append(a.buildSelectLang(a.dialog.getParentEditor().name));
+a.iframeNumber=a.TextAreaNumber;a.templatePath=a.pluginPath+"dialogs/tmp";a.LangComparer.setDefaulLangCode(a.defaultLanguage);a.currentLang=b.config.wsc_lang||a.LangComparer.getSPLangCode(b.langCode);a.selectingLang=a.currentLang;a.div_overlay=new r({opacity:"1",background:"#fff url("+a.loadIcon+") no-repeat 50% 50%",target:a.OverlayPlace});var d=a.dialog.parts.tabs.getId(),d=CKEDITOR.document.getById(d);d.setStyle("width","97%");d.getElementsByTag("DIV").count()||d.append(a.buildSelectLang(a.dialog.getParentEditor().name));
 a.div_overlay_no_check=new r({opacity:"1",id:"no_check_over",background:"#fff url("+a.loadIconEmptyEditor+") no-repeat 50% 50%",target:a.OverlayPlace});c&&(F(a.dialog),a.dialog.setupContent(a.dialog))})}else a.dialog.hide()},onHide:function(){var c=CKEDITOR.plugins.scayt,f=b.scayt;b.unlockSelection();c&&(f&&c.state[b.name]&&f.setMarkupPaused)&&f.setMarkupPaused(!1);a.dataTemp="";e.postMessage.unbindHandler(x)},contents:[{id:"SpellTab",label:"SpellChecker",accessKey:"S",elements:[{type:"html",id:"banner",
 label:"banner",style:"",html:"<div></div>"},{type:"html",id:"Content",label:"spellContent",html:"",setup:function(b){var b=a.iframeNumber+"_"+b._.currentTabId,c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"hbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;",widths:["50%","50%"],children:[{type:"hbox",id:"leftCol",align:"left",width:"50%",children:[{type:"vbox",id:"rightCol1",widths:["50%","50%"],children:[{type:"text",id:"text",label:a.LocalizationLabel.ChangeTo.text+
 ":",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",width:"140px","default":"",onShow:function(){a.textNode.SpellTab=this;a.LocalizationLabel.ChangeTo.instance=this},onHide:function(){this.reset()}},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"text",id:"labelSuggestions",label:a.LocalizationLabel.Suggestions.text+":",onShow:function(){a.LocalizationLabel.Suggestions.instance=this;this.getInputElement().setStyles({display:"block",
@@ -71,4 +71,4 @@ b.getContentElement("OptionsTab","IgnoreWordsNumbers");c.IgnoreMixedCaseWords=b.
 !1);!parseInt(d.IgnoreWordsNumbers,10)?c.IgnoreWordsNumbers.setValue("",!1):c.IgnoreWordsNumbers.setValue("checked",!1);!parseInt(d.IgnoreMixedCaseWords,10)?c.IgnoreMixedCaseWords.setValue("",!1):c.IgnoreMixedCaseWords.setValue("checked",!1);!parseInt(d.IgnoreDomainNames,10)?c.IgnoreDomainNames.setValue("",!1):c.IgnoreDomainNames.setValue("checked",!1);d.IgnoreAllCapsWords=!c.IgnoreAllCapsWords.getValue()?0:1;d.IgnoreWordsNumbers=!c.IgnoreWordsNumbers.getValue()?0:1;d.IgnoreMixedCaseWords=!c.IgnoreMixedCaseWords.getValue()?
 0:1;d.IgnoreDomainNames=!c.IgnoreDomainNames.getValue()?0:1;c.IgnoreAllCapsWords.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreAllCapsWords;c.IgnoreWordsNumbers.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreWordsWithNumbers;c.IgnoreMixedCaseWords.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreMixedCaseWords;c.IgnoreDomainNames.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreDomainNames},onHide:function(){e.postMessage.unbindHandler(i);if(p)try{p.focus()}catch(a){}}}});
 CKEDITOR.dialog.on("resize",function(b){var b=b.data,c=b.dialog,d=CKEDITOR.document.getById(a.iframeNumber+"_"+c._.currentTabId);"checkspell"==c._.name&&(a.bnr?d&&d.setSize("height",b.height-310):d&&d.setSize("height",b.height-220))});CKEDITOR.on("dialogDefinition",function(b){if("checkspell"===b.data.name){var c=b.data.definition;a.onLoadOverlay=new r({opacity:"1",background:"#fff",target:c.dialog.parts.tabs.getParent().$});a.onLoadOverlay.setEnable();c.dialog.on("cancel",function(){c.dialog.getParentEditor().config.wsc_onClose.call(this.document.getWindow().getFrame());
-a.div_overlay.setDisable();a.onLoadOverlay.setDisable();return!1},this,null,-1)}})})();
\ No newline at end of file
+a.div_overlay.setDisable();a.onLoadOverlay.setDisable();return!1},this,null,-1)}})})();