[Rt-commit] rt branch, 4.6/fix-ckeditor4, created. rt-4.4.4-624-gb23d889d11

? sunnavy sunnavy at bestpractical.com
Fri Jan 3 13:01:14 EST 2020


The branch, 4.6/fix-ckeditor4 has been created
        at  b23d889d11855e7e747fc4ed8d05faf37f81d1ff (commit)

- Log -----------------------------------------------------------------
commit b374ddfeb54797903aa1e9ea9c294ec579186cff
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Nov 28 03:55:10 2019 +0800

    Remove pbckcode as we don't use it for now and it requires external js files
    
    It requires ace library, which is not included in RT yet.

diff --git a/devel/third-party/ckeditor-4.13.0/build-config.js b/devel/third-party/ckeditor-4.13.0/build-config.js
index 914b4deb42..e3fc0ab67a 100644
--- a/devel/third-party/ckeditor-4.13.0/build-config.js
+++ b/devel/third-party/ckeditor-4.13.0/build-config.js
@@ -13,10 +13,10 @@
  * (1) https://ckeditor.com/cke4/builder
  *     Visit online builder to build CKEditor from scratch.
  *
- * (2) https://ckeditor.com/cke4/builder/b6e3ccff72a5083cc1cd71823f6250f8
+ * (2) https://ckeditor.com/cke4/builder/60ddbd6ef3e73f77d004b7220cff69dc
  *     Visit online builder to build CKEditor, starting with the same setup as before.
  *
