diff --git a/apps/pdfeditor/main/app/controller/Statusbar.js b/apps/pdfeditor/main/app/controller/Statusbar.js index 2c199b6583..da086163b1 100644 --- a/apps/pdfeditor/main/app/controller/Statusbar.js +++ b/apps/pdfeditor/main/app/controller/Statusbar.js @@ -57,7 +57,6 @@ define([ var me = this; this.addListeners({ 'Statusbar': { - 'langchanged': this.onLangMenu, 'zoom:value': function(value) { this.api.zoom(value); Common.NotificationCenter.trigger('edit:complete', this.statusbar); @@ -92,34 +91,6 @@ define([ var lblzoom = $('.statusbar #label-zoom'); lblzoom.css('min-width', 80); lblzoom.text(Common.Utils.String.format(me.zoomText, 100)); - - if ( cfg.isEdit ) { - // var review = me.getApplication().getController('Common.Controllers.ReviewChanges').getView(); - // if (cfg.canReview) { - // me.btnTurnReview = review.getButton('turn', 'statusbar'); - // me.btnTurnReview.render(me.statusbar.$layout.find('#btn-doc-review')); - // me.statusbar.btnTurnReview = me.btnTurnReview; - // } else { - // me.statusbar.$el.find('.el-review').hide(); - // } - // - // me.btnSpelling = review.getButton('spelling', 'statusbar'); - // me.btnSpelling.render( me.statusbar.$layout.find('#btn-doc-spell') ); - // me.btnDocLang = review.getButton('doclang', 'statusbar'); - // me.btnDocLang.render( me.statusbar.$layout.find('#btn-doc-lang') ); - - // var isVisible = (Common.UI.LayoutManager.isElementVisible('statusBar-textLang') || Common.UI.LayoutManager.isElementVisible('statusBar-docLang')) - // && Common.UI.FeaturesManager.canChange('spellcheck'); - // me.btnDocLang.$el.find('+.separator.space')[isVisible?'show':'hide'](); - // isVisible = Common.UI.LayoutManager.isElementVisible('statusBar-textLang') || Common.UI.LayoutManager.isElementVisible('statusBar-docLang') - // || Common.UI.FeaturesManager.canChange('spellcheck'); - // me.statusbar.$el.find('.el-lang')[isVisible?'show':'hide'](); - } else { - // me.statusbar.$el.find('.el-edit, .el-review').hide(); - } - if (cfg.canUseSelectHandTools) { - me.statusbar.$el.find('.hide-select-tools').removeClass('hide-select-tools'); - } }); Common.NotificationCenter.on('app:ready', me.onAppReady.bind(me)); }, @@ -131,49 +102,8 @@ define([ resolve(); })).then(function () { me.bindViewEvents(me.statusbar, me.events); - if (config.canUseSelectHandTools) { - me.statusbar.btnSelectTool.on('click', _.bind(me.onSelectTool, me, 'select')); - me.statusbar.btnHandTool.on('click', _.bind(me.onSelectTool, me, 'hand')); - me.statusbar.btnHandTool.toggle(true, true); - me.api.asc_setViewerTargetType('hand'); - } - - var statusbarIsHidden = Common.localStorage.getBool("de-hidden-status"); - if ( config.canReview && !statusbarIsHidden ) { - var _process_changestip = function() { - var showTrackChangesTip = !Common.localStorage.getBool("de-track-changes-tip"); - if ( showTrackChangesTip ) { - me.btnTurnReview.updateHint(''); - if (me.changesTooltip === undefined) - me.changesTooltip = me.createChangesTip(me.textTrackChanges, 'de-track-changes-tip'); - - me.hideTips(); - me.changesTooltip.show(); - } else { - me.btnTurnReview.updateHint(me.tipReview); - } - } - - var trackRevisions = me.api.asc_IsTrackRevisions(), - trackChanges = config.customization && config.customization.review ? config.customization.review.trackChanges : undefined; - (trackChanges===undefined) && (trackChanges = config.customization ? config.customization.trackChanges : undefined); - - if ( config.isReviewOnly || trackChanges===true || (trackChanges!==false) && trackRevisions) { - _process_changestip(); - } else if ( trackRevisions ) { - var showNewChangesTip = !Common.localStorage.getBool("de-new-changes"); - if ( me.api.asc_HaveRevisionsChanges() && showNewChangesTip ) { - me.btnTurnReview.updateHint(''); - - if (me.newChangesTooltip === undefined) - me.newChangesTooltip = me.createChangesTip(me.textHasChanges, 'de-new-changes'); - - me.hideTips(); - me.newChangesTooltip.show(); - } else - me.btnTurnReview.updateHint(me.tipReview); - } - } + me.statusbar.btnPagePrev.on('click', _.bind(me.onGotoPage, me, false)); + me.statusbar.btnPageNext.on('click', _.bind(me.onGotoPage, me, true)); }); }, @@ -189,30 +119,9 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.statusbar); }, - onApiTrackRevisionsChange: function(localFlag, globalFlag, userId) { - var global = (localFlag===null), - state = global ? globalFlag : localFlag; - if (this.btnTurnReview) { - if (!state) { - this.hideTips(); - this.btnTurnReview.updateHint(this.tipReview); - } else if (userId && state && global ) { - if (this.globalChangesTooltip === undefined) - this.globalChangesTooltip = this.createChangesTip(this.textSetTrackChanges); - if (!this.globalChangesTooltip.isVisible()) { - this.hideTips(); - this.globalChangesTooltip.show(); - } - } - } - }, - setApi: function(api) { this.api = api; this.api.asc_registerCallback('asc_onZoomChange', _.bind(this._onZoomChange, this)); - this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this._onTextLanguage, this)); - this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this)); - this.statusbar.setApi(api); }, @@ -241,6 +150,10 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.statusbar); }, + onGotoPage: function (next, btn, e) { + this.api && this.api.goToPage(this.api.getCurrentPage() + (next ? 1 : -1)); + }, + /* * api events * */ @@ -252,20 +165,6 @@ define([ $('.statusbar #label-zoom').text(Common.Utils.String.format(this.zoomText, percent)); }, - _onTextLanguage: function(langId) { - var info = Common.util.LanguageInfo.getLocalLanguageName(langId); - this.statusbar.setLanguage({ - value: info[0], - displayValue: info[1], - code: langId - }); - }, - - setLanguages: function(langs) { - this.langs = langs; - this.statusbar.reloadLanguages(langs); - }, - setStatusCaption: function(text, force, delay, callback) { if (this.timerCaption && ( ((new Date()) < this.timerCaption) || text.length==0 ) && !force ) return; @@ -284,44 +183,10 @@ define([ this.statusbar.$el.css('z-index', ''); }, - onLangMenu: function(obj, langid, title) { - this.api.put_TextPrLang(langid); - }, - synchronizeChanges: function() { this.setStatusCaption(''); }, - hideTips: function () { - this.changesTooltip && this.changesTooltip.isVisible() && this.changesTooltip.hide(); - this.newChangesTooltip && this.newChangesTooltip.isVisible() && this.newChangesTooltip.hide(); - this.globalChangesTooltip && this.globalChangesTooltip.isVisible() && this.globalChangesTooltip.hide(); - }, - - createChangesTip: function (text, storage) { - var me = this; - var tip = new Common.UI.SynchronizeTip({ - target : me.btnTurnReview.$el, - text : text, - placement: 'top-left', - showLink: !!storage - }); - tip.on({ - 'dontshowclick': function() { - Common.localStorage.setItem(storage, 1); - - tip.hide(); - me.btnTurnReview.updateHint(me.tipReview); - }, - 'closeclick': function() { - tip.hide(); - me.btnTurnReview.updateHint(me.tipReview); - } - }); - - return tip; - }, - showDisconnectTip: function () { var me = this; if (!this.disconnectTip) { @@ -350,17 +215,7 @@ define([ this.disconnectTip = null; }, - onSelectTool: function (type, btn, e) { - if (this.api) { - this.api.asc_setViewerTargetType(type); - } - }, - zoomText : 'Zoom {0}%', - textHasChanges : 'New changes have been tracked', - textTrackChanges: 'The document is opened with the Track Changes mode enabled', - tipReview : 'Review', - textSetTrackChanges: 'You are in Track Changes mode', textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.' }, PDFE.Controllers.Statusbar || {})); }); \ No newline at end of file diff --git a/apps/pdfeditor/main/app/template/StatusBar.template b/apps/pdfeditor/main/app/template/StatusBar.template index 50dd97ad10..33416e31d2 100644 --- a/apps/pdfeditor/main/app/template/StatusBar.template +++ b/apps/pdfeditor/main/app/template/StatusBar.template @@ -7,9 +7,10 @@
-
+
-
+ +
diff --git a/apps/pdfeditor/main/app/view/Statusbar.js b/apps/pdfeditor/main/app/view/Statusbar.js index 11d252abab..208dcef9ab 100644 --- a/apps/pdfeditor/main/app/view/Statusbar.js +++ b/apps/pdfeditor/main/app/view/Statusbar.js @@ -65,28 +65,14 @@ define([ Common.Utils.String.format(this.pageIndexText, model.get('current'), model.get('count')) ); } - function _clickLanguage(menu, item) { - this.langMenu.prevTip = item.value.value; - this.btnLanguage.setCaption(item.caption); - this.fireEvent('langchanged', [this, item.value.code, item.caption]); - } - function _onAppReady(config) { var me = this; me.btnZoomToPage.updateHint(me.tipFitPage); me.btnZoomToWidth.updateHint(me.tipFitWidth); me.btnZoomDown.updateHint(me.tipZoomOut + Common.Utils.String.platformKey('Ctrl+-')); me.btnZoomUp.updateHint(me.tipZoomIn + Common.Utils.String.platformKey('Ctrl++')); - - if (config.canUseSelectHandTools) { - me.btnSelectTool.updateHint(me.tipSelectTool); - me.btnHandTool.updateHint(me.tipHandTool); - } - - if (me.btnLanguage && me.btnLanguage.cmpEl) { - me.btnLanguage.updateHint(me.tipSetLang); - me.langMenu.on('item:click', _.bind(_clickLanguage, this)); - } + me.btnPagePrev.updateHint(me.tipPagePrev); + me.btnPageNext.updateHint(me.tipPageNext); me.cntZoom.updateHint(me.tipZoomFactor); me.cntZoom.cmpEl.on({ @@ -159,10 +145,6 @@ define([ me.zoomMenu.on('item:click', function(menu, item) { me.fireEvent('zoom:value', [item.value]); }); - - me.btnDocInfo.menu.on('show:after', _.bind(this.onDocInfoShow, this)); - - me.onChangeProtectDocument(); } PDFE.Views.Statusbar = Backbone.View.extend(_.extend({ @@ -180,12 +162,6 @@ define([ this.pages = new PDFE.Models.Pages({current:1, count:1}); this.pages.on('change', _.bind(_updatePagesCaption,this)); this._state = { - docProtection: { - isReadOnly: false, - isReviewOnly: false, - isFormsOnly: false, - isCommentsOnly: false - } }; this._isDisabled = false; @@ -195,20 +171,6 @@ define([ textPageNumber: Common.Utils.String.format(this.pageIndexText, 1, 1) })); - this.btnSelectTool = new Common.UI.Button({ - hintAnchor: 'top', - toggleGroup: 'select-tools', - enableToggle: true, - allowDepress: false - }); - - this.btnHandTool = new Common.UI.Button({ - hintAnchor: 'top', - toggleGroup: 'select-tools', - enableToggle: true, - allowDepress: false - }); - this.btnZoomToPage = new Common.UI.Button({ hintAnchor: 'top', toggleGroup: 'status-zoom', @@ -233,31 +195,6 @@ define([ hintAnchor: 'top-right' }); - this.btnLanguage = new Common.UI.Button({ - cls : 'btn-toolbar', - caption : 'English (United States)', - hintAnchor : 'top-left', - disabled: true, - dataHint : '0', - dataHintDirection: 'top', - menu: true - }); - - this.langMenu = new Common.UI.MenuSimple({ - cls: 'lang-menu', - style: 'margin-top:-5px;', - restoreHeight: 285, - itemTemplate: _.template([ - '', - '', - '<%= caption %>', - '' - ].join('')), - menuAlign: 'bl-tl', - search: true, - focusToCheckedItem: true - }); - this.zoomMenu = new Common.UI.Menu({ style: 'margin-top:-5px;', menuAlign: 'bl-tl', @@ -291,34 +228,20 @@ define([ } }); - var template = _.template( - // '' + - '
' + - '
<%= caption %>
' + - '
<%= options.value%>
' + - '
' - // '
' - ); + this.btnPagePrev = new Common.UI.Button({ + cls : 'btn-toolbar', + iconCls: 'toolbar__icon btn-page-up', + hintAnchor : 'top', + dataHint : '0', + dataHintDirection: 'top' + }); - this.btnDocInfo = new Common.UI.Button({ - cls : 'btn-toolbar no-caret', - caption : this.txtWordCount, - iconCls: 'toolbar__icon btn-word-count', + this.btnPageNext = new Common.UI.Button({ + cls : 'btn-toolbar', + iconCls: 'toolbar__icon btn-page-down', hintAnchor : 'top-left', dataHint : '0', - dataHintDirection: 'top', - menu: new Common.UI.Menu({ - style: 'margin-top:-5px;', - menuAlign: 'bl-tl', - itemTemplate: template, - items: [ - { caption: this.txtPages, value: 0 }, - { caption: this.txtParagraphs, value: 0 }, - { caption: this.txtWords, value: 0 }, - { caption: this.txtSymbols, value: 0 }, - { caption: this.txtSpaces, value: 0 } - ] - }) + dataHintDirection: 'top' }); var promise = new Promise(function (accept, reject) { @@ -347,20 +270,10 @@ define([ _btn_render(me.btnZoomUp, $('#btn-zoom-up', me.$layout)); _btn_render(me.txtGoToPage, $('#status-goto-page', me.$layout)); - if ( !config || config.isEdit ) { - me.btnLanguage.render($('#btn-cnt-lang', me.$layout)); - me.btnLanguage.setMenu(me.langMenu); - me.langMenu.prevTip = 'en'; - } - me.btnDocInfo.render($('#slot-status-btn-info', me.$layout)); - - if (config.canUseSelectHandTools) { - _btn_render(me.btnSelectTool, $('#btn-select-tool', me.$layout)); - _btn_render(me.btnHandTool, $('#btn-hand-tool', me.$layout)); - } - me.zoomMenu.render($('.cnt-zoom',me.$layout)); me.zoomMenu.cmpEl.attr({tabindex: -1}); + me.btnPagePrev.render($('#slot-status-btn-prev', me.$layout)); + me.btnPageNext.render($('#slot-status-btn-next', me.$layout)); this.$el.html(me.$layout); this.fireEvent('render:after', [this]); @@ -374,13 +287,8 @@ define([ if (this.api) { this.api.asc_registerCallback('asc_onCountPages', _.bind(_onCountPages, this)); this.api.asc_registerCallback('asc_onCurrentPage', _.bind(_onCurrentPage, this)); - this.api.asc_registerCallback('asc_onGetDocInfoStart', _.bind(this.onGetDocInfoStart, this)); - this.api.asc_registerCallback('asc_onGetDocInfoStop', _.bind(this.onGetDocInfoEnd, this)); - this.api.asc_registerCallback('asc_onDocInfo', _.bind(this.onDocInfo, this)); - this.api.asc_registerCallback('asc_onGetDocInfoEnd', _.bind(this.onGetDocInfoEnd, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); - Common.NotificationCenter.on('protect:doclock', _.bind(this.onChangeProtectDocument, this)); } return this; @@ -400,40 +308,6 @@ define([ return this.$el && this.$el.is(':visible'); }, - reloadLanguages: function(array) { - var arr = [], - saved = this.langMenu.saved; - _.each(array, function(item) { - arr.push({ - caption : item['displayValue'], - value : {value: item['value'], code: item['code']}, - checkable : true, - checked : saved == item['displayValue'], - spellcheck : item['spellcheck'] - }); - }); - this.langMenu.resetItems(arr); - if (this.langMenu.items.length>0) { - var isProtected = this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly; - this.btnLanguage.setDisabled(this._isDisabled || !!this.mode.isDisconnected || isProtected); - } - }, - - setLanguage: function(info) { - if (this.langMenu.prevTip != info.value && info.code !== undefined) { - this.btnLanguage.setCaption(info.displayValue); - this.langMenu.prevTip = info.value; - - var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; }); - if (lang) { - this.langMenu.setChecked(this.langMenu.items.indexOf(lang), true); - } else { - this.langMenu.saved = info.displayValue; - this.langMenu.clearAll(); - } - } - }, - getStatusLabel: function() { return $('.statusbar #label-action'); }, @@ -448,64 +322,6 @@ define([ SetDisabled: function(disable) { this._isDisabled = disable; - var isProtected = this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly; - this.btnLanguage.setDisabled(disable || this.langMenu.items.length<1 || isProtected); - this.btnTurnReview && this.btnTurnReview.setDisabled(disable || isProtected); - }, - - onChangeProtectDocument: function(props) { - // if (!props) { - // var docprotect = DE.getController('DocProtection'); - // props = docprotect ? docprotect.getDocProps() : null; - // } - // if (props) { - // this._state.docProtection = props; - // this.SetDisabled(this._isDisabled); - // } - }, - - onDocInfoShow: function() { - this.api && this.api.startGetDocInfo(); - }, - - onGetDocInfoStart: function() { - this.infoObj = {PageCount: 0, WordsCount: 0, ParagraphCount: 0, SymbolsCount: 0, SymbolsWSCount:0}; - }, - - onDocInfo: function(obj) { - if (obj && this.btnDocInfo && this.btnDocInfo.menu) { - if (obj.get_PageCount()>-1) - this.btnDocInfo.menu.items[0].options.value = obj.get_PageCount(); - if (obj.get_ParagraphCount()>-1) - this.btnDocInfo.menu.items[1].options.value = obj.get_ParagraphCount(); - if (obj.get_WordsCount()>-1) - this.btnDocInfo.menu.items[2].options.value = obj.get_WordsCount(); - if (obj.get_SymbolsCount()>-1) - this.btnDocInfo.menu.items[3].options.value = obj.get_SymbolsCount(); - if (obj.get_SymbolsWSCount()>-1) - this.btnDocInfo.menu.items[4].options.value = obj.get_SymbolsWSCount(); - if (!this.timerDocInfo) { // start timer for filling info - var me = this; - this.timerDocInfo = setInterval(function(){ - me.fillDocInfo(); - }, 300); - this.fillDocInfo(); - } - } - }, - - onGetDocInfoEnd: function() { - clearInterval(this.timerDocInfo); - this.timerDocInfo = undefined; - this.fillDocInfo(); - }, - - fillDocInfo: function() { - if (!this.btnDocInfo || !this.btnDocInfo.menu || !this.btnDocInfo.menu.isVisible()) return; - - this.btnDocInfo.menu.items.forEach(function(item){ - $(item.el).html(item.template({id: item.id, caption : item.caption, options : item.options})); - }); }, onApiCoAuthoringDisconnect: function() { @@ -520,18 +336,9 @@ define([ tipZoomIn : 'Zoom In', tipZoomOut : 'Zoom Out', tipZoomFactor : 'Magnification', - tipSetLang : 'Set Text Language', txtPageNumInvalid : 'Page number invalid', - textTrackChanges : 'Track Changes', - textChangesPanel : 'Changes panel', - tipSelectTool : 'Select tool', - tipHandTool : 'Hand tool', - txtWordCount: 'Word count', - txtPages: 'Pages', - txtWords: 'Words', - txtParagraphs: 'Paragraphs', - txtSymbols: 'Symbols', - txtSpaces: 'Symbols with spaces' + tipPagePrev: 'Go to previous page', + tipPageNext: 'Go to nex page' }, PDFE.Views.Statusbar || {})); } ); \ No newline at end of file diff --git a/apps/pdfeditor/main/resources/img/blank.svg b/apps/pdfeditor/main/resources/img/blank.svg new file mode 100644 index 0000000000..46e6049d0e --- /dev/null +++ b/apps/pdfeditor/main/resources/img/blank.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/pdfeditor/main/resources/img/file-template.svg b/apps/pdfeditor/main/resources/img/file-template.svg new file mode 100644 index 0000000000..a0ea6ca5ff --- /dev/null +++ b/apps/pdfeditor/main/resources/img/file-template.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/pdfeditor/main/resources/img/recent-file.svg b/apps/pdfeditor/main/resources/img/recent-file.svg new file mode 100644 index 0000000000..c5f03d5730 --- /dev/null +++ b/apps/pdfeditor/main/resources/img/recent-file.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/apps/pdfeditor/main/resources/less/advanced-settings.less b/apps/pdfeditor/main/resources/less/advanced-settings.less deleted file mode 100644 index 283628c1ae..0000000000 --- a/apps/pdfeditor/main/resources/less/advanced-settings.less +++ /dev/null @@ -1,518 +0,0 @@ -.btn-borders-large { -} - -.icon-advanced-wrap { -} - -.header-styles-tableview { - .list-item > div{ - &:nth-child(1) { - width:160px; - height: 16px; - padding-left:16px; - padding-right: 5px; - - &.checked { - &:before { - content: ''; - width: 16px; - height: 16px; - display: inline-block; - float: left; - margin-left: -18px; - background-position: @menu-check-offset-x @menu-check-offset-y; - } - } - } - - padding-right: 6px; - vertical-align: middle; - display: inline-block; - text-overflow: ellipsis; - overflow: hidden; - white-space: pre; - } -} - -.canvas-box { - border: @scaled-one-px-value solid @border-regular-control; - background-color: #fff; -} - -#bulleted-list-preview { - width: 100%; - border: @scaled-one-px-value-ie solid @border-regular-control-ie; - border: @scaled-one-px-value solid @border-regular-control; - background-color: @canvas-content-background; -} - -#page-margins-preview { - border: @scaled-one-px-value-ie solid @border-regular-control-ie; - border: @scaled-one-px-value solid @border-regular-control; -} - -#id-text-table-radio-fixed { - display: inline-block; - margin-right: 10px; - vertical-align: middle; - - .pixel-ratio__1_75 &, .pixel-ratio__2 & { - padding-bottom: 1px; - } -} - -#id-text-table-spn-fixed, #bookmarks-radio-location { - display: inline-block; - vertical-align: middle; -} - -#id-adv-paragraph-indents { - .outline-level { - float: right; - - .rtl & { - float: left; - } - } - - .margin-right { - margin-right: 3px; - - .rtl & { - margin-right: 0; - margin-left: 3px; - } - } -} - -#id-adv-paragraph-borders { - .settings-wrap { - width: 100%; - display: flex; - align-items: center; - } - - #paragraphadv-combo-border-size { - width: 93px; - } - - #paragraphadv-border-color-btn, - #paragraphadv-combo-border-size { - margin-left: 3px; - - .rtl & { - margin-left: 0; - margin-right: 3px; - } - } - - .border-color { - display: flex; - align-items: center; - padding-left: 20px; - - .rtl & { - padding-left: 0; - padding-right: 20px; - } - } - - .back-color { - margin-right: 5px; - - .rtl & { - margin-right: 0; - margin-left: 5px; - } - } - - .border-types { - text-align: right; - margin-left: 9px; - - .rtl & { - text-align: left; - margin-left: 0; - margin-right: 9px; - } - - .btn { - margin-left: 4px; - margin-bottom: 4px; - - .rtl & { - margin-left: 0; - margin-right: 4px; - } - } - } -} - -#id-adv-paragraph-font { - .padding-left { - padding-left: 40px; - - .rtl & { - padding-left: 0; - padding-right: 40px; - } - } - - .position { - margin-left: 15px; - - .rtl & { - margin-left: 0; - margin-right: 15px; - } - } - - .ligatures { - margin-left: 5px; - - .rtl & { - margin-left: 0; - margin-right: 5px; - } - } -} - -#id-adv-paragraph-tabs { - .tab-position { - margin-right: 8px; - - .rtl & { - margin-right: 0; - margin-left: 8px; - } - } - - .margin-right { - margin-right: 9px; - - .rtl & { - margin-right: 0; - margin-left: 9px; - } - } -} - -#id-adv-paragraph-margins { - .padding-left { - padding-left: 15px; - - .rtl & { - padding-left: 0; - padding-right: 15px; - } - } -} - -#id-adv-table-width, #id-adv-table-cell-props { - .margin-right { - margin-right: 10px; - - .rtl & { - margin-right: 0; - margin-left: 10px; - } - } -} - -#id-adv-table-borders { - .settings-wrap { - width: 100%; - display: flex; - align-items: center; - } - - #tableadv-combo-border-size { - width: 93px; - } - - #tableadv-border-color-btn, - #tableadv-combo-border-size { - margin-left: 3px; - - .rtl & { - margin-left: 0; - margin-right: 3px; - } - } - - .border-color { - padding-left: 20px; - display: flex; - align-items: center; - - .rtl & { - padding-left: 0; - padding-right: 20px; - } - } - - .border-types { - padding-left: 10px; - - .rtl & { - padding-left: 0; - padding-right: 10px; - } - - .btn { - margin-left: 4px; - margin-bottom: 4px; - - .rtl & { - margin-left: 0; - margin-right: 4px; - } - } - } - - .back-color { - margin-right: 5px; - - .rtl & { - margin-right: 0; - margin-left: 5px; - } - } - - #tableadv-panel-cell-back, - #tableadv-panel-table-back { - display: flex; - align-items: center; - } -} - -#id-adv-table-wrap { - .margin-right { - margin-right: 5px; - - .rtl & { - margin-right: 0; - margin-left: 5px; - } - } - - .number-indent { - margin-left: 20px; - - .rtl & { - margin-left: 0; - margin-right: 20px; - } - } -} - -#id-adv-image-rotate { - #image-advanced-spin-angle { - margin-left: 5px; - - .rtl & { - margin-left: 0; - margin-right: 5px; - } - } - - .flipped { - margin-right: 15px; - - .rtl & { - margin-right: 0; - margin-left: 15px; - } - } -} - -#id-adv-image-wrap { - .margin-right { - margin-right: 7px; - - .rtl & { - margin-right: 0; - margin-left: 7px; - } - } -} - -#id-adv-shape-size { - .padding-right { - padding-right: 15px; - - .rtl & { - padding-right: 0; - padding-left: 15px; - } - } -} - -#window-date-time { - #datetime-dlg-default { - float: right; - - .rtl & { - float: left; - } - } -} - -.advanced-settings-dlg { - .roles-tableview { - &.no-borders > .listview .item { - border-width: 0 !important; - } - .item { - padding: 0 6px; - } - - @item-width: 20px; - @item-height: 28px; - .list-item { - display: flex; - align-items: center; - height: @item-height; - - span.color { - display: block; - width: 12px; - height: 12px; - border: @scaled-one-px-value-ie solid @border-color-shading-ie; - border: @scaled-one-px-value solid @border-color-shading; - } - } - .list-item > div{ - vertical-align: middle; - display: inline-block; - text-overflow: ellipsis; - overflow: hidden; - white-space: pre; - } - - .listitem-icon { - width: @item-width; - height: @item-height; - margin-right: 5px; - - svg { - width: @item-width; - height: @item-height; - fill: @text-normal-ie; - fill: @text-normal; - } - } - - .selected { - .listitem-icon { - svg { - fill: @text-normal-pressed-ie; - fill: @text-normal-pressed; - } - } - } - } -} - -#window-watermark { - #watermark-tbl-text, #watermark-tbl-image { - margin-left: 22px; - .rtl & { - margin-left: 0; - margin-right: 22px; - } - } - .language { - width: 142px; - .input-label { - display:block; - } - #watermark-combo-lang { - width: 100%; - } - } - .text { - width: 215px; - padding-left: 5px; - .rtl & { - padding-left: 0; - padding-right: 5px; - } - .input-label { - display: block; - } - #watermark-combo-text { - width: 100%; - } - } - .font-label { - display: block; - } - .layout-label { - display: block; - margin-bottom: 3px; - } - #watermark-fonts { - display: inline-block; - vertical-align: middle; - } - #watermark-bold, #watermark-font-size { - display: inline-block; - margin-left: 2px; - .rtl & { - margin-left: 0; - margin-right: 2px; - } - } - #watermark-font-size { - vertical-align: middle; - } - #watermark-textcolor, - #watermark-italic, - #watermark-underline, - #watermark-strikeout { - display: inline-block; - margin-left: 6px; - .rtl & { - margin-left: 0; - margin-right: 6px; - } - } - #watermark-radio-diag { - display: inline-block; - } - #watermark-radio-hor { - display: inline-block; - margin-left: 15px; - .rtl & { - margin-left: 0; - margin-right: 15px; - } - } - .select-image { - vertical-align: top; - } - .texture-img { - width: 80px; - height: 70px; - padding: 9px 14px; - border: 1px solid #AFAFAF; - border-radius: 2px; - background: #ffffff; - margin-left: 15px; - .rtl & { - margin-left: 0; - margin-right: 15px; - } - } - #watermark-texture-img { - width: 50px; - height: 50px; - } - .scale { - vertical-align: bottom; - } - #watermark-combo-scale { - width: 142px; - } -} \ No newline at end of file diff --git a/apps/pdfeditor/main/resources/less/app.less b/apps/pdfeditor/main/resources/less/app.less index cdb1ae43aa..b3f42170ef 100644 --- a/apps/pdfeditor/main/resources/less/app.less +++ b/apps/pdfeditor/main/resources/less/app.less @@ -19,50 +19,25 @@ // -------------------------------------------------- // Core variables and mixins -//@import "../../../../vendor/bootstrap/less/variables.less"; @import "../../../../../vendor/bootstrap/less/mixins.less"; // Reset @import "../../../../../vendor/bootstrap/less/normalize.less"; -//@import "print.less"; // Core CSS @import "../../../../../vendor/bootstrap/less/scaffolding.less"; @import "../../../../../vendor/bootstrap/less/type.less"; -//@import "code.less"; -//@import "grid.less"; -//@import "tables.less"; @import "../../../../../vendor/bootstrap/less/forms.less"; @import "../../../../../vendor/bootstrap/less/buttons.less"; // Components @import "../../../../../vendor/bootstrap/less/component-animations.less"; -//@import "glyphicons.less"; @import "../../../../../vendor/bootstrap/less/dropdowns.less"; @import "../../../../../vendor/bootstrap/less/button-groups.less"; @import "../../../../../vendor/bootstrap/less/input-groups.less"; -//@import "navs.less"; -//@import "navbar.less"; -//@import "breadcrumbs.less"; -//@import "pagination.less"; -//@import "pager.less"; -//@import "labels.less"; -//@import "badges.less"; -//@import "jumbotron.less"; -//@import "thumbnails.less"; -//@import "alerts.less"; -//@import "progress-bars.less"; -//@import "media.less"; -//@import "list-group.less"; -//@import "panels.less"; -//@import "wells.less"; -//@import "close.less"; // Components w/ JavaScript -//@import "modals.less"; @import "../../../../../vendor/bootstrap/less/tooltip.less"; -//@import "popovers.less"; -//@import "carousel.less"; // Utility classes @import "../../../../../vendor/bootstrap/less/utilities.less"; @@ -95,9 +70,7 @@ @import "../../../../common/main/resources/less/treeview.less"; @import "../../../../common/main/resources/less/colorpalette.less"; @import "../../../../common/main/resources/less/theme-colorpalette.less"; -@import "../../../../common/main/resources/less/dimension-picker.less"; @import "../../../../common/main/resources/less/hsb-colorpicker.less"; -@import "../../../../common/main/resources/less/table-styler.less"; @import "../../../../common/main/resources/less/masked-field.less"; @import "../../../../common/main/resources/less/extended-color-picker.less"; @import "../../../../common/main/resources/less/layout.less"; @@ -115,14 +88,11 @@ @import "../../../../common/main/resources/less/synchronize-tip.less"; @import "../../../../common/main/resources/less/common.less"; @import "../../../../common/main/resources/less/switcher.less"; -@import "../../../../common/main/resources/less/history.less"; @import "../../../../common/main/resources/less/opendialog.less"; @import "../../../../common/main/resources/less/review-changes.less"; @import "../../../../common/main/resources/less/plugins.less"; @import "../../../../common/main/resources/less/toolbar.less"; -@import "../../../../common/main/resources/less/language-dialog.less"; @import "../../../../common/main/resources/less/winxp_fix.less"; -@import "../../../../common/main/resources/less/calendar.less"; @import "../../../../common/main/resources/less/symboltable.less"; @import "../../../../common/main/resources/less/hint-manager.less"; @import "../../../../common/main/resources/less/bigscaling.less"; @@ -136,7 +106,6 @@ @import "statusbar.less"; @import "leftmenu.less"; @import "filemenu.less"; -@import "advanced-settings.less"; @import "navigation.less"; @import "thumbnails.less"; diff --git a/apps/pdfeditor/main/resources/less/filemenu.less b/apps/pdfeditor/main/resources/less/filemenu.less index d445f1410d..25de646156 100644 --- a/apps/pdfeditor/main/resources/less/filemenu.less +++ b/apps/pdfeditor/main/resources/less/filemenu.less @@ -642,28 +642,6 @@ } } } - -/*.close { - width: 16px; - height: 16px; - cursor: pointer; - display: inline-block; - vertical-align: middle; - margin-left: 5px; - - background-position: @but-close-offset-x @but-close-offset-y; - - &.over, - &:hover { - background-position: @but-close-offset-x @but-close-offset-y - 16px; - opacity: 1; - } - - &.disabled { - background-position: @but-close-offset-x @but-close-offset-y - 32px; - cursor: default; - } -}*/ } #panel-protect { @@ -722,159 +700,4 @@ padding-left: 12px; padding-right: 12px; } -} - -#file-menu-panel { - #panel-print { - padding: 0; - .main-header { - .font-size-very-huge(); - margin: 18px 0 20px 0; - } - .comment-text{ - opacity: 0.45; - } - #id-print-settings { - position: absolute; - width:280px; - top: 0; - bottom: 0; - } - .print-settings { - width: 100%; - height: 100%; - overflow: hidden; - display: flex; - flex-direction: column; - border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; - border-right: @scaled-one-px-value solid @border-toolbar; - .rtl & { - border-right: none; - border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; - border-left: @scaled-one-px-value solid @border-toolbar; - } - label.header { - font-weight: 700; - } - .footer { - .btn.primary { - margin-right: 8px; - .rtl & { - margin-right: 0; - margin-left: 8px; - } - } - } - .settings-container { - width: 100%; - height: 100%; - overflow: hidden; - padding: 12px 16px; - .padding-small { - padding-bottom: 8px; - } - .padding-large { - padding-bottom: 16px; - } - - #print-apply-all { - margin-top: 5px; - } - .link { - margin-top: 9px; - } - .footer { - margin-top: 24px; - } - #print-txt-pages, #print-txt-copies { - padding-left: 5px; - .rtl & { - padding-left: 0; - padding-right: 5px; - } - } - } - } - #print-navigation { - height: 50px; - padding-left: 20px; - padding-top: 10px; - display: flex; - #print-prev-page { - display: inline-block; - margin-right: 4px; - } - #print-next-page { - display: inline-block; - } - .btn-prev-page, .btn-next-page { - background-color: transparent; - padding: 0; - height: 20px; - width: 20px; - i.arrow { - display: inline-block; - width: 10px; - height: 10px; - - border: solid @scaled-one-px-value-ie @icon-normal-ie; - border: solid @scaled-one-px-value @icon-normal; - border-bottom: none; - border-right: none; - } - &.disabled { - opacity: @component-disabled-opacity; - } - - &:hover:not(:disabled):not(.disabled) { - background-color: @highlight-button-hover-ie; - background-color: @highlight-button-hover; - } - } - .btn-prev-page { - i { - transform: rotate(-45deg) translate(-1px, 3px); - } - } - .btn-next-page { - i { - transform: rotate(135deg) translate(4px, 0px); - } - } - .page-number { - display: flex; - align-items: center; - height: 20px; - margin-left: 10px; - .rtl & { - margin-left: 0; - margin-right: 10px; - } - label { - .font-weight-bold(); - } - #print-count-page, #print-number-page { - margin-left: 4px; - .rtl & { - margin-left: 0; - margin-right: 4px; - } - } - } - } - #print-preview { - height: calc(100% - 50px); - } - #print-preview-box { - position: absolute; - left: 280px; - top: 0; - right: 0; - bottom: 0; - .rtl & { - right: 280px; - left: 0; - } - } - } } \ No newline at end of file diff --git a/apps/pdfeditor/main/resources/less/layout.less b/apps/pdfeditor/main/resources/less/layout.less index 61bac8163c..b8bcca3c3e 100644 --- a/apps/pdfeditor/main/resources/less/layout.less +++ b/apps/pdfeditor/main/resources/less/layout.less @@ -71,17 +71,6 @@ label { } } -#left-panel-history { - left: 40px; - width: 300px; - height: 100%; - display: none; -} - -#editor-container { - //background: #e2e2e2; -} - #editor_sdk { width: 100%; height: 100%; diff --git a/apps/pdfeditor/main/resources/less/leftmenu.less b/apps/pdfeditor/main/resources/less/leftmenu.less index ffc3702cf7..3ada83e7f6 100644 --- a/apps/pdfeditor/main/resources/less/leftmenu.less +++ b/apps/pdfeditor/main/resources/less/leftmenu.less @@ -1,10 +1,3 @@ - -.left-panel { - #left-panel-history { - height: 100%; - } -} - .left-menu-full-ct { width: 100%; height: 100%; diff --git a/apps/pdfeditor/main/resources/less/statusbar.less b/apps/pdfeditor/main/resources/less/statusbar.less index 1ce52a044d..bdf611f9db 100644 --- a/apps/pdfeditor/main/resources/less/statusbar.less +++ b/apps/pdfeditor/main/resources/less/statusbar.less @@ -26,18 +26,6 @@ cursor: pointer; } - #users-icon,#status-users-count { - display: inline-block; - cursor: pointer; - } - - #users-icon { - background-position: -14px -197px; - width: 20px; - height: 20px; - vertical-align: middle; - } - #label-zoom { text-align: center; } @@ -50,6 +38,14 @@ } } + #slot-status-btn-prev, #slot-status-btn-next { + margin-left: 4px; + .rtl & { + margin-left: 0; + margin-right: 4px; + } + } + .status-group { display: table-cell; white-space: nowrap; @@ -82,17 +78,6 @@ } } - #btn-cnt-lang, - #slot-status-btn-info { - button { - font-weight: 700; - .pixel-ratio__2_5 & { - display: flex; - align-items: center; - } - } - } - .cnt-zoom { display: inline-block; vertical-align: middle; @@ -156,95 +141,4 @@ display: inline-block; } } - - - #status-users-menu { - padding: 14px 0 14px 14px; - margin-left: 137px; - margin-bottom: 2px; - width: 285px; - .font-size-medium(); - - .rtl & { - padding: 14px 14px 14px 0; - margin-left: 0; - margin-right: 137px; - } - - > label { - white-space: normal; - } - - #status-users-list { - margin-top: 15px; - - ul { - margin: 0; - padding: 0; - overflow: hidden; - max-height: 190px; - position: relative; - - li { - list-style: none; - padding: 2px 0; - margin-right: 15px; - overflow: hidden; - - .rtl & { - margin-right: 0; - margin-left: 15px; - } - - &.offline, &.viewmode { - display: none; - } - } - } - - .color { - width: 12px; - height: 12px; - display: inline-block; - vertical-align: middle; - border: @scaled-one-px-value-ie solid @border-toolbar-ie; - border: @scaled-one-px-value solid @border-toolbar; - } - - .name { - display: block; - padding-left: 16px; - margin-top: -3px; - white-space: nowrap; - text-overflow: ellipsis; - vertical-align: middle; - .rtl & { - padding-left: 0; - padding-right: 16px; - } - } - } - } - - .hide-select-tools { - display: none; - } - - #btn-select-tool { - margin-right: 8px; - .rtl & { - margin-right: 0; - margin-left: 8px; - } - } - - .lang-menu { - li a { - padding-left: 28px !important; - .rtl & { - padding-left: 20px !important; - padding-right: 28px !important; - } - } - } } diff --git a/apps/pdfeditor/main/resources/less/toolbar.less b/apps/pdfeditor/main/resources/less/toolbar.less index 36d8dd855f..dc9f61fd1b 100644 --- a/apps/pdfeditor/main/resources/less/toolbar.less +++ b/apps/pdfeditor/main/resources/less/toolbar.less @@ -29,81 +29,6 @@ background-color: transparent; } -.item-markerlist { - width: 40px; - height: 40px; -} - -.item-multilevellist { - width: 80px; - height: 80px; -} - -.dropdown-menu.toc-menu { - @contents-menu-item-height: 72px; - --bckgHOffset: ~"0px"; - - > li > a.item-contents { - div { - background-color: #fff; - width: 248px; - - .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); - .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); - - &:hover, - &.selected { - .box-shadow(0 0 0 2px @border-control-focus-ie); - .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); - } - - canvas { - vertical-align: middle; - } - } - - &:hover, &:focus { - background-color: transparent; - - div { - .box-shadow(0 0 0 2px @border-control-focus-ie); - .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); - } - } - } -} - -// page number position -.menu-pageposition { - .dataview { - width: 144px; - height: 100px; - margin: 0 10px; - - &.disabled { - > .item { - cursor: default; - opacity: @component-disabled-opacity-ie; - opacity: @component-disabled-opacity; - - &:hover { - .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); - .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); - } - } - } - } - - .item-pagenumber { - .ie & { - .background-ximage('@{app-image-path}/iconshuge.png', '@{app-image-path}/iconshuge@2x.png', 40px); - } - - width: 40px; - height: 40px; - } -} - // menu zoom .dropdown-menu .menu-zoom { line-height: @line-height-base; @@ -160,17 +85,6 @@ text-overflow: ellipsis; } -.save-style-container { - border-left: @scaled-one-px-value-ie solid @border-regular-control-ie; - border-left: @scaled-one-px-value solid @border-regular-control; - border-top: @scaled-one-px-value-ie solid @border-regular-control-ie; - border-top: @scaled-one-px-value solid @border-regular-control; - - a { - padding: 14px 20px !important; - } -} - #slot-field-fontname { float: left; width: 84px; @@ -196,319 +110,4 @@ margin-left: 0; margin-right: 2px; } -} - -#special-paste-container, -#equation-container { - position: absolute; - z-index: @zindex-dropdown - 20; - - background-color: @background-toolbar-ie; - background-color: @background-toolbar; - border: @scaled-one-px-value-ie solid @border-regular-control-ie; - border: @scaled-one-px-value solid @border-regular-control; - - border-radius: 3px; - overflow: hidden; - box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2); -} - -#equation-container { - .separator { - height: 30px; - } - &.has-open-menu { - z-index: @zindex-navbar + 1; - } - .btn-toolbar { - display: flex; - justify-content: center; - align-items: center; - width: 30px; - height: 30px; - border-radius: 0px; - } -} - -.dropdown-menu.list-settings-level { - .menu-list-preview { - .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); - .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); - - background-color: @canvas-content-background; - } - - a:hover, a:focus, a.checked { - background-color: transparent; - .menu-list-preview { - .box-shadow(0 0 0 2px @border-control-focus-ie); - .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); - } - } - a.checked { - &:before { - display: none !important; - } - } -} - -#id-toolbar-btn-markers, -#id-toolbar-btn-numbering, -#id-toolbar-btn-multilevels { - .menu-markers { - margin: 2px 0 0 9px; - - .rtl & { - margin: 2px 9px 0 0; - } - } - - .list-level > a { - padding-right: 20px; - - .rtl & { - padding-right: 12px; - padding-left: 20px; - } - } -} - -.list-settings { - .padding-right-big { - padding-right: 10px; - - .rtl & { - padding-right: 0; - padding-left: 10px; - } - } -} - -#window-page-margins { - .margins-settings { - float: left; - - .rtl & { - float: right; - } - } - - .margins-preview { - float: right; - - .rtl & { - float: left; - } - } - - .margin-left { - margin-left: 8px; - - .rtl & { - margin-left: 0; - margin-right: 8px; - } - } -} - -#window-page-size { - .padding-right { - padding-right: 10px; - - .rtl & { - padding-right: 0; - padding-left: 10px; - } - } -} - -#window-line-numbers { - .margin-right { - margin-right: 9px; - - .rtl & { - margin-right: 0; - margin-left: 9px; - } - } -} - -#window-custom-columns { - #custom-columns-spin-num, #custom-columns-spin-spacing { - float: right; - - .rtl & { - float: left; - } - } -} - -#window-note-settings { - #note-settings-combo-footnote, - #note-settings-combo-endnote { - float: right; - - .rtl & { - float: left; - } - } - - .margin-right { - margin-right: 10px; - - .rtl & { - margin-right: 0; - margin-left: 10px; - } - } -} - -#window-table-contents { - .canvas-box { - float: right; - - .rtl & { - float: left; - } - } - - .margin-left { - margin-left: 10px; - - .rtl & { - margin-left: 0; - margin-right: 10px; - } - } - - .label-style { - margin-left: 23px; - - .rtl & { - margin-left: 0; - margin-right: 23px; - } - } -} - -#window-hyperlink { - #id-dlg-hyperlink-external { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - .rtl & { - .border-radius(@border-radius-small); - border-top-left-radius: 0; - border-bottom-left-radius: 0; - - } - } - - #id-dlg-hyperlink-internal { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-width: 0; - margin-left: -1px; - - .rtl & { - border: @scaled-one-px-value solid @border-regular-control; - .border-radius(@border-radius-small); - margin-left: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-width: 0; - margin-right: -1px; - } - } -} - -#window-bookmarks { - .margin-right { - margin-right: 10px; - - .rtl & { - margin-right: 0; - margin-left: 10px; - } - } - - #bookmarks-btn-goto { - margin-right: 5px; - - .rtl & { - margin-right: 0; - margin-left: 5px; - } - } - - #id-dlg-copy-btn { - margin-left: 5px; - - .rtl & { - margin-left: 0; - margin-right: 5px; - } - } - - #bookmarks-btn-delete { - float: right; - - .rtl & { - float: left; - } - } - - #bookmarks-radio-name { - display: inline-block; - margin-right: 10px; - vertical-align: middle; - - .rtl & { - margin-right: 0; - margin-left: 10px; - } - } -} - -#window-caption { - .margin-right { - margin-right: 10px; - - .rtl & { - margin-right: 0; - margin-left: 10px; - } - } -} - -#window-cross-ref { - #id-dlg-cross-separate { - margin-right: 10px; - - .rtl & { - margin-right: 0; - margin-left: 10px; - } - } -} - -.dropdown-menu.menu-roles, -.input-group-nr.menu-roles { - span.color { - display: inline-block; - vertical-align: text-top; - width: 12px; - height: 12px; - margin: 0 8px 0 2px; - border: @scaled-one-px-value-ie solid @border-color-shading-ie; - border: @scaled-one-px-value solid @border-color-shading; - } -} - -#id-toolbar-menu-insart { - margin-left: 5px; - .rtl & { - margin-left: 0; - margin-right: 5px; - } -} +} \ No newline at end of file