Compare commits

...

3 commits

Author SHA1 Message Date
Julia Svinareva a94086468e [DE] Bug 36794 (Insert Page Number) 2019-09-25 16:52:15 +03:00
Julia Svinareva f92ad5f015 [DE] Bug 36794 (Insert number of pages) 2019-09-25 10:56:07 +03:00
Julia Svinareva e5ec005568 [DE] Bug 36794 (Insert Page Number) 2019-09-23 15:17:57 +03:00
4 changed files with 252 additions and 2 deletions

View file

@ -56,7 +56,8 @@ define([
'documenteditor/main/app/controller/PageLayout',
'documenteditor/main/app/view/CustomColumnsDialog',
'documenteditor/main/app/view/ControlSettingsDialog',
'documenteditor/main/app/view/WatermarkSettingsDialog'
'documenteditor/main/app/view/WatermarkSettingsDialog',
'documenteditor/main/app/view/InsertPageNumberDialog'
], function () {
'use strict';
@ -319,6 +320,7 @@ define([
toolbar.btnEditHeader.menu.on('item:click', _.bind(this.onEditHeaderFooterClick, this));
toolbar.mnuPageNumCurrentPos.on('click', _.bind(this.onPageNumCurrentPosClick, this));
toolbar.mnuInsertPageCount.on('click', _.bind(this.onInsertPageCountClick, this));
toolbar.mnuInsertNumberOfPage.on('click', _.bind(this.onInsertPageCountClick, this));
toolbar.btnBlankPage.on('click', _.bind(this.onBtnBlankPageClick, this));
toolbar.listStyles.on('click', _.bind(this.onListStyleSelect, this));
toolbar.listStyles.on('contextmenu', _.bind(this.onListStyleContextMenu, this));
@ -326,6 +328,7 @@ define([
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this));
toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this));
toolbar.mnuPageNumber.on('item:click', _.bind(this.onPageNumberMenuClick, this));
Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this));
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
@ -1399,6 +1402,23 @@ define([
}
},
onPageNumberMenuClick: function(menu, item, e) {
if (item.value === 'insertpagenumber') {
var me = this;
(new DE.Views.InsertPageNumberDialog({
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
}
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
}
},
onInsertImageClick: function(menu, item, e) {
var me = this;
if (item.value === 'file') {

View file

@ -84,6 +84,7 @@
<span class="btn-slot text x-huge" id="slot-btn-blankpage"></span>
<span class="btn-slot text x-huge btn-pagebreak"></span>
<span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
<span class="btn-slot text x-huge" id="slot-btn-pagenumber"></span>
</div>
<div class="separator long"></div>
<div class="group">

View file

@ -0,0 +1,202 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* InsertPageNumberDialog.js
*
* Created by Julia Svinareva on 21/09/19
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/component/Window'
], function () { 'use strict';
DE.Views.InsertPageNumberDialog = Common.UI.Window.extend(_.extend({
options: {
width: 330,
header: true,
style: 'min-width: 338px;',
cls: 'modal-dlg',
id: 'window-page-number',
buttons: ['ok', 'cancel']
},
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle
}, options || {});
this.template = [
'<div class="box" style="">',
'<div style="display: inline-block; vertical-align: top; margin-bottom: 15px;">',
'<label>' + this.textNumberingStyle + '</label>',
'<div id="insert-page-number-style-list" style="height: 162px; width: 150px; margin-top: 6px;"></div>',
'</div>',
'<div style="display: inline-block; width: 131px; height: 184px; vertical-align: top; float: right; position: relative;">',
'<label style="margin-bottom: 5px;">' + this.textAlignment + '</label>',
'<div>',
'<div id="page-number-button-top-left" style="display: inline-block; margin: 0 10px 10px 0;"></div>',
'<div id="page-number-button-top-center" style="display: inline-block; margin: 0 10px 10px 0;"></div>',
'<div id="page-number-button-top-right" style="display: inline-block;"></div>',
'<div id="page-number-button-bottom-left" style="display: inline-block; margin: 0 10px 10px 0;"></div>',
'<div id="page-number-button-bottom-center" style="display: inline-block; margin: 0 10px 10px 0;"></div>',
'<div id="page-number-button-bottom-right" style="display: inline-block;"></div>',
'</div>',
'<button id="insert-page-number-cur-pos" class="btn btn-text-default" style="width: 131px;">' + this.textToCurrentPosition + '</button>',
'</div>',
'<div id="insert-page-number-checkbox" style=""></div>',
'</div>',
].join('');
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
var _arrPosition = [
[c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'icon-right-panel btn-colontitul-tl', 'page-number-button-top-left', this.textTopLeft],
[c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'icon-right-panel btn-colontitul-tc', 'page-number-button-top-center', this.textTopCenter],
[c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'icon-right-panel btn-colontitul-tr', 'page-number-button-top-right', this.textTopRight],
[c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'icon-right-panel btn-colontitul-bl', 'page-number-button-bottom-left', this.textBottomLeft],
[c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'icon-right-panel btn-colontitul-bc', 'page-number-button-bottom-center', this.textBottomCenter],
[c_pageNumPosition.PAGE_NUM_POSITION_BOTTOM, c_pageNumPosition.PAGE_NUM_POSITION_RIGHT, 'icon-right-panel btn-colontitul-br', 'page-number-button-bottom-right', this.textBottomRight]
];
this._btnsPosition = [];
_.each(_arrPosition, function(item, index, list){
var _btn = new Common.UI.Button({
cls: 'btn-options huge',
iconCls: item[2],
posWhere:item[0],
posAlign:item[1],
hint: item[4]
});
_btn.render( $('#'+item[3])) ;
_btn.on('click', _.bind(this.onPageNumberPosClick, this));
this._btnsPosition.push( _btn );
}, this);
this.btnPageNumCurrentPos = new Common.UI.Button({
el: $('#insert-page-number-cur-pos')
});
this.btnPageNumCurrentPos.on('click', this.onPageNumCurrentPosClick);
var arrStyles = [
{value: '1'},
{value: '~1~'},
{value: this.textPg1},
{value: this.textPage1},
{value: this.textPage1of10},
{value: this.text1of10},
{value: this.textPg1of10},
{value: this.text1pipePage},
{value: this.text1Pg},
{value: '( 1 )'},
{value: '[ 1 ]'},
{value: '{ 1 }'},
{value: '— 1 —'},
{value: '| 1 |'},
{value: '-1-'},
];
this.numStylesStore = new Common.UI.DataViewStore();
this.listNumberingStyle = new Common.UI.ListView({
el: $('#insert-page-number-style-list', this.window),
store: this.numStylesStore,
itemTemplate: _.template('<div id="<%= id %>" class="list-item" style="pointer-events:none; text-align: center;"><%= value %></div>')
});
this.numStylesStore.reset(arrStyles);
this.listNumberingStyle.scroller.update({alwaysVisibleY: true});
this.chStartAt2Page = new Common.UI.CheckBox({
el: $('#insert-page-number-checkbox'),
labelText: this.textStartAt2Page
});
var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
},
_handleInput: function(state) {
if (this.options.handler)
this.options.handler.call(this, this, state);
this.close();
},
onBtnClick: function(event) {
this._handleInput(event.currentTarget.attributes['result'].value);
},
onPrimary: function(event) {
this._handleInput('ok');
return false;
},
getSettings: function() {
return this;
},
onPageNumberPosClick: function(event) {
event.$el.parent().parent().find('.active').removeClass('active');
event.$el.find('button').addClass('active');
},
onPageNumCurrentPosClick: function(event) {
event.$el.parent().find('.active').removeClass('active');
event.$el.toggleClass('active');
},
textTitle: 'Insert page number',
textToCurrentPosition: 'To current position',
textAlignment: 'Alignment',
textNumberingStyle: 'Numbering style',
textPg1: 'Pg. 1',
textPage1: 'Page 1',
textPage1of10: 'Page 1 of 10',
text1of10: '1 of 10',
textPg1of10: 'Pg. 1 of 10',
text1pipePage: '1 | Page',
text1Pg: '1 pg.',
textStartAt2Page: 'Start at second page',
textTopLeft: 'Top Left',
textTopRight: 'Top Right',
textTopCenter: 'Top Center',
textBottomLeft: 'Bottom Left',
textBottomRight: 'Bottom Right',
textBottomCenter: 'Bottom Center'
}, DE.Views.InsertPageNumberDialog || {}))
});