- * (3) https://ckeditor.com/cke4/builder/download/b6e3ccff72a5083cc1cd71823f6250f8
+ * (3) https://ckeditor.com/cke4/builder/download/60ddbd6ef3e73f77d004b7220cff69dc
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -76,7 +76,6 @@ var CKBUILDER_CONFIG = {
 		'pastefromword' : 1,
 		'pastetext' : 1,
 		'pastetools' : 1,
-		'pbckcode' : 1,
 		'removeformat' : 1,
 		'resize' : 1,
 		'showborders' : 1,
diff --git a/share/static/RichText/ckeditor.min.js b/share/static/RichText/ckeditor.min.js
index 54540b6128..5559be790e 100644
--- a/share/static/RichText/ckeditor.min.js
+++ b/share/static/RichText/ckeditor.min.js
@@ -1087,10 +1087,7 @@ a._.uploadWidgetNotificaionAggregator;if(!h||h.isFinished())h=a._.uploadWidgetNo
 b&&"uploading"==c.status&&b.update(c.uploaded)});c.on("uploaded",function(){b&&b.done()});c.on("error",function(){b&&b.cancel();a.showNotification(c.message,"warning")});c.on("abort",function(){b&&b.cancel();CKEDITOR.instances[a.name]&&a.showNotification(a.lang.uploadwidget.abort,"info")})}})})();(function(){function l(c){9>=c&&(c="0"+c);return String(c)}function n(c){var a=new Date,a=[a.getFullYear(),a.getMonth()+1,a.getDate(),a.getHours(),a.getMinutes(),a.getSeconds()];e+=1;return"image-"+CKEDITOR.tools.array.map(a,l).join("")+"-"+e+"."+c}var e=0;CKEDITOR.plugins.add("uploadimage",{requires:"uploadwidget",onLoad:function(){CKEDITOR.addCss(".cke_upload_uploading img{opacity: 0.3}")},isSupportedEnvironment:function(){return CKEDITOR.plugins.clipboard.isFileApiSupported},init:function(c){if(this.isSupportedEnvironment()){var a=
 CKEDITOR.fileTools,e=a.getUploadUrl(c.config,"image");e&&(a.addUploadWidget(c,"uploadimage",{supportedTypes:/image\/(jpeg|png|gif|bmp)/,uploadUrl:e,fileToElement:function(){var b=new CKEDITOR.dom.element("img");b.setAttribute("src","data:image/gif;base64,R0lGODlhDgAOAIAAAAAAAP///yH5BAAAAAAALAAAAAAOAA4AAAIMhI+py+0Po5y02qsKADs\x3d");return b},parts:{img:"img"},onUploading:function(b){this.parts.img.setAttribute("src",b.data)},onUploaded:function(b){var a=this.parts.img.$;this.replaceWith('\x3cimg src\x3d"'+
 b.url+'" width\x3d"'+(b.responseData.width||a.naturalWidth)+'" height\x3d"'+(b.responseData.height||a.naturalHeight)+'"\x3e')}}),c.on("paste",function(b){if(b.data.dataValue.match(/<img[\s\S]+data:/i)){b=b.data;var f=document.implementation.createHTMLDocument(""),f=new CKEDITOR.dom.element(f.body),m,g,k;f.data("cke-editable",1);f.appendHtml(b.dataValue);m=f.find("img");for(k=0;k<m.count();k++){g=m.getItem(k);var d=g.getAttribute("src"),h=d&&"data:"==d.substring(0,5),l=null===g.data("cke-realelement");
-h&&l&&!g.data("cke-upload-id")&&!g.isReadOnly(1)&&(h=(h=d.match(/image\/([a-z]+?);/i))&&h[1]||"jpg",d=c.uploadRepository.create(d,n(h)),d.upload(e),a.markElement(g,"uploadimage",d.id),a.bindNotifications(c,d))}b.dataValue=f.getHtml()}}))}}})})();var js={ace:"ace.js",aceExtWhitespace:"ext-whitespace.js",pbSyntaxHighlighter:CKEDITOR.plugins.getPath("pbckcode")+"dialogs/PBSyntaxHighlighter.js"},commandName="pbckcode";
-CKEDITOR.plugins.add("pbckcode",{icons:"pbckcode",hidpi:!0,lang:["fr","en","ru"],init:function(a){void 0===a.config.pbckcode&&(a.config.pbckcode={});a.settings=CKEDITOR.tools.extend({cls:"",modes:[["HTML","html"],["CSS","css"],["PHP","php"],["JS","javascript"]],theme:"textmate",tab_size:4,js:"//cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/"},a.config.pbckcode,!0);a.settings.js=normalizeJsUrl(a.settings.js);a.on("instanceReady",function(){CKEDITOR.document.appendStyleSheet(this.path+"dialogs/style.css")}.bind(this));
-a.ui.addButton("pbckcode",{label:a.lang.pbckcode.addCode,command:commandName,toolbar:"pbckcode"});a.addCommand(commandName,new CKEDITOR.dialogCommand("pbckcodeDialog",{allowedContent:"pre[*]{*}(*)"}));a.getCommand(commandName).disable();CKEDITOR.dialog.add("pbckcodeDialog",this.path+"dialogs/pbckcode.js");a.contextMenu&&(a.addMenuGroup("pbckcodeGroup"),a.addMenuItem("pbckcodeItem",{label:a.lang.pbckcode.editCode,icon:this.path+"icons/pbckcode.png",command:commandName,group:"pbckcodeGroup"}),a.contextMenu.addListener(function(a){if(a.getAscendant("pre",
-!0))return{pbckcodeItem:CKEDITOR.TRISTATE_OFF}}));var b=[getScriptUrl(a.settings.js,js.ace),js.pbSyntaxHighlighter];CKEDITOR.scriptLoader.load(b,function(){a.getCommand(commandName).enable();CKEDITOR.scriptLoader.load([getScriptUrl(a.settings.js,js.aceExtWhitespace)])})}});function normalizeJsUrl(a){return a.concat("/").replace(RegExp("([^:]/)/+","g"),"$1")}function getScriptUrl(a,b){return a+b};CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var a=this._;a.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),a.on?a.panel.hide():a.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var a=c.panel||{};delete c.panel;this.base(c);this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.block={attributes:a.attributes};a.toolbarRelated=!0;this.hasArrow=
+h&&l&&!g.data("cke-upload-id")&&!g.isReadOnly(1)&&(h=(h=d.match(/image\/([a-z]+?);/i))&&h[1]||"jpg",d=c.uploadRepository.create(d,n(h)),d.upload(e),a.markElement(g,"uploadimage",d.id),a.bindNotifications(c,d))}b.dataValue=f.getHtml()}}))}}})})();CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var a=this._;a.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),a.on?a.panel.hide():a.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var a=c.panel||{};delete c.panel;this.base(c);this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.block={attributes:a.attributes};a.toolbarRelated=!0;this.hasArrow=
 "listbox";this.click=e;this._={panelDefinition:a}},statics:{handler:{create:function(c){return new CKEDITOR.ui.panelButton(c)}}},proto:{createPanel:function(c){var a=this._;if(!a.panel){var f=this._.panelDefinition,e=this._.panelDefinition.block,g=f.parent||CKEDITOR.document.getBody(),d=this._.panel=new CKEDITOR.ui.floatPanel(c,g,f),f=d.addBlock(a.id,e),b=this;d.onShow=function(){b.className&&this.element.addClass(b.className+"_panel");b.setState(CKEDITOR.TRISTATE_ON);a.on=1;b.editorFocus&&c.focus();
 if(b.onOpen)b.onOpen()};d.onHide=function(d){b.className&&this.element.getFirst().removeClass(b.className+"_panel");b.setState(b.modes&&b.modes[c.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);a.on=0;if(!d&&b.onClose)b.onClose()};d.onEscape=function(){d.hide(1);b.document.getById(a.id).focus()};if(this.onBlock)this.onBlock(d,f);f.onHide=function(){a.on=0;b.setState(CKEDITOR.TRISTATE_OFF)}}}}})},beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_PANELBUTTON,CKEDITOR.ui.panelButton.handler)}});
 CKEDITOR.UI_PANELBUTTON="panelbutton";CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",init:function(e){function u(a,d,g,y,l){var n=new CKEDITOR.style(m["colorButton_"+d+"Style"]),q=CKEDITOR.tools.getNextId()+"_colorBox",k={type:d},p;l=l||{};e.ui.add(a,CKEDITOR.UI_PANELBUTTON,{label:g,title:g,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+y,allowedContent:n,requiredContent:n,contentTransformations:l.contentTransformations,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":h.panelTitle}},
