diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index fbcc10c11..0b47bf281 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -231,20 +231,23 @@ define([ template: _.template([ '
', - '', - '', + '
', + '', '', '', '', '', '', + '', + '', + '', '', '', '', '', '', '', - '', + '', '', '', '', @@ -253,13 +256,13 @@ define([ '', '', '', '', '', '', '', @@ -271,7 +274,7 @@ define([ '', '', '', - '', + '', '', '', '', @@ -289,7 +292,7 @@ define([ '', '', '', - '', + '', '', '', '', @@ -307,10 +310,6 @@ define([ '', '', '', - '', - '', - '', - '', '', '', '
', '', - '
', + '', '
', '', - '', + '', '
', @@ -338,10 +337,10 @@ define([ '', '' @@ -416,7 +415,7 @@ define([ this.chForcesave = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-forcesave'), - labelText: this.strForcesave, + labelText: this.textForceSave, dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small' @@ -830,8 +829,6 @@ define([ this.rbShowChangesLast.setVisible(!fastmode); }, - - onChangeCoAuthMode: function (val){ this.fillShowChanges(val == 1); this.rbShowChangesNone.setValue(val == 1); @@ -919,7 +916,9 @@ define([ txtWorkspace: 'Workspace', txtHieroglyphs: 'Hieroglyphs', strShowComments: 'Show comments in text', - strShowResolvedComments: 'Show resolved comments' + strShowResolvedComments: 'Show resolved comments', + txtFastTip: 'Real-time co-editing. All changes are saved automatically', + txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make' }, DE.Views.FileMenuPanels.Settings || {})); DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 3a690ff97..e7992f63d 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -199,13 +199,16 @@ define([ template: _.template([ '
', - '', + '
', '', '', '', '', '', '', + '', + '', + '', '', '', '', @@ -219,14 +222,14 @@ define([ '', '', '', '', '', '', @@ -242,10 +245,10 @@ define([ '', '', '', - '', + '', '', '', - '', + '', '', '', @@ -268,24 +271,17 @@ define([ '', '', '', - - '', - '', - '', - '','', - - '', - '', - '', + '', + '', '', '
', '
', '', - '', + '', '
', '
', '', - '', + '', '
', '
', '' @@ -400,7 +396,7 @@ define([ this.chForcesave = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-forcesave'), - labelText: this.strForcesave, + labelText: this.textForceSave, dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small' @@ -744,7 +740,9 @@ define([ txtEditingSaving: 'Editing and saving', txtCollaboration: 'Collaboration', txtWorkspace: 'Workspace', - txtHieroglyphs: 'Hieroglyphs' + txtHieroglyphs: 'Hieroglyphs', + txtFastTip: 'Real-time co-editing. All changes are saved automatically', + txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make' }, PE.Views.FileMenuPanels.Settings || {})); PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index d2d640955..c85fa6a6a 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -165,6 +165,7 @@ tr { td { padding: 6px 10px; + width: auto !important; &.group-name { padding-top: 22px; &.top{padding-top: 5px} diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 7f7bb0d95..1cb542030 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -182,101 +182,6 @@ define([ } }); - SSE.Views.FileMenuPanels.Settings = Common.UI.BaseView.extend(_.extend({ - el: '#panel-settings', - menu: undefined, - - template: _.template([ - '
', - '
', - '
', - '
', - '
', - '
', - '
' - ].join('')), - - initialize: function(options) { - Common.UI.BaseView.prototype.initialize.call(this,arguments); - - this.menu = options.menu; - }, - - render: function(node) { - var $markup = $(this.template({scope: this})); - - this.generalSettings = new SSE.Views.FileMenuPanels.MainSettingsGeneral({menu: this.menu}); - this.generalSettings.options = {alias:'MainSettingsGeneral'}; - this.generalSettings.render($markup.findById('#panel-settings-general')); - - this.spellcheckSettings = new SSE.Views.FileMenuPanels.MainSpellCheckSettings({menu: this.menu}); - this.spellcheckSettings.render($markup.findById('#panel-settings-spellcheck')); - - this.viewSettingsPicker = new Common.UI.DataView({ - el: $markup.findById('#id-settings-menu'), - store: new Common.UI.DataViewStore([ - {name: this.txtGeneral, panel: this.generalSettings, iconCls:'toolbar__icon btn-settings', contentTarget: 'panel-settings-general', selected: true}, - {name: this.txtSpellChecking, panel: this.spellcheckSettings, iconCls:'toolbar__icon btn-ic-docspell', contentTarget: 'panel-settings-spellcheck'} - ]), - itemTemplate: _.template([ - '
', - '
', - '
<%= name %>', - '
' - ].join('')), - itemDataHint: '2', - itemDataHintDirection: 'left', - itemDataHintOffset: [-2, 20] - }); - this.viewSettingsPicker.on('item:select', _.bind(function(dataview, itemview, record) { - var panel = record.get('panel'); - $('#id-settings-content > div').removeClass('active'); - panel.$el.addClass('active'); - panel.show(); - }, this)); - - this.$el = $(node).html($markup); - return this; - }, - - show: function() { - Common.UI.BaseView.prototype.show.call(this,arguments); - var item = this.viewSettingsPicker.getSelectedRec(); - item && item.get('panel').show(); - }, - - setMode: function(mode) { - this.mode = mode; - this.generalSettings && this.generalSettings.setMode(this.mode); - this.spellcheckSettings && this.spellcheckSettings.setMode(this.mode); - if (!this.mode.isEdit) { - $(this.viewSettingsPicker.dataViewItems[1].el).hide(); - if (this.spellcheckSettings && this.spellcheckSettings.$el && this.spellcheckSettings.$el.hasClass('active')) - this.viewSettingsPicker.selectByIndex(0); - } - }, - - setApi: function(api) { - this.generalSettings && this.generalSettings.setApi(api); - this.spellcheckSettings && this.spellcheckSettings.setApi(api); - }, - - SetDisabled: function(disabled) { - if ( disabled ) { - $(this.viewSettingsPicker.dataViewItems[1].el).hide(); - this.viewSettingsPicker.selectByIndex(0, true); - } else { - if ( this.mode.isEdit ) { - $(this.viewSettingsPicker.dataViewItems[1].el).show(); - } - } - }, - - txtGeneral: 'General', - txtPageSettings: 'Page Settings', - txtSpellChecking: 'Spell checking' - }, SSE.Views.FileMenuPanels.Settings || {})); - SSE.Views.FileMenuPanels.MainSettingsGeneral = Common.UI.BaseView.extend(_.extend({ el: '#panel-settings-general', menu: undefined, @@ -284,13 +189,16 @@ define([ template: _.template([ '
', '
', - '', - '', + '
', + '', '', '', '', '', '', + '', + '', + '', '', '', '', @@ -304,14 +212,14 @@ define([ '', '', '', '', '', '', @@ -392,26 +300,18 @@ define([ '', '', '', - /** coauthoring begin **/ - - - '', - '', - '', - '', - - '', - '', + '', '', + '', '', '
', '
', '', - '', + '', '
', '
', '', - '', + '', '
', '
', '', @@ -540,7 +440,7 @@ define([ this.chForcesave = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-forcesave'), - labelText: this.strForcesave, + labelText: this.textForceSave, dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small' @@ -1092,6 +992,16 @@ define([ this.dlgAutoCorrect.show(); }, + SetDisabled: function(disabled) { + if ( disabled ) { + this.$el.hide(); + } else { + if ( this.mode.isEdit ) { + this.$el.show(); + } + } + }, + strLiveComment: 'Turn on option', strZoom: 'Default Zoom Value', okButtonText: 'Apply', @@ -1203,95 +1113,12 @@ define([ strDictionaryLanguage: 'Dictionary language', strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE', strIgnoreWordsWithNumbers: 'Ignore words with numbers', - txtAutoCorrect: 'AutoCorrect options...' + txtAutoCorrect: 'AutoCorrect options...', + txtFastTip: 'Real-time co-editing. All changes are saved automatically', + txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make' }, SSE.Views.FileMenuPanels.MainSettingsGeneral || {})); - SSE.Views.FileMenuPanels.MainSpellCheckSettings = Common.UI.BaseView.extend(_.extend({ - el: '#panel-settings-spellcheck', - menu: undefined, - - template: _.template([ - '', - - '', - '', - '', - '', - '', - '
' - ].join('')), - - initialize: function(options) { - Common.UI.BaseView.prototype.initialize.call(this,arguments); - - this.menu = options.menu; - }, - - render: function(node) { - var me = this; - var $markup = $(this.template({scope: this})); - - - - - - - - - - this.btnApply = new Common.UI.Button({ - el: $markup.findById('#fms-spellcheck-btn-apply') - }); - - this.btnApply.on('click', _.bind(this.applySettings, this)); - - this.$el = $(node).html($markup); - - if (_.isUndefined(this.scroller)) { - this.scroller = new Common.UI.Scroller({ - el: this.$el, - suppressScrollX: true, - alwaysVisibleY: true - }); - } - - return this; - }, - - show: function() { - Common.UI.BaseView.prototype.show.call(this,arguments); - - this.updateSettings(); - this.scroller && this.scroller.update(); - }, - - setMode: function(mode) { - this.mode = mode; - - }, - - setApi: function(api) { - this.api = api; - }, - - updateSettings: function() { - - }, - - applySettings: function() { - - }, - - - - - - okButtonText: 'Apply', - - - }, SSE.Views.FileMenuPanels.MainSpellCheckSettings || {})); - SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ el: '#panel-recentfiles', menu: undefined, diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 4676c9f4c..791bb1947 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -159,7 +159,7 @@ flex-direction: column; } - #panel-settings, #panel-settings-general { + #panel-settings-general { padding: 0; #id-settings-menu { @@ -206,9 +206,7 @@ } table { - &.tb-menu{ - width: auto !important; - } + width: auto !important; tr { td { //padding: 5px 10px;