View file

@ -555,6 +555,14 @@ define([
this.paragraphControls.push(this.mnuInsertPageCount);
this.toolbarControls.push(this.btnEditHeader);
this.btnPageNumber = new Common.UI.Button({
id: 'id-toolbar-btn-pagenumber',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-editheader',
caption: me.capBtnPageNumber,
menu: true
});
this.btnBlankPage = new Common.UI.Button({
id: 'id-toolbar-btn-blankpage',
cls: 'btn-toolbar x-huge icon-top',
@ -1306,6 +1314,7 @@ define([
_injectComponent('#slot-btn-controls', this.btnContentControls);
_injectComponent('#slot-btn-columns', this.btnColumns);
_injectComponent('#slot-btn-editheader', this.btnEditHeader);
_injectComponent('#slot-btn-pagenumber', this.btnPageNumber);
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
_injectComponent('#slot-btn-insshape', this.btnInsertShape);
_injectComponent('#slot-btn-insequation', this.btnInsertEquation);
@ -1576,6 +1585,7 @@ define([
this.btnInsertText.updateHint(this.tipInsertText);
this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
this.btnEditHeader.updateHint(this.tipEditHeader);
this.btnPageNumber.updateHint(this.tipPageNumber);
this.btnBlankPage.updateHint(this.tipBlankPage);
this.btnInsertShape.updateHint(this.tipInsertShape);
this.btnInsertEquation.updateHint(this.tipInsertEquation);
@ -1651,6 +1661,19 @@ define([
this.paragraphControls.push(this.mnuPageNumCurrentPos);
this.paragraphControls.push(this.mnuInsertPageCount);
this.btnPageNumber.setMenu(
new Common.UI.Menu({
items: [
{caption: this.capInsertPageNumber, value: 'insertpagenumber'},
this.mnuInsertNumberOfPage = new Common.UI.MenuItem({
caption: this.textInsertPageCount,
value: 'insertnumberofpage'
})
]
})
);
this.mnuPageNumber = this.btnPageNumber.menu;
this.btnInsertChart.setMenu( new Common.UI.Menu({
style: 'width: 435px;',
items: [
@ -2324,7 +2347,11 @@ define([
capBtnWatermark: 'Watermark',
textEditWatermark: 'Custom Watermark',
textRemWatermark: 'Remove Watermark',
tipWatermark: 'Edit watermark'
tipWatermark: 'Edit watermark',
capBtnPageNumber: 'Page Number',
tipPageNumber: 'Insert page number',
capInsertPageNumber: 'Insert page number',
capInsertNumberOfPages: 'Insert number of pages'
}
})(), DE.Views.Toolbar || {}));
});