@@ -1188,4 +1185,4 @@ this.elements.statusDescription.setText("");this.elements.statusName.setText("")
 addEmojiToGroups:function(){var a={};f.forEach(this.groups,function(d){a[d.name]=d.items},this);f.forEach(this.emojiList,function(d){a[d.group].push(d)},this)}}});CKEDITOR.plugins.add("emoji",{requires:"autocomplete,textmatch,ajax,panelbutton,floatpanel",icons:"emojipanel",hidpi:!0,isSupportedEnvironment:function(){return!CKEDITOR.env.ie||11<=CKEDITOR.env.version},beforeInit:function(){this.isSupportedEnvironment()&&!g&&(CKEDITOR.document.appendStyleSheet(this.path+"skins/default.css"),g=!0)},init:function(a){if(this.isSupportedEnvironment()){var d=
 CKEDITOR.tools.array;CKEDITOR.ajax.load(CKEDITOR.getUrl(a.config.emoji_emojiListUrl||"plugins/emoji/emoji.json"),function(c){function b(){a._.emoji.autocomplete=new CKEDITOR.plugins.autocomplete(a,{textTestCallback:e(),dataCallback:g,itemTemplate:'\x3cli data-id\x3d"{id}" class\x3d"cke_emoji-suggestion_item"\x3e{symbol} {id}\x3c/li\x3e',outputTemplate:"{symbol}"})}function e(){return function(a){return a.collapsed?CKEDITOR.plugins.textMatch.match(a,f):null}}function f(a,b){var c=a.slice(0,b),d=c.match(new RegExp("(?:\\s|^)(:\\S{"+
 k+"}\\S*)$"));return d?{start:c.lastIndexOf(d[1]),end:b}:null}function g(a,b){var c=a.query.substr(1).toLowerCase(),e=d.filter(h,function(a){return-1!==a.id.toLowerCase().indexOf(c)}).sort(function(a,b){var d=!a.id.substr(1).indexOf(c),e=!b.id.substr(1).indexOf(c);return d!=e?d?-1:1:a.id>b.id?1:-1});b(e)}if(null!==c){void 0===a._.emoji&&(a._.emoji={});void 0===a._.emoji.list&&(a._.emoji.list=JSON.parse(c));var h=a._.emoji.list,k=void 0===a.config.emoji_minChars?2:a.config.emoji_minChars;if("ready"!==
-a.status)a.once("instanceReady",b);else b()}});a.addCommand("insertEmoji",{exec:function(a,b){a.insertHtml(b.emojiText)}});a.plugins.toolbar&&new h(a,this)}}})})();CKEDITOR.config.plugins='dialogui,dialog,about,a11yhelp,basicstyles,blockquote,notification,button,toolbar,clipboard,resize,enterkey,entities,panel,floatpanel,listblock,richcombo,format,horizontalrule,htmlwriter,image,indent,indentlist,fakeobjects,link,list,magicline,pastetext,pastetools,pastefromgdocs,pastefromword,removeformat,showborders,sourcearea,specialchar,stylescombo,tab,table,undo,lineutils,widgetselection,widget,filetools,notificationaggregator,uploadwidget,uploadimage,pbckcode,panelbutton,colorbutton,ccmsconfighelper,confighelper,wysiwygarea,colordialog,docprops,docfont,textwatcher,autocomplete,textmatch,xml,ajax,emoji';CKEDITOR.config.skin='bootstrapck';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.leng
 th; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,blockquote,168,,copy-rtl,192,,copy,216,,cut-rtl,240,,cut,264,,paste-rtl,288,,paste,312,,horizontalrule,336,,image,360,,indent-rtl,384,,indent,408,,outdent-rtl,432,,outdent,456,,anchor-rtl,480,,anchor,504,,link,528,,unlink,552,,bulletedlist-rtl,576,,bulletedlist,600,,numberedlist-rtl,624,,numberedlist,648,,pastetext-rtl,672,,pastetext,696,,pastefromword-rtl,720,,pastefromword,744,,removeformat,768,,source-rtl,792,,source,816,,specialchar,840,,table,864,,redo-rtl,888,,redo,912,,undo-rtl,936,,undo,960,,pbckcode,984,,bgcolor,1008,,textcolor,1032,,docprops-rtl,1056,,docprops,1080,,emojipanel,1104,','icons_hidpi.png');else setIcons('about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,blockquote,168,auto,
 copy-rtl,192,auto,copy,216,auto,cut-rtl,240,auto,cut,264,auto,paste-rtl,288,auto,paste,312,auto,horizontalrule,336,auto,image,360,auto,indent-rtl,384,auto,indent,408,auto,outdent-rtl,432,auto,outdent,456,auto,anchor-rtl,480,auto,anchor,504,auto,link,528,auto,unlink,552,auto,bulletedlist-rtl,576,auto,bulletedlist,600,auto,numberedlist-rtl,624,auto,numberedlist,648,auto,pastetext-rtl,672,auto,pastetext,696,auto,pastefromword-rtl,720,auto,pastefromword,744,auto,removeformat,768,auto,source-rtl,792,auto,source,816,auto,specialchar,840,auto,table,864,auto,redo-rtl,888,auto,redo,912,auto,undo-rtl,936,auto,undo,960,auto,pbckcode,984,auto,bgcolor,1008,auto,textcolor,1032,auto,docprops-rtl,1056,auto,docprops,1080,auto,emojipanel,1104,auto','icons.png');})();CKEDITOR.lang.languages={"af":1,"sq":1,"ar":1,"az":1,"eu":1,"bn":1,"bs":1,"bg":1,"ca":1,"zh-cn":1,"zh":1,"hr":1,"cs":1,"da":1,"nl":1,"en":1,"en-au":1,"en-ca":1,"en-gb":1,"eo":1,"et":1,"fo":1,"fi":1,"fr":1,"fr-ca":1,"gl":1,"ka":1,"de":1,"d
 e-ch":1,"el":1,"gu":1,"he":1,"hi":1,"hu":1,"is":1,"id":1,"it":1,"ja":1,"km":1,"ko":1,"ku":1,"lv":1,"lt":1,"mk":1,"ms":1,"mn":1,"no":1,"nb":1,"oc":1,"fa":1,"pl":1,"pt-br":1,"pt":1,"ro":1,"ru":1,"sr":1,"sr-latn":1,"si":1,"sk":1,"sl":1,"es":1,"es-mx":1,"sv":1,"tt":1,"th":1,"tr":1,"ug":1,"uk":1,"vi":1,"cy":1};}());
