diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 58173633d..b54f3e35f 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -49,7 +49,8 @@ fillForms: // default = edit || review, copy: // default = true, editCommentAuthorOnly: // default = false - deleteCommentAuthorOnly: // default = false + deleteCommentAuthorOnly: // default = false, + reviewGroup: ["Group1", ""] // current user can accept/reject review changes made by users from Group1 and users without a group. [] - use groups, but can't change any group's changes } }, editorConfig: { @@ -877,6 +878,9 @@ if (config.parentOrigin) params += "&parentOrigin=" + config.parentOrigin; + if (config.editorConfig && config.editorConfig.customization && config.editorConfig.customization.uiTheme ) + params += "&uitheme=" + config.editorConfig.customization.uiTheme; + return params; } diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index aecc72564..db9c97066 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -211,7 +211,7 @@ define([ '' + '
' + '<%= caption %>' + - '' + + '' + '
' + '' + ''; @@ -226,7 +226,7 @@ define([ '' + ''; @@ -271,7 +271,7 @@ define([ '<% applyicon() %>', '<%= caption %>', '' + - '' + + '' + '', '', '', @@ -282,7 +282,7 @@ define([ '<%= caption %>', '', '', '', diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js index 77f163661..a0c85769b 100644 --- a/apps/common/main/lib/component/ColorButton.js +++ b/apps/common/main/lib/component/ColorButton.js @@ -41,16 +41,28 @@ define([ Common.UI.ColorButton = Common.UI.Button.extend(_.extend({ options : { - hint: false, - enableToggle: false, - visible: true + id : null, + hint : false, + enableToggle : false, + allowDepress : false, + toggleGroup : null, + cls : '', + iconCls : '', + caption : '', + menu : null, + disabled : false, + pressed : false, + split : false, + visible : true }, template: _.template([ '
', '', '
' ].join('')), diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js index f7c7ef6b4..3784df890 100644 --- a/apps/common/main/lib/component/ComboBorderSize.js +++ b/apps/common/main/lib/component/ComboBorderSize.js @@ -77,9 +77,14 @@ define([ Common.UI.ComboBorderSize = Common.UI.ComboBox.extend(_.extend({ template: _.template([ '
', - '
', + '
', + '', + '', + '
', '
', - '', + '', '