diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 091f655ef..2d1a0e042 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -2742,11 +2742,11 @@ define([
'
|
',
' |
',
' |
',
- ' |
',
+ //' |
',
'',
'',
' |
',
'',
@@ -2754,15 +2754,18 @@ define([
'',
'',
'',
'
',
'',
'',
'',
''
].join('')),
@@ -2791,13 +2794,19 @@ define([
{ value: Asc.c_oAscPrintType.ActiveSheets, displayValue: this.txtCurrentSheet },
{ value: Asc.c_oAscPrintType.EntireWorkbook, displayValue: this.txtAllSheets },
{ value: Asc.c_oAscPrintType.Selection, displayValue: this.txtSelection }
- ]
+ ],
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.cmbRange.on('selected', _.bind(this.comboRangeChange, this));
this.chIgnorePrintArea = new Common.UI.CheckBox({
el: $markup.findById('#print-chb-ignore'),
- labelText: this.txtIgnore
+ labelText: this.txtIgnore,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.cmbSheet = new Common.UI.ComboBox({
@@ -2806,7 +2815,10 @@ define([
editable: false,
cls: 'input-group-nr',
data: [],
- takeFocusOnClose: true
+ takeFocusOnClose: true,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.cmbPaperSize = new Common.UI.ComboBox({
@@ -2829,7 +2841,10 @@ define([
{value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'},
{value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'},
{value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3'}
- ]
+ ],
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.cmbPaperOrientation = new Common.UI.ComboBox({
@@ -2841,7 +2856,10 @@ define([
data : [
{ value: Asc.c_oAscPageOrientation.PagePortrait, displayValue: this.txtPortrait },
{ value: Asc.c_oAscPageOrientation.PageLandscape, displayValue: this.txtLandscape }
- ]
+ ],
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
var itemsTemplate =
@@ -2865,13 +2883,19 @@ define([
{ value: 3, displayValue: this.txtFitRows },
{ value: 'customoptions', displayValue: this.txtCustomOptions }
],
- itemsTemplate: itemsTemplate
+ itemsTemplate: itemsTemplate,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.txtRangeTop = new Common.UI.InputField({
el: $markup.findById('#print-txt-top'),
allowBlank: true,
- validateOnChange: true
+ validateOnChange: true,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.btnPresetsTop = new Common.UI.Button({
@@ -2879,13 +2903,19 @@ define([
cls: 'btn-text-menu-default',
caption: this.txtRepeat,
style: 'width: 77px;',
- menu: true
+ menu: true,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.txtRangeLeft = new Common.UI.InputField({
el: $markup.findById('#print-txt-left'),
allowBlank: true,
- validateOnChange: true
+ validateOnChange: true,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.btnPresetsLeft = new Common.UI.Button({
@@ -2893,7 +2923,10 @@ define([
cls: 'btn-text-menu-default',
caption: this.txtRepeat,
style: 'width: 77px;',
- menu: true
+ menu: true,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.spnMarginTop = new Common.UI.MetricSpinner({
@@ -2903,7 +2936,10 @@ define([
defaultUnit : "cm",
value: '0 cm',
maxValue: 48.25,
- minValue: 0
+ minValue: 0,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.spinners.push(this.spnMarginTop);
@@ -2914,7 +2950,10 @@ define([
defaultUnit : "cm",
value: '0 cm',
maxValue: 48.25,
- minValue: 0
+ minValue: 0,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.spinners.push(this.spnMarginBottom);
@@ -2925,7 +2964,10 @@ define([
defaultUnit : "cm",
value: '0.19 cm',
maxValue: 48.25,
- minValue: 0
+ minValue: 0,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.spinners.push(this.spnMarginLeft);
@@ -2936,23 +2978,32 @@ define([
defaultUnit : "cm",
value: '0.19 cm',
maxValue: 48.25,
- minValue: 0
+ minValue: 0,
+ dataHint: '2',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.spinners.push(this.spnMarginRight);
this.chPrintGrid = new Common.UI.CheckBox({
el: $markup.findById('#print-chb-grid'),
- labelText: this.txtPrintGrid
+ labelText: this.txtPrintGrid,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.chPrintRows = new Common.UI.CheckBox({
el: $markup.findById('#print-chb-rows'),
- labelText: this.txtPrintHeadings
+ labelText: this.txtPrintHeadings,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
- this.btnApplyAll = new Common.UI.Button({
+ /*this.btnApplyAll = new Common.UI.Button({
el: $markup.findById('#print-apply-all')
- });
+ });*/
this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.find('.fms-flex-apply').addBack().filter('.fms-flex-apply');
@@ -2967,6 +3018,22 @@ define([
el: $markup.findById('#print-btn-print')
});
+ this.btnPrevPage = new Common.UI.Button({
+ parentEl: $markup.findById('#print-prev-page'),
+ cls: 'btn-prev-page',
+ iconCls: 'arrow',
+ dataHint: '2',
+ dataHintDirection: 'top'
+ });
+
+ this.btnNextPage = new Common.UI.Button({
+ parentEl: $markup.findById('#print-next-page'),
+ cls: 'btn-next-page',
+ iconCls: 'arrow',
+ dataHint: '2',
+ dataHintDirection: 'top'
+ });
+
this.$el = $(node).html($markup);
this.$el.on('click', '#print-header-footer-settings', _.bind(this.openHeaderSettings, this));
diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
index 554d84cb9..774376152 100644
--- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -580,6 +580,42 @@
}
#print-navigation {
height: 50px;
+ padding-left: 20px;
+ padding-top: 10px;
+ .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);
+ }
+ }
}
#print-preview {
height: calc(100% - 50px);