\ No newline at end of file
+a.status)a.once("instanceReady",b);else b()}});a.addCommand("insertEmoji",{exec:function(a,b){a.insertHtml(b.emojiText)}});a.plugins.toolbar&&new h(a,this)}}})})();CKEDITOR.config.plugins='dialogui,dialog,about,a11yhelp,basicstyles,blockquote,notification,button,toolbar,clipboard,resize,enterkey,entities,panel,floatpanel,listblock,richcombo,format,horizontalrule,htmlwriter,image,indent,indentlist,fakeobjects,link,list,magicline,pastetext,pastetools,pastefromgdocs,pastefromword,removeformat,showborders,sourcearea,specialchar,stylescombo,tab,table,undo,lineutils,widgetselection,widget,filetools,notificationaggregator,uploadwidget,uploadimage,panelbutton,colorbutton,ccmsconfighelper,confighelper,wysiwygarea,colordialog,docprops,docfont,textwatcher,autocomplete,textmatch,xml,ajax,emoji';CKEDITOR.config.skin='bootstrapck';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )
 CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,blockquote,168,,copy-rtl,192,,copy,216,,cut-rtl,240,,cut,264,,paste-rtl,288,,paste,312,,horizontalrule,336,,image,360,,indent-rtl,384,,indent,408,,outdent-rtl,432,,outdent,456,,anchor-rtl,480,,anchor,504,,link,528,,unlink,552,,bulletedlist-rtl,576,,bulletedlist,600,,numberedlist-rtl,624,,numberedlist,648,,pastetext-rtl,672,,pastetext,696,,pastefromword-rtl,720,,pastefromword,744,,removeformat,768,,source-rtl,792,,source,816,,specialchar,840,,table,864,,redo-rtl,888,,redo,912,,undo-rtl,936,,undo,960,,bgcolor,984,,textcolor,1008,,docprops-rtl,1032,,docprops,1056,,emojipanel,1080,','icons_hidpi.png');else setIcons('about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,blockquote,168,auto,copy-rtl,192,auto,copy,2
 16,auto,cut-rtl,240,auto,cut,264,auto,paste-rtl,288,auto,paste,312,auto,horizontalrule,336,auto,image,360,auto,indent-rtl,384,auto,indent,408,auto,outdent-rtl,432,auto,outdent,456,auto,anchor-rtl,480,auto,anchor,504,auto,link,528,auto,unlink,552,auto,bulletedlist-rtl,576,auto,bulletedlist,600,auto,numberedlist-rtl,624,auto,numberedlist,648,auto,pastetext-rtl,672,auto,pastetext,696,auto,pastefromword-rtl,720,auto,pastefromword,744,auto,removeformat,768,auto,source-rtl,792,auto,source,816,auto,specialchar,840,auto,table,864,auto,redo-rtl,888,auto,redo,912,auto,undo-rtl,936,auto,undo,960,auto,bgcolor,984,auto,textcolor,1008,auto,docprops-rtl,1032,auto,docprops,1056,auto,emojipanel,1080,auto','icons.png');})();CKEDITOR.lang.languages={"af":1,"sq":1,"ar":1,"az":1,"eu":1,"bn":1,"bs":1,"bg":1,"ca":1,"zh-cn":1,"zh":1,"hr":1,"cs":1,"da":1,"nl":1,"en":1,"en-au":1,"en-ca":1,"en-gb":1,"eo":1,"et":1,"fo":1,"fi":1,"fr":1,"fr-ca":1,"gl":1,"ka":1,"de":1,"de-ch":1,"el":1,"gu":1,"he":1,"hi":1,"hu":1,
 "is":1,"id":1,"it":1,"ja":1,"km":1,"ko":1,"ku":1,"lv":1,"lt":1,"mk":1,"ms":1,"mn":1,"no":1,"nb":1,"oc":1,"fa":1,"pl":1,"pt-br":1,"pt":1,"ro":1,"ru":1,"sr":1,"sr-latn":1,"si":1,"sk":1,"sl":1,"es":1,"es-mx":1,"sv":1,"tt":1,"th":1,"tr":1,"ug":1,"uk":1,"vi":1,"cy":1};}());
