From b5a81cf8af2607eee67defe132be9f55d4768d9c Mon Sep 17 00:00:00 2001 From: alexandervnuchkov Date: Wed, 29 Jun 2016 17:43:24 +0300 Subject: [PATCH 1/8] Update Readme.md --- Readme.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Readme.md b/Readme.md index 5375779d9..661a504e4 100644 --- a/Readme.md +++ b/Readme.md @@ -1,3 +1,7 @@ +## web-apps + +Frontend used for [ONLYOFFICE Document Server][2]. + ## Project Information Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org") @@ -11,3 +15,8 @@ SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www. If you have any problems with or questions about this image, please contact us through a [dev.onlyoffice.org][1]. [1]: http://dev.onlyoffice.org + [2]: https://github.com/ONLYOFFICE/DocumentServer + +## License + +web-apps is released under an GNU AGPL v3.0 license. See the LICENSE file for more information. From fa88016820cd166b929352493777709f15701936 Mon Sep 17 00:00:00 2001 From: alexandervnuchkov Date: Thu, 30 Jun 2016 11:48:48 +0300 Subject: [PATCH 2/8] Update Readme.md --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index 661a504e4..796dde16b 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ ## web-apps -Frontend used for [ONLYOFFICE Document Server][2]. +The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor. ## Project Information @@ -12,7 +12,7 @@ SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www. ## User Feedback and Support -If you have any problems with or questions about this image, please contact us through a [dev.onlyoffice.org][1]. +If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1]. [1]: http://dev.onlyoffice.org [2]: https://github.com/ONLYOFFICE/DocumentServer From 2d1b5ea522657211f33f48082767bc0ec13cf3ad Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Jun 2016 11:56:15 +0300 Subject: [PATCH 3/8] =?UTF-8?q?[DE]=20=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20light-?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20(=D1=81=D0=BE=D0=BA?= =?UTF-8?q?=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D1=8F=20=D1=82=D1=83=D0=BB=D0=B1=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=20+=20=D1=81=D0=BA=D1=80=D1=8B=D1=82=D1=8B=20=D1=87?= =?UTF-8?q?=D0=B0=D1=82,=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B8,=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8?= =?UTF-8?q?=D0=BD=D1=8B,=20=D1=80=D0=B5=D1=86=D0=B5=D0=BD=D0=B7=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/documenteditor/main/app/controller/LeftMenu.js | 8 ++++---- apps/documenteditor/main/app/controller/Main.js | 9 ++++++--- apps/documenteditor/main/app/controller/Statusbar.js | 8 ++++---- apps/documenteditor/main/app/view/Statusbar.js | 2 +- apps/documenteditor/main/app/view/Toolbar.js | 5 +++-- apps/documenteditor/main/app/view/Viewport.js | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 305c48749..70c36c3a5 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -158,11 +158,11 @@ define([ createDelayedElements: function() { /** coauthoring begin **/ if ( this.mode.canCoAuthoring ) { - this.leftMenu.btnComments[this.mode.isEdit&&this.mode.canComments ? 'show' : 'hide'](); + this.leftMenu.btnComments[(this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide'](); if (this.mode.canComments) this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments')); - this.leftMenu.btnChat[this.mode.canChat ? 'show' : 'hide'](); + this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide'](); if (this.mode.canChat) this.leftMenu.setOptionsPanel('chat', this.getApplication().getController('Common.Controllers.Chat').getView('Common.Views.Chat')); } else { @@ -574,13 +574,13 @@ define([ break; /** coauthoring begin **/ case 'chat': - if (this.mode.canCoAuthoring && this.mode.canChat) { + if (this.mode.canCoAuthoring && this.mode.canChat && !this.mode.isLightVersion) { Common.UI.Menu.Manager.hideAll(); this.leftMenu.showMenu('chat'); } return false; case 'comments': - if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments) { + if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) { Common.UI.Menu.Manager.hideAll(); this.leftMenu.showMenu('comments'); this.getApplication().getController('Common.Controllers.Comments').onAfterShow(); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 2e79d0c1f..a3ff4be52 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -829,9 +829,11 @@ define([ application.getController('Common.Controllers.ExternalDiagramEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization}); application.getController('Common.Controllers.ExternalMergeEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization}); - pluginsController.setApi(this.api); - this.updatePluginsList(this.plugins); - this.api.asc_registerCallback('asc_onPluginsInit', _.bind(this.updatePluginsList, this)); + if (!me.appOptions.isLightVersion) { + pluginsController.setApi(me.api); + me.updatePluginsList(me.plugins); + me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me)); + } documentHolderController.setApi(me.api); documentHolderController.createDelayedElements(); @@ -930,6 +932,7 @@ define([ this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review; this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; + this.appOptions.isLightVersion = params.asc_getIsLight(); this.appOptions.isOffline = this.api.asc_isOffline(); this.appOptions.isReviewOnly = (this.permissions.review === true) && (this.permissions.edit === false); this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights; diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index dff936258..9c9c5a201 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -181,10 +181,10 @@ define([ }); value = Common.localStorage.getItem("de-track-changes-tip"); - this.showTrackChangesTip = !(value && parseInt(value) == 1); + this.showTrackChangesTip = !(value && parseInt(value) == 1) && !this.statusbar.mode.isLightVersion; value = Common.localStorage.getItem("de-new-changes"); - this.showNewChangesTip = !(value && parseInt(value) == 1); + this.showNewChangesTip = !(value && parseInt(value) == 1) && !this.statusbar.mode.isLightVersion; if (this.statusbar.mode.isReviewOnly) { var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl); @@ -207,7 +207,7 @@ define([ var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl); (this.api.asc_HaveRevisionsChanges()) ? iconEl.removeClass(this.statusbar.btnReviewCls).addClass('btn-ic-changes') : iconEl.removeClass('btn-ic-changes').addClass(this.statusbar.btnReviewCls); if (value!==null && parseInt(value) == 1) { - this.changeReviewStatus(true); + this.changeReviewStatus(!this.statusbar.mode.isLightVersion); // show tooltip "track changes in this document" and change icon if (this.showTrackChangesTip && !statusbarIsHidden){ this.statusbar.btnReview.updateHint(''); @@ -300,7 +300,7 @@ define([ if (this.api) { this.api.asc_SetTrackRevisions(state); } - this.showHideReviewChangesPanel(state); + this.showHideReviewChangesPanel(state && !this.statusbar.mode.isLightVersion); }, showHideReviewChangesPanel: function(state) { diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index d0eea1170..ce82c50ae 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -380,7 +380,7 @@ define([ setMode: function(mode) { this.mode = mode; this.$el.find('.el-edit')[mode.isEdit?'show':'hide'](); - this.$el.find('.el-review')[mode.canReview?'show':'hide'](); + this.$el.find('.el-review')[(mode.canReview && !mode.isLightVersion)?'show':'hide'](); this.lblChangeRights[(!this.mode.isOffline && !this.mode.isReviewOnly && this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length)?'show':'hide'](); this.panelUsers[(!this.mode.isOffline && !this.mode.isReviewOnly && this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length)?'show':'hide'](); }, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index b72277cd4..414026965 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1237,7 +1237,7 @@ define([ return this; }, - render: function () { + render: function (mode) { var me = this; /** @@ -1247,7 +1247,7 @@ define([ this.trigger('render:before', this); var value = Common.localStorage.getItem("de-compact-toolbar"); - var valueCompact = (value !== null && parseInt(value) == 1); + var valueCompact = (mode.isLightVersion || value !== null && parseInt(value) == 1); value = Common.localStorage.getItem("de-hidden-title"); var valueTitle = (value !== null && parseInt(value) == 1); @@ -1258,6 +1258,7 @@ define([ value = Common.localStorage.getItem("de-hidden-rulers"); var valueRulers = (value !== null && parseInt(value) == 1); + this.mnuitemCompactToolbar.setVisible(!mode.isLightVersion); this.mnuitemCompactToolbar.setChecked(valueCompact, true); this.mnuitemHideTitleBar.setChecked(valueTitle, true); this.mnuitemHideStatusBar.setChecked(valueStatus, true); diff --git a/apps/documenteditor/main/app/view/Viewport.js b/apps/documenteditor/main/app/view/Viewport.js index b116052bc..9ee9740dd 100644 --- a/apps/documenteditor/main/app/view/Viewport.js +++ b/apps/documenteditor/main/app/view/Viewport.js @@ -140,7 +140,7 @@ define([ rightMenuView = DE.getController('RightMenu').getView('RightMenu'), statusBarView = DE.getController('Statusbar').getView('Statusbar'); - me._toolbar = toolbarView.render(); + me._toolbar = toolbarView.render(this.mode); me._rightMenu = rightMenuView.render(this.mode); var value = Common.localStorage.getItem('de-hidden-status'); From 68ba02c5b81bbd8a62ce0315abbd3fce2acbc75e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Jun 2016 12:38:54 +0300 Subject: [PATCH 4/8] [PE][SSE] Limitations for light version (compact toolbar + hide chat/comments). --- .../main/app/controller/LeftMenu.js | 8 ++++---- apps/presentationeditor/main/app/controller/Main.js | 1 + apps/presentationeditor/main/app/view/Toolbar.js | 9 ++++++--- apps/presentationeditor/main/app/view/Viewport.js | 2 +- .../spreadsheeteditor/main/app/controller/LeftMenu.js | 8 ++++---- apps/spreadsheeteditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/main/app/view/Toolbar.js | 11 ++++++----- apps/spreadsheeteditor/main/app/view/Viewport.js | 9 ++------- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 15c927455..e5d1f2100 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -155,11 +155,11 @@ define([ createDelayedElements: function() { /** coauthoring begin **/ if ( this.mode.canCoAuthoring ) { - this.leftMenu.btnComments[this.mode.isEdit&&this.mode.canComments ? 'show' : 'hide'](); + this.leftMenu.btnComments[(this.mode.isEdit&&this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide'](); if (this.mode.canComments) this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments')); - this.leftMenu.btnChat[this.mode.canChat ? 'show' : 'hide'](); + this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide'](); if (this.mode.canChat) this.leftMenu.setOptionsPanel('chat', this.getApplication().getController('Common.Controllers.Chat').getView('Common.Views.Chat')); } else { @@ -454,13 +454,13 @@ define([ break; /** coauthoring begin **/ case 'chat': - if (this.mode.canCoAuthoring && this.mode.canChat && (!previewPanel || !previewPanel.isVisible())){ + if (this.mode.canCoAuthoring && this.mode.canChat && !this.mode.isLightVersion && (!previewPanel || !previewPanel.isVisible())){ Common.UI.Menu.Manager.hideAll(); this.leftMenu.showMenu('chat'); } return false; case 'comments': - if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && (!previewPanel || !previewPanel.isVisible()) && !this._state.no_slides) { + if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion && (!previewPanel || !previewPanel.isVisible()) && !this._state.no_slides) { Common.UI.Menu.Manager.hideAll(); this.leftMenu.showMenu('comments'); this.getApplication().getController('Common.Controllers.Comments').onAfterShow(); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 61fe5e98e..5d7f6e646 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -712,6 +712,7 @@ define([ /** coauthoring end **/ this.appOptions.isOffline = this.api.asc_isOffline(); this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; + this.appOptions.isLightVersion = params.asc_getIsLight(); this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights; this.appOptions.canEdit = this.permissions.edit !== false && // can edit (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index dc60f9e9e..82f71dc91 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -213,7 +213,9 @@ define([ }); me.slideOnlyControls.push(me.btnChangeSlide); me.listenTo(PE.getCollection('SlideLayouts'), 'reset', function() { - me.mnuChangeSlidePicker._needRecalcSlideLayout = me.mnuAddSlidePicker._needRecalcSlideLayout = true; + me.mnuAddSlidePicker._needRecalcSlideLayout = true; + if (me.mnuChangeSlidePicker) + me.mnuChangeSlidePicker._needRecalcSlideLayout = true; }); me.btnPreview = new Common.UI.Button({ @@ -1145,7 +1147,7 @@ define([ }); }, - render: function () { + render: function (mode) { var me = this, el = $(this.el); @@ -1156,7 +1158,7 @@ define([ this.trigger('render:before', this); var value = Common.localStorage.getItem('pe-compact-toolbar'); - var valueCompact = (value!==null && parseInt(value) == 1); + var valueCompact = (mode.isLightVersion || value!==null && parseInt(value) == 1); value = Common.localStorage.getItem('pe-hidden-title'); var valueTitle = (value!==null && parseInt(value) == 1); @@ -1167,6 +1169,7 @@ define([ value = Common.localStorage.getItem("pe-hidden-rulers"); var valueRulers = (value !== null && parseInt(value) == 1); + me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion); me.mnuitemCompactToolbar.setChecked(valueCompact); me.mnuitemHideTitleBar.setChecked(valueTitle); me.mnuitemHideStatusBar.setChecked(valueStatus); diff --git a/apps/presentationeditor/main/app/view/Viewport.js b/apps/presentationeditor/main/app/view/Viewport.js index 155e81817..03ef2a490 100644 --- a/apps/presentationeditor/main/app/view/Viewport.js +++ b/apps/presentationeditor/main/app/view/Viewport.js @@ -131,7 +131,7 @@ define([ rightMenuView = PE.getController('RightMenu').getView('RightMenu'), statusBarView = PE.getController('Statusbar').getView('Statusbar'); - me._toolbar = toolbarView.render(); + me._toolbar = toolbarView.render(this.mode); me._rightMenu = rightMenuView.render(); var value = Common.localStorage.getItem('pe-hidden-status'); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 9aac71131..ba09e9f45 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -163,11 +163,11 @@ define([ createDelayedElements: function() { /** coauthoring begin **/ if ( this.mode.canCoAuthoring ) { - this.leftMenu.btnComments[this.mode.isEdit&&this.mode.canComments ? 'show' : 'hide'](); + this.leftMenu.btnComments[(this.mode.isEdit&&this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide'](); if (this.mode.canComments) this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments')); - this.leftMenu.btnChat[this.mode.canChat ? 'show' : 'hide'](); + this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide'](); if (this.mode.canChat) this.leftMenu.setOptionsPanel('chat', this.getApplication().getController('Common.Controllers.Chat').getView('Common.Views.Chat')); } else { @@ -621,13 +621,13 @@ define([ break; /** coauthoring begin **/ case 'chat': - if (this.mode.canCoAuthoring && this.mode.canChat) { + if (this.mode.canCoAuthoring && this.mode.canChat && !this.mode.isLightVersion) { Common.UI.Menu.Manager.hideAll(); this.leftMenu.showMenu('chat'); } return false; case 'comments': - if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments) { + if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) { Common.UI.Menu.Manager.hideAll(); this.leftMenu.showMenu('comments'); this.getApplication().getController('Common.Controllers.Comments').onAfterShow(); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 70dd71153..028b7100e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -727,6 +727,7 @@ define([ /** coauthoring end **/ this.appOptions.isOffline = this.api.asc_isOffline(); this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; + this.appOptions.isLightVersion = params.asc_getIsLight(); this.appOptions.canComments = this.appOptions.canLicense && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false); this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 941da9cc5..9e07e7b8a 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1567,7 +1567,7 @@ define([ }); }, - render: function (isEditDiagram, isEditMailMerge) { + render: function (mode) { var me = this, el = $(this.el); @@ -1579,8 +1579,9 @@ define([ JSON.parse(Common.localStorage.getItem('sse-hidden-title')) && (options.title = true); JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true); JSON.parse(Common.localStorage.getItem('sse-hidden-headings')) && (options.headings = true); - var isCompactView = !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact')); + var isCompactView = mode.isLightVersion || !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact')); + me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion); me.mnuitemCompactToolbar.setChecked(isCompactView); me.mnuitemHideTitleBar.setChecked(!!options.title); me.mnuitemHideFormulaBar.setChecked(!!options.formula); @@ -1589,12 +1590,12 @@ define([ this.trigger('render:before', this); el.html(this.template({ - isEditDiagram: isEditDiagram, - isEditMailMerge: isEditMailMerge, + isEditDiagram: mode.isEditDiagram, + isEditMailMerge: mode.isEditMailMerge, isCompactView: isCompactView })); - me.rendererComponents(isEditDiagram ? 'diagram' : (isEditMailMerge ? 'merge' : isCompactView ? 'short' : 'full')); + me.rendererComponents(mode.isEditDiagram ? 'diagram' : (mode.isEditMailMerge ? 'merge' : isCompactView ? 'short' : 'full')); this.trigger('render:after', this); diff --git a/apps/spreadsheeteditor/main/app/view/Viewport.js b/apps/spreadsheeteditor/main/app/view/Viewport.js index 9423fab86..fd40998b6 100644 --- a/apps/spreadsheeteditor/main/app/view/Viewport.js +++ b/apps/spreadsheeteditor/main/app/view/Viewport.js @@ -146,14 +146,9 @@ define([ var me = this, toolbarView = SSE.getController('Toolbar').getView('Toolbar'), rightMenuView = SSE.getController('RightMenu').getView('RightMenu'); -// statusBarView = SSE.getController('Statusbar').getView('Statusbar'); -// - me._toolbar = toolbarView.render(this.mode.isEditDiagram, this.mode.isEditMailMerge); + + me._toolbar = toolbarView.render(this.mode); me._rightMenu = rightMenuView.render(); -// -// var value = Common.localStorage.getItem('de-hidden-status'); -// if (value !== null && parseInt(value) == 1) -// statusBarView.setVisible(false); }, setMode: function(mode, delay) { From 85aeff23a5d54622240a3cc0d4d747b4bdb3c5f0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Jun 2016 13:41:25 +0300 Subject: [PATCH 5/8] Update translations. --- apps/documenteditor/main/locale/es.json | 42 ++--- apps/presentationeditor/main/locale/es.json | 10 +- apps/spreadsheeteditor/main/locale/es.json | 196 ++++++++++---------- 3 files changed, 124 insertions(+), 124 deletions(-) diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index 559804b39..64c6af1a8 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -233,11 +233,11 @@ "DE.Controllers.Main.splitMaxColsErrorText": "El número de columnas debe ser menos que %1.", "DE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.", "DE.Controllers.Main.textAnonymous": "Anónimo", - "DE.Controllers.Main.textBuyNow": "Visit website", + "DE.Controllers.Main.textBuyNow": "Comprar ahora", "DE.Controllers.Main.textCloseTip": "\nPulse para cerrar el consejo", - "DE.Controllers.Main.textContactUs": "Contact sales", + "DE.Controllers.Main.textContactUs": "Ponga en contacto con nosotros", "DE.Controllers.Main.textLoadingDocument": "Cargando documento", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", + "DE.Controllers.Main.textNoLicenseTitle": "Licencia ha expirado o no ha encontrado", "DE.Controllers.Main.textStrict": "Modo estricto", "DE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.
Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.", "DE.Controllers.Main.titleUpdateVersion": "Versión ha cambiado", @@ -267,7 +267,7 @@ "DE.Controllers.Main.uploadImageTitleText": "Subiendo imagen", "DE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior", "DE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.", - "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", + "DE.Controllers.Main.warnNoLicense": "La licencia ha expirado o no ha sido encontrada. No puede editar archivos.
Haga clic en el botón 'Comprar ahora' para comprar una licencia Enterprise Edition o ´Contactar con nosotros´ si usa Intergration Edition.", "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado", "DE.Controllers.Statusbar.textHasChanges": "Nuevos cambios han sido encontrado", "DE.Controllers.Statusbar.textTrackChanges": "El documento se abre con el modo de cambio de pista activado", @@ -909,7 +909,7 @@ "DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto", "DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo", "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro", - "DE.Views.FileMenuPanels.Settings.txtInch": "Inch", + "DE.Views.FileMenuPanels.Settings.txtInch": "Pulgada", "DE.Views.FileMenuPanels.Settings.txtInput": "Entrada alternativa", "DE.Views.FileMenuPanels.Settings.txtLast": "Ver últimos", "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Demostración de Comentarios", @@ -961,10 +961,10 @@ "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar", "DE.Views.ImageSettingsAdvanced.okButtonText": "Aceptar", "DE.Views.ImageSettingsAdvanced.strMargins": "Márgenes interiores", - "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute", + "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluto", "DE.Views.ImageSettingsAdvanced.textAlignment": "Alineación", "DE.Views.ImageSettingsAdvanced.textArrows": "Flechas", - "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Lock aspect ratio", + "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Bloquear relación de aspecto", "DE.Views.ImageSettingsAdvanced.textBeginSize": "Tamaño inicial", "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Estilo inicial", "DE.Views.ImageSettingsAdvanced.textBelow": "abajo", @@ -999,7 +999,7 @@ "DE.Views.ImageSettingsAdvanced.textPosition": "Posición", "DE.Views.ImageSettingsAdvanced.textPositionPc": "Posición Relativa", "DE.Views.ImageSettingsAdvanced.textRelative": "en relación a\n", - "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relative", + "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relativo", "DE.Views.ImageSettingsAdvanced.textRight": "Derecho", "DE.Views.ImageSettingsAdvanced.textRightMargin": "Margen derecho", "DE.Views.ImageSettingsAdvanced.textRightOf": "a la derecha de", @@ -1307,7 +1307,7 @@ "DE.Views.TableSettingsAdvanced.okButtonText": "Aceptar", "DE.Views.TableSettingsAdvanced.textAlign": "Alineación", "DE.Views.TableSettingsAdvanced.textAlignment": "Alineación", - "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Permitir espacio entre celdas", + "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacio entre celdas", "DE.Views.TableSettingsAdvanced.textAnchorText": "Texto", "DE.Views.TableSettingsAdvanced.textAutofit": "Cambiar tamaño automáticamente para ajustar a contenido", "DE.Views.TableSettingsAdvanced.textBackColor": "Fondo de celda", @@ -1317,13 +1317,13 @@ "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Bordes y fondo", "DE.Views.TableSettingsAdvanced.textBorderWidth": "Tamaño de borde", "DE.Views.TableSettingsAdvanced.textBottom": "Inferior", - "DE.Views.TableSettingsAdvanced.textCellOptions": "Cell Options", - "DE.Views.TableSettingsAdvanced.textCellProps": "Propiedades de la celda", - "DE.Views.TableSettingsAdvanced.textCellSize": "Cell Size", + "DE.Views.TableSettingsAdvanced.textCellOptions": "Opciones de celda", + "DE.Views.TableSettingsAdvanced.textCellProps": "Celda", + "DE.Views.TableSettingsAdvanced.textCellSize": "Tamaño de Celda", "DE.Views.TableSettingsAdvanced.textCenter": "Al centro", "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Al centro", "DE.Views.TableSettingsAdvanced.textCheckMargins": "Usar márgenes predeterminados", - "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Márgenes predeterminados", + "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Márgenes de celda predeterminados", "DE.Views.TableSettingsAdvanced.textDistance": "Distancia del texto", "DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal ", "DE.Views.TableSettingsAdvanced.textIndLeft": "Sangría a la izquierda", @@ -1331,7 +1331,7 @@ "DE.Views.TableSettingsAdvanced.textLeftTooltip": "Izquierdo", "DE.Views.TableSettingsAdvanced.textMargin": "Margen", "DE.Views.TableSettingsAdvanced.textMargins": "Márgenes de celda", - "DE.Views.TableSettingsAdvanced.textMeasure": "Measure in", + "DE.Views.TableSettingsAdvanced.textMeasure": "medir en", "DE.Views.TableSettingsAdvanced.textMove": "Desplazar objeto con texto", "DE.Views.TableSettingsAdvanced.textNewColor": "Añadir Color Personalizado Nuevo", "DE.Views.TableSettingsAdvanced.textOnlyCells": "Sólo para celdas seleccionadas", @@ -1339,17 +1339,17 @@ "DE.Views.TableSettingsAdvanced.textOverlap": "Superposición", "DE.Views.TableSettingsAdvanced.textPage": "Página", "DE.Views.TableSettingsAdvanced.textPosition": "Posición", - "DE.Views.TableSettingsAdvanced.textPrefWidth": "Preferred width", + "DE.Views.TableSettingsAdvanced.textPrefWidth": "Anchura Preferida", "DE.Views.TableSettingsAdvanced.textPreview": "Vista previa", "DE.Views.TableSettingsAdvanced.textRelative": "en relación a\n", "DE.Views.TableSettingsAdvanced.textRight": "Derecho", "DE.Views.TableSettingsAdvanced.textRightOf": "a la derecha de", "DE.Views.TableSettingsAdvanced.textRightTooltip": "Derecho", "DE.Views.TableSettingsAdvanced.textStandartColors": "Colores estándar", - "DE.Views.TableSettingsAdvanced.textTable": "Table", + "DE.Views.TableSettingsAdvanced.textTable": "Tabla", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Fondo de tabla", - "DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position", - "DE.Views.TableSettingsAdvanced.textTableSize": "Table Size", + "DE.Views.TableSettingsAdvanced.textTablePosition": "Posición de la tabla", + "DE.Views.TableSettingsAdvanced.textTableSize": "Tamaño de tabla", "DE.Views.TableSettingsAdvanced.textThemeColors": "Colores de tema", "DE.Views.TableSettingsAdvanced.textTitle": "Tabla - Ajustes avanzados", "DE.Views.TableSettingsAdvanced.textTop": "Superior", @@ -1359,8 +1359,8 @@ "DE.Views.TableSettingsAdvanced.textWrap": "Ajuste de texto", "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Tabla en línea", "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Tabla flujo", - "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style", - "DE.Views.TableSettingsAdvanced.textWrapText": "Wrap text", + "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Ajuste de texto", + "DE.Views.TableSettingsAdvanced.textWrapText": "Ajustar texto", "DE.Views.TableSettingsAdvanced.tipAll": "Fijar borde exterior y todas líneas interiores ", "DE.Views.TableSettingsAdvanced.tipCellAll": "Fijar bordes sólo para celdas interiores", "DE.Views.TableSettingsAdvanced.tipCellInner": "Fijar líneas verticales y horizontales sólo para celdas interiores", @@ -1372,7 +1372,7 @@ "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Fijar borde exterior y líneas verticales y horizontales para celdas inferiores", "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Fijar borde de tabla exterior y bordes exteriores para celdas interiores", "DE.Views.TableSettingsAdvanced.txtCm": "Centímetro", - "DE.Views.TableSettingsAdvanced.txtInch": "Inch", + "DE.Views.TableSettingsAdvanced.txtInch": "Pulgada", "DE.Views.TableSettingsAdvanced.txtNoBorders": "Sin bordes", "DE.Views.TableSettingsAdvanced.txtPercent": "Por ciento", "DE.Views.TableSettingsAdvanced.txtPt": "Punto", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index ee736cc9b..df287d909 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -146,11 +146,11 @@ "PE.Controllers.Main.splitMaxColsErrorText": "El número de columnas debe ser menos que %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.", "PE.Controllers.Main.textAnonymous": "Anónimo", - "PE.Controllers.Main.textBuyNow": "Visit website", - "PE.Controllers.Main.textCloseTip": "\nPulse para cerrar el consejo", - "PE.Controllers.Main.textContactUs": "Contact sales", + "PE.Controllers.Main.textBuyNow": "Comprar ahora", + "PE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo", + "PE.Controllers.Main.textContactUs": "Ponga en contacto con nosotros", "PE.Controllers.Main.textLoadingDocument": "Cargando presentación", - "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", + "PE.Controllers.Main.textNoLicenseTitle": "Licencia ha expirado o no ha encontrado", "PE.Controllers.Main.textShape": "Forma", "PE.Controllers.Main.textStrict": "Modo estricto", "PE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.
Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.", @@ -215,7 +215,7 @@ "PE.Controllers.Main.uploadImageTitleText": "Subiendo imagen", "PE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior", "PE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.", - "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", + "PE.Controllers.Main.warnNoLicense": "La licencia ha expirado o no ha sido encontrada. No puede editar archivos.
Haga clic en el botón 'Comprar ahora' para comprar una licencia Enterprise Edition o ´Contactar con nosotros´ si usa Intergration Edition.", "PE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "El tipo de letra que usted va a guardar no está disponible en este dispositivo.
El estilo de letra se mostrará usando uno de los tipos de letra del dispositivo, el tipo de letra guardado va a usarse cuando esté disponible.
¿Desea continuar?", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 8d7138860..6b48d4d73 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -112,7 +112,7 @@ "SSE.Controllers.LeftMenu.textWorkbook": "Libro de trabajo", "SSE.Controllers.LeftMenu.warnDownloadAs": "Si sigue guardando en este formato todas las características a excepción del texto se perderán.
¿Está seguro de que quiere continuar?", "SSE.Controllers.Main.confirmMoveCellRange": "El rango de celdas final puede contener los datos. ¿Quiere continuar?", - "SSE.Controllers.Main.confirmPutMergeRange": "The source data contained merged cells.
They had been unmerged before they were pasted into the table.", + "SSE.Controllers.Main.confirmPutMergeRange": "Los datos de origen contienen celdas combinadas.
Habían estado sin combinar antes de que se pegaran en la tabla.", "SSE.Controllers.Main.convertationErrorText": "Fallo de conversión.", "SSE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión superado.", "SSE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar a la lista de documentos.", @@ -183,13 +183,13 @@ "SSE.Controllers.Main.saveTextText": "Guardando hoja de cálculo...", "SSE.Controllers.Main.saveTitleText": "Guardando hoja de cálculo", "SSE.Controllers.Main.textAnonymous": "Anónimo", - "SSE.Controllers.Main.textBuyNow": "Visit website", + "SSE.Controllers.Main.textBuyNow": "Comprar ahora", "SSE.Controllers.Main.textCloseTip": "\nPulse para cerrar el consejo", "SSE.Controllers.Main.textConfirm": "Confirmación", - "SSE.Controllers.Main.textContactUs": "Contact sales", - "SSE.Controllers.Main.textLoadingDocument": "Cargando documento", + "SSE.Controllers.Main.textContactUs": "Ponga en contacto con nosotros", + "SSE.Controllers.Main.textLoadingDocument": "Cargando hoja de cálculo", "SSE.Controllers.Main.textNo": "No", - "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", + "SSE.Controllers.Main.textNoLicenseTitle": "Licencia ha expirado o no ha encontrado", "SSE.Controllers.Main.textPleaseWait": "El proceso puede durar un buen rato. Espere por favor...", "SSE.Controllers.Main.textRecalcFormulas": "Calculando formulas...", "SSE.Controllers.Main.textShape": "Forma", @@ -221,7 +221,7 @@ "SSE.Controllers.Main.uploadImageTitleText": "Subiendo imagen", "SSE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior", "SSE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.", - "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", + "SSE.Controllers.Main.warnNoLicense": "La licencia ha expirado o no ha sido encontrada. No puede editar archivos.
Haga clic en el botón 'Comprar ahora' para comprar una licencia Enterprise Edition o ´Contactar con nosotros´ si usa Intergration Edition.", "SSE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.", "SSE.Controllers.Print.strAllSheets": "Todas las hojas", "SSE.Controllers.Print.textWarning": "Aviso", @@ -239,37 +239,37 @@ "SSE.Views.AutoFilterDialog.btnCustomFilter": "Filtro personalizado", "SSE.Views.AutoFilterDialog.cancelButtonText": "Cancelar", "SSE.Views.AutoFilterDialog.okButtonText": "OK", - "SSE.Views.AutoFilterDialog.textAddSelection": "Add current selection to filter", + "SSE.Views.AutoFilterDialog.textAddSelection": "Añadir selección actual para filtración", "SSE.Views.AutoFilterDialog.textEmptyItem": "{Blanks}", "SSE.Views.AutoFilterDialog.textSelectAll": "Seleccionar todo", - "SSE.Views.AutoFilterDialog.textSelectAllResults": "Select All Search Results", + "SSE.Views.AutoFilterDialog.textSelectAllResults": "Seleccionar todos los resultados de la búsqueda", "SSE.Views.AutoFilterDialog.textWarning": "Aviso", - "SSE.Views.AutoFilterDialog.txtAboveAve": "Above average", - "SSE.Views.AutoFilterDialog.txtBegins": "Begins with...", - "SSE.Views.AutoFilterDialog.txtBelowAve": "Below average", - "SSE.Views.AutoFilterDialog.txtBetween": "Between...", - "SSE.Views.AutoFilterDialog.txtClear": "Clear", - "SSE.Views.AutoFilterDialog.txtContains": "Contains...", + "SSE.Views.AutoFilterDialog.txtAboveAve": "Sobre la media", + "SSE.Views.AutoFilterDialog.txtBegins": "Empieza con...", + "SSE.Views.AutoFilterDialog.txtBelowAve": "Por debajo de la media", + "SSE.Views.AutoFilterDialog.txtBetween": "Entre...", + "SSE.Views.AutoFilterDialog.txtClear": "Borrar", + "SSE.Views.AutoFilterDialog.txtContains": "Contiene...", "SSE.Views.AutoFilterDialog.txtEmpty": "Introducir filtro para celda", - "SSE.Views.AutoFilterDialog.txtEnds": "Ends with...", - "SSE.Views.AutoFilterDialog.txtEquals": "Equals...", - "SSE.Views.AutoFilterDialog.txtFilterCellColor": "Filter by cells color", - "SSE.Views.AutoFilterDialog.txtFilterFontColor": "Filter by font color", - "SSE.Views.AutoFilterDialog.txtGreater": "Greater than...", - "SSE.Views.AutoFilterDialog.txtGreaterEquals": "Greater than or equal to...", - "SSE.Views.AutoFilterDialog.txtLess": "Less than...", - "SSE.Views.AutoFilterDialog.txtLessEquals": "Less than or equal to...", - "SSE.Views.AutoFilterDialog.txtNotBegins": "Does not begin with...", - "SSE.Views.AutoFilterDialog.txtNotContains": "Does not contain...", - "SSE.Views.AutoFilterDialog.txtNotEnds": "Does not end with...", - "SSE.Views.AutoFilterDialog.txtNotEquals": "Does not equal...", - "SSE.Views.AutoFilterDialog.txtNumFilter": "Number filter", - "SSE.Views.AutoFilterDialog.txtReapply": "Reapply", - "SSE.Views.AutoFilterDialog.txtSortCellColor": "Sort by cells color", - "SSE.Views.AutoFilterDialog.txtSortFontColor": "Sort by font color", - "SSE.Views.AutoFilterDialog.txtSortHigh2Low": "Sort Highest to Lowest", - "SSE.Views.AutoFilterDialog.txtSortLow2High": "Sort Lowest to Highest", - "SSE.Views.AutoFilterDialog.txtTextFilter": "Text filter", + "SSE.Views.AutoFilterDialog.txtEnds": "Termina en...", + "SSE.Views.AutoFilterDialog.txtEquals": "Igual...", + "SSE.Views.AutoFilterDialog.txtFilterCellColor": "Filtrar por color de celdas", + "SSE.Views.AutoFilterDialog.txtFilterFontColor": "Filtrar por color de la letra", + "SSE.Views.AutoFilterDialog.txtGreater": "Mayor qué...", + "SSE.Views.AutoFilterDialog.txtGreaterEquals": "Mayor qué o igual a...", + "SSE.Views.AutoFilterDialog.txtLess": "Menos que...", + "SSE.Views.AutoFilterDialog.txtLessEquals": "Menos que o igual a...", + "SSE.Views.AutoFilterDialog.txtNotBegins": "No empieza con...", + "SSE.Views.AutoFilterDialog.txtNotContains": "No contiene...", + "SSE.Views.AutoFilterDialog.txtNotEnds": "No termina en...", + "SSE.Views.AutoFilterDialog.txtNotEquals": "No es igual...", + "SSE.Views.AutoFilterDialog.txtNumFilter": "Número de filtro", + "SSE.Views.AutoFilterDialog.txtReapply": "Reaplicar", + "SSE.Views.AutoFilterDialog.txtSortCellColor": "Ordenar por el color de celdas", + "SSE.Views.AutoFilterDialog.txtSortFontColor": "Ordenar por color de la letra", + "SSE.Views.AutoFilterDialog.txtSortHigh2Low": "Ordenar de mayor a menor", + "SSE.Views.AutoFilterDialog.txtSortLow2High": "Ordenar de menor a mayor ", + "SSE.Views.AutoFilterDialog.txtTextFilter": "Filtro de Texto", "SSE.Views.AutoFilterDialog.txtTitle": "Filtro", "SSE.Views.AutoFilterDialog.txtTop10": "Top 10", "SSE.Views.AutoFilterDialog.warnNoSelected": "Usted debe elegir por lo menos un valor", @@ -425,24 +425,24 @@ "SSE.Views.DocumentHolder.bottomCellText": "Alinear en la parte inferior", "SSE.Views.DocumentHolder.centerCellText": "Alinear al centro", "SSE.Views.DocumentHolder.chartText": "Ajustes avanzados de gráfico", - "SSE.Views.DocumentHolder.deleteColumnText": "Delete Column", - "SSE.Views.DocumentHolder.deleteRowText": "Delete Row", - "SSE.Views.DocumentHolder.deleteTableText": "Delete Table", + "SSE.Views.DocumentHolder.deleteColumnText": "Borrar columna", + "SSE.Views.DocumentHolder.deleteRowText": "Borrar fila", + "SSE.Views.DocumentHolder.deleteTableText": "Borrar tabla", "SSE.Views.DocumentHolder.direct270Text": "Girar a 270°", "SSE.Views.DocumentHolder.direct90Text": "Girar a 90°", "SSE.Views.DocumentHolder.directHText": "Horizontal ", "SSE.Views.DocumentHolder.directionText": "Dirección de texto", "SSE.Views.DocumentHolder.editChartText": "Editar datos", "SSE.Views.DocumentHolder.editHyperlinkText": "Editar hiperenlace", - "SSE.Views.DocumentHolder.insertColumnLeftText": "Insert Column Left", - "SSE.Views.DocumentHolder.insertColumnRightText": "Insert Column Right", - "SSE.Views.DocumentHolder.insertRowAboveText": "Insert Row Above", - "SSE.Views.DocumentHolder.insertRowBelowText": "Insert Row Below", + "SSE.Views.DocumentHolder.insertColumnLeftText": "Insertar columna a la izquierda", + "SSE.Views.DocumentHolder.insertColumnRightText": "Insertar columna a la derecha", + "SSE.Views.DocumentHolder.insertRowAboveText": "Insertar fila arriba", + "SSE.Views.DocumentHolder.insertRowBelowText": "Insertar fila abajo", "SSE.Views.DocumentHolder.removeHyperlinkText": "Eliminar hiperenlace", - "SSE.Views.DocumentHolder.selectColumnText": "Select Entire Column", - "SSE.Views.DocumentHolder.selectDataText": "Select Column Data", - "SSE.Views.DocumentHolder.selectRowText": "Select Row", - "SSE.Views.DocumentHolder.selectTableText": "Select Table", + "SSE.Views.DocumentHolder.selectColumnText": "Seleccionar toda la columna", + "SSE.Views.DocumentHolder.selectDataText": "Seleccionar datos de columna", + "SSE.Views.DocumentHolder.selectRowText": "Seleccionar fila", + "SSE.Views.DocumentHolder.selectTableText": "Seleccionar tabla", "SSE.Views.DocumentHolder.textArrangeBack": "Enviar al fondo", "SSE.Views.DocumentHolder.textArrangeBackward": "Enviar atrás", "SSE.Views.DocumentHolder.textArrangeForward": "Traer adelante", @@ -467,28 +467,28 @@ "SSE.Views.DocumentHolder.txtDelete": "Borrar", "SSE.Views.DocumentHolder.txtDescending": "Descendente", "SSE.Views.DocumentHolder.txtEditComment": "Editar comentario", - "SSE.Views.DocumentHolder.txtFilter": "Filter", - "SSE.Views.DocumentHolder.txtFilterCellColor": "Filter by cell's color", - "SSE.Views.DocumentHolder.txtFilterFontColor": "Filter by font color", - "SSE.Views.DocumentHolder.txtFilterValue": "Filter by Selected cell's value", + "SSE.Views.DocumentHolder.txtFilter": "Filtro", + "SSE.Views.DocumentHolder.txtFilterCellColor": "Filtrar por color de celda", + "SSE.Views.DocumentHolder.txtFilterFontColor": "Filtrar por color de la letra", + "SSE.Views.DocumentHolder.txtFilterValue": "Filtrar por valor de celda seleccionado", "SSE.Views.DocumentHolder.txtFormula": "Insertar función", "SSE.Views.DocumentHolder.txtGroup": "Agrupar", "SSE.Views.DocumentHolder.txtHide": "Ocultar", "SSE.Views.DocumentHolder.txtInsert": "Insertar", "SSE.Views.DocumentHolder.txtInsHyperlink": "Hiperenlace", "SSE.Views.DocumentHolder.txtPaste": "Pegar", - "SSE.Views.DocumentHolder.txtReapply": "Reapply", + "SSE.Views.DocumentHolder.txtReapply": "Reaplicar", "SSE.Views.DocumentHolder.txtRow": "Toda la fila", "SSE.Views.DocumentHolder.txtRowHeight": "Altura de fila", - "SSE.Views.DocumentHolder.txtSelect": "Select", + "SSE.Views.DocumentHolder.txtSelect": "Seleccionar", "SSE.Views.DocumentHolder.txtShiftDown": "Desplazar celdas hacia abajo", "SSE.Views.DocumentHolder.txtShiftLeft": "Desplazar celdas a la izquierda", "SSE.Views.DocumentHolder.txtShiftRight": "Desplazar celdas a la derecha", "SSE.Views.DocumentHolder.txtShiftUp": "Desplazar celdas hacia arriba", "SSE.Views.DocumentHolder.txtShow": "Mostrar", "SSE.Views.DocumentHolder.txtSort": "Ordenar", - "SSE.Views.DocumentHolder.txtSortCellColor": "Selected Cell Color on top", - "SSE.Views.DocumentHolder.txtSortFontColor": "Selected Font Color on top", + "SSE.Views.DocumentHolder.txtSortCellColor": "Color seleccionado en la parte superior de la célula", + "SSE.Views.DocumentHolder.txtSortFontColor": "Color de letra seleccionado en la parte superior", "SSE.Views.DocumentHolder.txtTextAdvanced": "Ajustes avanzados de texto", "SSE.Views.DocumentHolder.txtUngroup": "Desagrupar", "SSE.Views.DocumentHolder.txtWidth": "Ancho", @@ -545,7 +545,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "Centímetro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Alemán", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "Inglés", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Pulgada", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Demostración de Comentarios ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "como OS X", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Nativo", @@ -654,7 +654,7 @@ "SSE.Views.NamedRangeEditDlg.strWorkbook": "Libro de trabajo", "SSE.Views.NamedRangeEditDlg.textDataRange": "Alcance de Datos", "SSE.Views.NamedRangeEditDlg.textExistName": "¡Error! Banda con este nombre ya existe", - "SSE.Views.NamedRangeEditDlg.textInvalidName": "¡ERROR! Nombre de banda no válido", + "SSE.Views.NamedRangeEditDlg.textInvalidName": "El nombre debe comenzar con una letra o un guión bajo y no debe contener caracteres no válidos.", "SSE.Views.NamedRangeEditDlg.textInvalidRange": "¡Error! Alcance de celdas no válido", "SSE.Views.NamedRangeEditDlg.textIsLocked": "ERROR! This element is being edited by another user.", "SSE.Views.NamedRangeEditDlg.textName": "Nombre", @@ -689,7 +689,7 @@ "SSE.Views.NameManagerDlg.tipIsLocked": "Este elemento está editándose por otro usuario.", "SSE.Views.NameManagerDlg.txtTitle": "Administrador de nombre", "SSE.Views.ParagraphSettings.strLineHeight": "Espaciado de línea", - "SSE.Views.ParagraphSettings.strParagraphSpacing": "Espaciado", + "SSE.Views.ParagraphSettings.strParagraphSpacing": "Espaciado de Párafo ", "SSE.Views.ParagraphSettings.strSpacingAfter": "Después", "SSE.Views.ParagraphSettings.strSpacingBefore": "Antes", "SSE.Views.ParagraphSettings.textAdvanced": "Mostrar ajustes avanzados", @@ -758,7 +758,7 @@ "SSE.Views.RightMenu.txtParagraphSettings": "Ajustes de texto", "SSE.Views.RightMenu.txtSettings": "Ajustes comunes", "SSE.Views.RightMenu.txtShapeSettings": "Ajustes de forma", - "SSE.Views.RightMenu.txtTableSettings": "Table Settings", + "SSE.Views.RightMenu.txtTableSettings": "Ajustes de la tabla", "SSE.Views.RightMenu.txtTextArtSettings": "Ajustes de arte de texto", "SSE.Views.SetValueDialog.cancelButtonText": "Cancelar", "SSE.Views.SetValueDialog.okButtonText": "Ok", @@ -870,44 +870,44 @@ "SSE.Views.Statusbar.txAccessRights": "Change access rights", "SSE.Views.Statusbar.zoomText": "Zoom {0}%", "SSE.Views.TableOptionsDialog.errorAutoFilterDataRange": "No se puede realizar la operación para el rango de celdas seleccionado.
Seleccione un rango de datos uniforme diferente del existente y vuelva a intentarlo.", - "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.
Select a range so that the first table row was on the same row
and the resulting table overlapped the current one.", - "SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.
Select a range which does not include other tables.", + "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "La operación no se pudo completar para el rango de celdas seleccionado.
Seleccione un rango de modo que la primera fila de la tabla esté en la misma fila
y la tabla resultante se superponga a la actual.", + "SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "La operación no se pudo completar para el rango de celdas seleccionado.
Seleccione un rango que no incluye otras tablas.", "SSE.Views.TableOptionsDialog.textCancel": "Cancelar", "SSE.Views.TableOptionsDialog.txtEmpty": "Este campo es obligatorio", "SSE.Views.TableOptionsDialog.txtFormat": "Crear tabla", "SSE.Views.TableOptionsDialog.txtInvalidRange": "¡ERROR!¡Rango de celdas inválido! ", "SSE.Views.TableOptionsDialog.txtTitle": "Título", - "SSE.Views.TableSettings.deleteColumnText": "Delete Column", - "SSE.Views.TableSettings.deleteRowText": "Delete Row", - "SSE.Views.TableSettings.deleteTableText": "Delete Table", - "SSE.Views.TableSettings.insertColumnLeftText": "Insert Column Left", - "SSE.Views.TableSettings.insertColumnRightText": "Insert Column Right", - "SSE.Views.TableSettings.insertRowAboveText": "Insert Row Above", - "SSE.Views.TableSettings.insertRowBelowText": "Insert Row Below", - "SSE.Views.TableSettings.notcriticalErrorTitle": "Warning", - "SSE.Views.TableSettings.selectColumnText": "Select Entire Column", - "SSE.Views.TableSettings.selectDataText": "Select Column Data", - "SSE.Views.TableSettings.selectRowText": "Select Row", - "SSE.Views.TableSettings.selectTableText": "Select Table", - "SSE.Views.TableSettings.textBanded": "Banded", - "SSE.Views.TableSettings.textCancel": "Cancel", - "SSE.Views.TableSettings.textColumns": "Columns", - "SSE.Views.TableSettings.textEdit": "Rows & Columns", - "SSE.Views.TableSettings.textEmptyTemplate": "No templates", - "SSE.Views.TableSettings.textExistName": "ERROR! A range with such a name already exists", - "SSE.Views.TableSettings.textFilter": "Filter button", - "SSE.Views.TableSettings.textFirst": "First", - "SSE.Views.TableSettings.textHeader": "Header", - "SSE.Views.TableSettings.textInvalidName": "ERROR! Invalid table name", - "SSE.Views.TableSettings.textIsLocked": "This element is being edited by another user.", - "SSE.Views.TableSettings.textLast": "Last", - "SSE.Views.TableSettings.textOK": "OK", - "SSE.Views.TableSettings.textReservedName": "The name you are trying to use is already referenced in cell formulas. Please use some other name.", - "SSE.Views.TableSettings.textResize": "Resize table", - "SSE.Views.TableSettings.textRows": "Rows", - "SSE.Views.TableSettings.textSelectData": "Select Data", - "SSE.Views.TableSettings.textTableName": "Table Name", - "SSE.Views.TableSettings.textTemplate": "Select From Template", + "SSE.Views.TableSettings.deleteColumnText": "Borrar columna", + "SSE.Views.TableSettings.deleteRowText": "Borrar fila", + "SSE.Views.TableSettings.deleteTableText": "Borrar tabla", + "SSE.Views.TableSettings.insertColumnLeftText": "Insertar columna a la izquierda", + "SSE.Views.TableSettings.insertColumnRightText": "Insertar columna a la derecha", + "SSE.Views.TableSettings.insertRowAboveText": "Insertar fila arriba", + "SSE.Views.TableSettings.insertRowBelowText": "Insertar fila abajo", + "SSE.Views.TableSettings.notcriticalErrorTitle": "Aviso", + "SSE.Views.TableSettings.selectColumnText": "Seleccionar toda la columna", + "SSE.Views.TableSettings.selectDataText": "Seleccionar datos de columna", + "SSE.Views.TableSettings.selectRowText": "Seleccionar fila", + "SSE.Views.TableSettings.selectTableText": "Seleccionar tabla", + "SSE.Views.TableSettings.textBanded": "Con bandas", + "SSE.Views.TableSettings.textCancel": "Cancelar", + "SSE.Views.TableSettings.textColumns": "Columnas", + "SSE.Views.TableSettings.textEdit": "Filas y columnas", + "SSE.Views.TableSettings.textEmptyTemplate": "Sin plantillas", + "SSE.Views.TableSettings.textExistName": "¡ERROR! Una gama con tal nombre ya existe", + "SSE.Views.TableSettings.textFilter": "Botón de filtro", + "SSE.Views.TableSettings.textFirst": "primero", + "SSE.Views.TableSettings.textHeader": "Encabezado", + "SSE.Views.TableSettings.textInvalidName": "¡ERROR! nombre de la tabla inválido", + "SSE.Views.TableSettings.textIsLocked": "Este elemento está editándose por otro usuario.", + "SSE.Views.TableSettings.textLast": "Último", + "SSE.Views.TableSettings.textOK": "Aceptar", + "SSE.Views.TableSettings.textReservedName": "El nombre que está tratando de usar ya se hace referencia en las fórmulas de celda. Por favor seleccione otro nombre.", + "SSE.Views.TableSettings.textResize": "Cambiar el tamaño de la tabla", + "SSE.Views.TableSettings.textRows": "Filas", + "SSE.Views.TableSettings.textSelectData": "Seleccionar datos", + "SSE.Views.TableSettings.textTableName": "Nombre de la tabla", + "SSE.Views.TableSettings.textTemplate": "Seleccionar de plantilla", "SSE.Views.TableSettings.textTotal": "Total", "SSE.Views.TextArtSettings.strBackground": "Color de fondo", "SSE.Views.TextArtSettings.strColor": "Color", @@ -1082,7 +1082,7 @@ "SSE.Views.Toolbar.txtMergeCells": "Unir celdas", "SSE.Views.Toolbar.txtMergeCenter": "Unir y centrar", "SSE.Views.Toolbar.txtNamedRange": "Bandas nombradas", - "SSE.Views.Toolbar.txtNewRange": "Nombre nuevo ", + "SSE.Views.Toolbar.txtNewRange": "Definir Nombre", "SSE.Views.Toolbar.txtNoBorders": "Sin bordes", "SSE.Views.Toolbar.txtNumber": "Número", "SSE.Views.Toolbar.txtPasteRange": "Pegar nombre", @@ -1121,12 +1121,12 @@ "SSE.Views.Toolbar.txtTime": "Hora", "SSE.Views.Toolbar.txtUnmerge": "Separar celdas", "SSE.Views.Toolbar.txtYen": "¥ Yen", - "SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel", - "SSE.Views.Top10FilterDialog.okButtonText": "OK", - "SSE.Views.Top10FilterDialog.textType": "Show", - "SSE.Views.Top10FilterDialog.txtBottom": "Bottom", - "SSE.Views.Top10FilterDialog.txtItems": "Item", - "SSE.Views.Top10FilterDialog.txtPercent": "Percent", - "SSE.Views.Top10FilterDialog.txtTitle": "Top 10 AutoFilter", - "SSE.Views.Top10FilterDialog.txtTop": "Top" + "SSE.Views.Top10FilterDialog.cancelButtonText": "Cancelar", + "SSE.Views.Top10FilterDialog.okButtonText": "Aceptar", + "SSE.Views.Top10FilterDialog.textType": "Mostrar", + "SSE.Views.Top10FilterDialog.txtBottom": "Inferior", + "SSE.Views.Top10FilterDialog.txtItems": "Artículo", + "SSE.Views.Top10FilterDialog.txtPercent": "Por ciento", + "SSE.Views.Top10FilterDialog.txtTitle": "Top 10 de Autofiltro", + "SSE.Views.Top10FilterDialog.txtTop": "Superior" } \ No newline at end of file From c44660cbed73113619306f57ceb2afbd4786f16a Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Thu, 30 Jun 2016 13:57:06 +0300 Subject: [PATCH 6/8] Update Readme.md 4.0.0 -> 4.0.1 --- Readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Readme.md b/Readme.md index 796dde16b..c99f27c6a 100644 --- a/Readme.md +++ b/Readme.md @@ -1,3 +1,5 @@ +[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.0.1-blue.svg?style=flat) + ## web-apps The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor. From e5501d76925e5bceaf0abb9ddc713c79df58b985 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 Jun 2016 17:30:02 +0300 Subject: [PATCH 7/8] =?UTF-8?q?[DE][PE]=20=D0=9F=D1=80=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20=D1=81=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=BE=D0=B9=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=D1=8E?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=B3=D1=80=D0=B0=D1=84=D0=B0/=D1=81?= =?UTF-8?q?=D0=BB=D0=B0=D0=B9=D0=B4=D0=B0=20(=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8B=20=D0=BD=D0=B0=20=D0=BF=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BB=D1=8F=D1=85=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=B8=20disabled).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/template/RightMenu.template | 2 - .../main/app/view/ParagraphSettings.js | 37 +++++++++------- .../documenteditor/main/app/view/RightMenu.js | 4 +- .../main/app/template/RightMenu.template | 2 - .../main/app/template/SlideSettings.template | 2 +- .../main/app/view/RightMenu.js | 4 +- .../main/app/view/SlideSettings.js | 43 +++++++++++-------- 7 files changed, 53 insertions(+), 41 deletions(-) diff --git a/apps/documenteditor/main/app/template/RightMenu.template b/apps/documenteditor/main/app/template/RightMenu.template index 499e30afa..6b30dae46 100644 --- a/apps/documenteditor/main/app/template/RightMenu.template +++ b/apps/documenteditor/main/app/template/RightMenu.template @@ -16,8 +16,6 @@
-
-
diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index a2f8d25dd..3b60b3216 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -71,18 +71,18 @@ define([ this._initSettings = true; this._state = { - LineRuleIdx: 1, - LineHeight: 1.5, - LineSpacingBefore: 0, - LineSpacingAfter: 0.35, + LineRuleIdx: null, + LineHeight: null, + LineSpacingBefore: null, + LineSpacingAfter: null, AddInterval: false, BackColor: '#000000', - DisabledControls: false, + DisabledControls: true, HideTextOnlySettings: false }; this.spinners = []; this.lockedControls = []; - this._locked = false; + this._locked = true; this.isChart = false; this.render(); @@ -99,19 +99,21 @@ define([ cls: 'input-group-nr', menuStyle: 'min-width: 85px;', editable: false, - data: this._arrLineRule + data: this._arrLineRule, + disabled: this._locked }); - this.cmbLineRule.setValue(this._arrLineRule[ this._state.LineRuleIdx].value); + this.cmbLineRule.setValue(''); this.lockedControls.push(this.cmbLineRule); this.numLineHeight = new Common.UI.MetricSpinner({ el: $('#paragraph-spin-line-height'), step: .01, width: 85, - value: '1.5', + value: '', defaultUnit : "", maxValue: 132, - minValue: 0.5 + minValue: 0.5, + disabled: this._locked }); this.lockedControls.push(this.numLineHeight); @@ -119,12 +121,13 @@ define([ el: $('#paragraph-spin-spacing-before'), step: .1, width: 85, - value: '0 cm', + value: '', defaultUnit : "cm", maxValue: 55.88, minValue: 0, allowAuto : true, - autoText : this.txtAutoText + autoText : this.txtAutoText, + disabled: this._locked }); this.spinners.push(this.numSpacingBefore); this.lockedControls.push(this.numSpacingBefore); @@ -133,24 +136,27 @@ define([ el: $('#paragraph-spin-spacing-after'), step: .1, width: 85, - value: '0.35 cm', + value: '', defaultUnit : "cm", maxValue: 55.88, minValue: 0, allowAuto : true, - autoText : this.txtAutoText + autoText : this.txtAutoText, + disabled: this._locked }); this.spinners.push(this.numSpacingAfter); this.lockedControls.push(this.numSpacingAfter); this.chAddInterval = new Common.UI.CheckBox({ el: $('#paragraph-checkbox-add-interval'), - labelText: this.strSomeParagraphSpace + labelText: this.strSomeParagraphSpace, + disabled: this._locked }); this.lockedControls.push(this.chAddInterval); this.btnColor = new Common.UI.ColorButton({ style: "width:45px;", + disabled: this._locked, menu : new Common.UI.Menu({ items: [ { template: _.template('
') }, @@ -206,6 +212,7 @@ define([ })); this.linkAdvanced = $('#paragraph-advanced-link'); + this.linkAdvanced.toggleClass('disabled', this._locked); }, setApi: function(api) { diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index 3366d6cfe..0288e6a30 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -197,8 +197,8 @@ define([ } if (open) { - $('#id-empty-settings').parent().css("display", "inline-block" ); - $('#id-empty-settings').addClass("active"); + $('#id-paragraph-settings').parent().css("display", "inline-block" ); + $('#id-paragraph-settings').addClass("active"); } this.trigger('render:after', this); diff --git a/apps/presentationeditor/main/app/template/RightMenu.template b/apps/presentationeditor/main/app/template/RightMenu.template index d8119b24b..6a34f6b22 100644 --- a/apps/presentationeditor/main/app/template/RightMenu.template +++ b/apps/presentationeditor/main/app/template/RightMenu.template @@ -14,8 +14,6 @@
-
-
diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template index 776e9a705..2c4133d77 100644 --- a/apps/presentationeditor/main/app/template/SlideSettings.template +++ b/apps/presentationeditor/main/app/template/SlideSettings.template @@ -11,7 +11,7 @@ -
+
diff --git a/apps/presentationeditor/main/app/view/RightMenu.js b/apps/presentationeditor/main/app/view/RightMenu.js index eefa15406..5f78ff9c7 100644 --- a/apps/presentationeditor/main/app/view/RightMenu.js +++ b/apps/presentationeditor/main/app/view/RightMenu.js @@ -181,8 +181,8 @@ define([ } if (open) { - $('#id-empty-settings').parent().css("display", "inline-block" ); - $('#id-empty-settings').addClass("active"); + $('#id-slide-settings').parent().css("display", "inline-block" ); + $('#id-slide-settings').addClass("active"); } this.trigger('render:after', this); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 8043180cf..b2629b0e2 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -78,13 +78,13 @@ define([ this.FillItems = []; this._stateDisabled = { - background: false, - effects: false, - timing: false + background: true, + effects: true, + timing: true }; this._state = { - FillType: Asc.c_oAscFill.FILL_TYPE_SOLID, + FillType:undefined, SlideColor: 'ffffff', BlipFillType: Asc.c_oAscFillBlipType.STRETCH, FGColor: '000000', @@ -93,7 +93,7 @@ define([ GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR }; - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; + this.OriginalFillType = undefined; this.SlideColor = {Value: 1, Color: 'ffffff'}; // value=1 - цвет определен - прозрачный или другой, value=0 - цвет не определен, рисуем прозрачным this.BlipFillType = Asc.c_oAscFillBlipType.STRETCH; this.Effect = Asc.c_oAscSlideTransitionTypes.None; @@ -125,13 +125,15 @@ define([ style: 'width: 100%;', menuStyle: 'min-width: 190px;', editable: false, - data: this._arrFillSrc + data: this._arrFillSrc, + disabled: true }); - this.cmbFillSrc.setValue(this._arrFillSrc[0].value); + this.cmbFillSrc.setValue(''); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); this.btnBackColor = new Common.UI.ColorButton({ style: "width:45px;", + disabled: true, menu : new Common.UI.Menu({ items: [ { template: _.template('
') }, @@ -462,9 +464,10 @@ define([ style: 'width: 100%;', menuStyle: 'min-width: 190px;', editable: false, - data: this._arrEffectName + data: this._arrEffectName, + disabled: true }); - this.cmbEffectName.setValue(this._arrEffectName[0].value); + this.cmbEffectName.setValue(''); this.cmbEffectName.on('selected', _.bind(this.onEffectNameSelect, this)); this._arrEffectType = [ @@ -496,7 +499,8 @@ define([ style: 'width: 100%;', menuStyle: 'min-width: 190px;', editable: false, - data: this._arrEffectType + data: this._arrEffectType, + disabled: true }); this.cmbEffectType.setValue(''); this.cmbEffectType.on('selected', _.bind(this.onEffectTypeSelect, this)); @@ -505,10 +509,11 @@ define([ el: $('#slide-spin-duration'), step: 1, width: 65, - value: '2 s', + value: '', defaultUnit : this.textSec, maxValue: 300, - minValue: 0 + minValue: 0, + disabled: true }); this.numDuration.on('change', _.bind(this.onDurationChange, this)); @@ -516,7 +521,7 @@ define([ el: $('#slide-spin-delay'), step: 1, width: 70, - value: '2 s', + value: '', defaultUnit : this.textSec, maxValue: 300, minValue: 0, @@ -526,18 +531,21 @@ define([ this.chStartOnClick = new Common.UI.CheckBox({ el: $('#slide-checkbox-start-click'), - labelText: this.strStartOnClick + labelText: this.strStartOnClick, + disabled: true }); this.chStartOnClick.on('change', _.bind(this.onStartOnClickChange, this)); this.chDelay = new Common.UI.CheckBox({ el: $('#slide-checkbox-delay'), - labelText: this.strDelay + labelText: this.strDelay, + disabled: true }); this.chDelay.on('change', _.bind(this.onCheckDelayChange, this)); this.btnPreview = new Common.UI.Button({ - el: $('#slide-button-preview') + el: $('#slide-button-preview'), + disabled: true }); this.btnPreview.on('click', _.bind(function(btn){ if (this.api) this.api.SlideTransitionPlay(); @@ -545,7 +553,8 @@ define([ }, this)); this.btnApplyToAll = new Common.UI.Button({ - el: $('#slide-button-apply-all') + el: $('#slide-button-apply-all'), + disabled: true }); this.btnApplyToAll.on('click', _.bind(function(btn){ if (this.api) this.api.SlideTimingApplyToAll(); From 33de23b42081bab16e906a0d3a39d660335c7361 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 5 Jul 2016 11:11:13 +0300 Subject: [PATCH 8/8] [DE] Update add-ons style. --- apps/common/main/resources/less/plugins.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index 9569f112e..750b43535 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -29,7 +29,7 @@ background-color: @secondary; .plugin-icon { - .box-shadow(0 0 0 2px @primary); + .box-shadow(0 0 0 2px transparent); } } } @@ -46,11 +46,12 @@ width: 31px; height: 31px; display: inline-block; - .box-shadow(0 0 0 1px @gray); + .box-shadow(0 0 0 1px transparent); vertical-align: middle; background-position: 0 0; background-size: cover; margin-right: 10px; + margin-top: -1px; .background-ximage('@{common-image-path}/plugin/icon_add_on_default.png', '@{common-image-path}/plugin/icon_add_on_default@2x.png', 31px); }