\ No newline at end of file

commit ee10bdc84730a0f9672fddfd5d4ab3acea0c1bdf
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Nov 28 04:38:34 2019 +0800

    Enlarge richtext height to 300px, 200 is too small

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 4bc9dfd546..625e8a5ed8 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -3038,7 +3038,7 @@ Height of rich text JavaScript enabled editing boxes (in pixels)
 
 =cut
 
-Set($MessageBoxRichTextHeight, 200);
+Set($MessageBoxRichTextHeight, 300);
 
 =item C<$MessageBoxIncludeSignature>
 

commit 189b104043b9da817639de33af1535252bcc6372
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Nov 28 05:09:22 2019 +0800

    Add Blockquote button to quote messages correctly
    
    When we click Reply/Comment on a transaction, the transaction's content
    will be wrapped into "<blockquote>" before passing to editor, and it
    requires "blockquote" plugin to make "<blockquote>" behave correctly.
    
    Removing Blockquote button somehow disabled the plugin, so we need to
    add it back.

diff --git a/share/static/RichText/config.js b/share/static/RichText/config.js
index 5110eba0a6..758aef1e68 100644
--- a/share/static/RichText/config.js
+++ b/share/static/RichText/config.js
@@ -24,7 +24,7 @@ CKEDITOR.editorConfig = function( config ) {
     		{ name: 'about', groups: [ 'about' ] }
     	];
 
-    	config.removeButtons = 'Underline,Subscript,Superscript,About,Link,Image,HorizontalRule,SpecialChar,Source,DocProps,Unlink,Anchor,Strike,Blockquote,Cut,Copy,Outdent,Indent';
+    	config.removeButtons = 'Underline,Subscript,Superscript,About,Link,Image,HorizontalRule,SpecialChar,Source,DocProps,Unlink,Anchor,Strike,Cut,Copy,Outdent,Indent';
 
 	// Remove some buttons provided by the standard plugins, which are
 	// not needed in the Standard(s) toolbar.

commit b23d889d11855e7e747fc4ed8d05faf37f81d1ff
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Dec 20 06:05:59 2019 +0800

    Squeeze ckeditor icons a tiny bit to show more icons in one row
    
    The default icon padding-left/right is 4px, icon group margin-right is
    6px.
    
    This is to keep ckeditor toolbar in one row with new added Blockquote
    icon screens on a 1280x800 screen.

diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index b74d683679..ec9746b174 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -128,3 +128,13 @@ svg.icon-helper {
 .oddline {
     background-color: rgba(0, 0, 0, 0.05);
 }
+
+.cke_toolgroup a.cke_button {
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.cke_toolbar .cke_combo_button,
+.cke_toolbar .cke_toolgroup {
+    margin-right: 5px;
+}

-----------------------------------------------------------------------


More information about the rt-commit mailing list