Skip to content

W
web-apps
Commit e1049695 authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

[DE] Update note settings.

parent da8c914a
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 42 deletions
apps/documenteditor/main/app/controller/Toolbar.js
View file @ e1049695
...@@ -2033,14 +2033,14 @@ define([ ...@@ -2033,14 +2033,14 @@ define([
onFootnotePrevClick: function(btn) { onFootnotePrevClick: function(btn) {
if (this.api) if (this.api)
this.api.GotoFootnotePrev(); this.api.asc_GotoFootnote(false);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
}, },
onFootnoteNextClick: function(btn) { onFootnoteNextClick: function(btn) {
if (this.api) if (this.api)
this.api.GotoFootnoteNext(); this.api.asc_GotoFootnote(true);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
}, },
......
apps/documenteditor/main/app/template/Toolbar.template
View file @ e1049695
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertimage"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertimage"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertchart"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertchart"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserttext"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserttext"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertequation"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-dropcap"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-dropcap"></span>
</div> </div>
<div class="toolbar-row"> <div class="toolbar-row">
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserttable"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserttable"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserthyperlink"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-inserthyperlink"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertshape"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertshape"></span>
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-insertequation"></span> <span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-notes"></span>
</div> </div>
</div> </div>
<div class="separator long" style="margin-left: 5px;"></div> <div class="separator long" style="margin-left: 5px;"></div>
...@@ -191,12 +192,6 @@ ...@@ -191,12 +192,6 @@
<span class="btn-placeholder" id="id-toolbar-full-placeholder-btn-mailrecepients"></span> <span class="btn-placeholder" id="id-toolbar-full-placeholder-btn-mailrecepients"></span>
</div> </div>
</div> </div>
<div class="separator long" style="margin-left: 5px;"></div>
<div class="toolbar-group">
<div class="toolbar-row">
<span class="btn-placeholder split" id="id-toolbar-full-placeholder-btn-notes"></span>
</div>
</div>
<div class="toolbar-group" id="id-toolbar-full-placeholder-field-styles" style="width: 100%; min-width: 160px;"> <div class="toolbar-group" id="id-toolbar-full-placeholder-field-styles" style="width: 100%; min-width: 160px;">
</div> </div>
<div class="toolbar-group no-mask"> <div class="toolbar-group no-mask">
......
apps/documenteditor/main/app/view/NoteSettingsDialog.js
View file @ e1049695
...@@ -59,66 +59,62 @@ define([ ...@@ -59,66 +59,62 @@ define([
title: this.textTitle, title: this.textTitle,
template: [ template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">', '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<div class="content-panel" style="padding: 0;"><div class="inner-content">', '<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
'<div class="settings-panel active">', '<div class="settings-panel active">',
'<table cols="2" style="width: 100%;">', '<table cols="1" style="width: 100%;">',
'<tr>', '<tr>',
'<td colspan=2 class="padding-small">', '<td class="padding-small">',
'<label class="header">', me.textLocation,'</label>', '<label class="header">', me.textLocation,'</label>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td class="padding-large" style="width: 50%;">',
'<label class="input-label">', me.textFootnote,'</label>',
// '<div id="note-settings-radio-footnote" class="padding-small" style="display: block;"></div>',
'</td>',
'<td class="padding-large">', '<td class="padding-large">',
'<div id="note-settings-combo-footnote" class="input-group-nr" style="width:100%;"></div>', '<label class="input-label" style="margin-top: 4px;">', me.textFootnote,'</label>',
'<div id="note-settings-combo-footnote" class="input-group-nr" style="display: inline-block; width:150px;float:right;"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td colspan=2>', '<td>',
'<div class="padding-large text-only"></div>', '<div class="padding-large"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td colspan=2 class="padding-small">', '<td class="padding-small">',
'<label class="header">', me.textFormat,'</label>', '<label class="header">', me.textFormat,'</label>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td class="padding-small">', '<td class="padding-small">',
'<label class="input-label">', me.textNumFormat,'</label>', '<div style="display: inline-block; margin-right: 10px;">',
'<div id="note-settings-combo-format" class="input-group-nr" style="width:100px;"></div>', '<label class="input-label">', me.textNumFormat,'</label>',
'</td>', '<div id="note-settings-combo-format" class="input-group-nr" style="width:150px;"></div>',
'<td class="padding-small">', '</div>','<div style="display: inline-block;">',
'<label class="input-label">', me.textStart,'</label>', '<label class="input-label">', me.textStart,'</label>',
'<div id="note-settings-spin-start"></div>', '<div id="note-settings-spin-start"></div>',
'</div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td colspan=2 class="padding-small">', '<td class="padding-small">',
'<label class="input-label">', me.textNumbering, '</label>', '<label class="input-label">', me.textNumbering, '</label>',
'<div id="note-settings-combo-numbering" class="input-group-nr" style="width:140px;"></div>', '<div id="note-settings-combo-numbering" class="input-group-nr" style="width:150px;"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td colspan=2 class="padding-large">', '<td class="padding-large">',
'<label class="input-label">', me.textCustom, '</label>', '<label class="input-label">', me.textCustom, '</label>',
'<div id="note-settings-txt-custom"></div>', '<div id="note-settings-txt-custom"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td colspan=2>', '<td>',
'<div class="padding-large text-only"></div>', '<div class="padding-large"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td class="padding-small">', '<td class="padding-small">',
'<label class="header">', me.textApplyTo,'</label>', '<label class="header" style="margin-top: 4px;">', me.textApplyTo,'</label>',
'</td>', '<div id="note-settings-combo-apply" class="input-group-nr" style="display: inline-block; width:150px;float:right;"></div>',
'<td class="padding-small">',
'<div id="note-settings-combo-apply" class="input-group-nr" style="width:100%;"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'</table>', '</table>',
...@@ -150,7 +146,7 @@ define([ ...@@ -150,7 +146,7 @@ define([
this.cmbFootnote = new Common.UI.ComboBox({ this.cmbFootnote = new Common.UI.ComboBox({
el: $('#note-settings-combo-footnote'), el: $('#note-settings-combo-footnote'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;', menuStyle: 'min-width: 150px;',
editable: false, editable: false,
data: [ data: [
{ displayValue: this.textPageBottom, value: Asc.c_oAscFootnotePos.section_footnote_PosPageBottom }, { displayValue: this.textPageBottom, value: Asc.c_oAscFootnotePos.section_footnote_PosPageBottom },
...@@ -162,7 +158,7 @@ define([ ...@@ -162,7 +158,7 @@ define([
this.cmbFormat = new Common.UI.ComboBox({ this.cmbFormat = new Common.UI.ComboBox({
el: $('#note-settings-combo-format'), el: $('#note-settings-combo-format'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 150px;',
editable: false, editable: false,
data: [ data: [
{ displayValue: '1, 2, 3,...', value: 1, maskExp: /[0-9]/, defValue: 1 }, { displayValue: '1, 2, 3,...', value: 1, maskExp: /[0-9]/, defValue: 1 },
...@@ -179,7 +175,7 @@ define([ ...@@ -179,7 +175,7 @@ define([
this.spnStart = new Common.UI.CustomSpinner({ this.spnStart = new Common.UI.CustomSpinner({
el: $('#note-settings-spin-start'), el: $('#note-settings-spin-start'),
step: 1, step: 1,
width: 100, width: 85,
defaultUnit : "", defaultUnit : "",
value: 1, value: 1,
maxValue: 16383, maxValue: 16383,
...@@ -191,7 +187,7 @@ define([ ...@@ -191,7 +187,7 @@ define([
this.cmbNumbering = new Common.UI.ComboBox({ this.cmbNumbering = new Common.UI.ComboBox({
el: $('#note-settings-combo-numbering'), el: $('#note-settings-combo-numbering'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;', menuStyle: 'min-width: 150px;',
editable: false, editable: false,
data: [ data: [
{ displayValue: this.textContinue, value: Asc.c_oAscFootnoteRestart.section_footnote_RestartContinuous }, { displayValue: this.textContinue, value: Asc.c_oAscFootnoteRestart.section_footnote_RestartContinuous },
...@@ -206,7 +202,7 @@ define([ ...@@ -206,7 +202,7 @@ define([
allowBlank : true, allowBlank : true,
validateOnChange: true, validateOnChange: true,
validateOnBlur: false, validateOnBlur: false,
style : 'width: 100px; vertical-align: middle;', style : 'width: 85px; vertical-align: middle;',
value : '' value : ''
}).on ('changing', function (input, value) { }).on ('changing', function (input, value) {
me.cmbFormat.setDisabled(value.length>0); me.cmbFormat.setDisabled(value.length>0);
...@@ -216,7 +212,7 @@ define([ ...@@ -216,7 +212,7 @@ define([
this.cmbApply = new Common.UI.ComboBox({ this.cmbApply = new Common.UI.ComboBox({
el: $('#note-settings-combo-apply'), el: $('#note-settings-combo-apply'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;', menuStyle: 'min-width: 150px;',
editable: false, editable: false,
data: [ data: [
{ displayValue: this.textDocument, value: Asc.section_footnote_RestartContinuous }, { displayValue: this.textDocument, value: Asc.section_footnote_RestartContinuous },
......
apps/documenteditor/main/resources/less/toolbar.less
View file @ e1049695
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
.button-normal-icon(btn-zoomout, 58, @toolbar-icon-size); .button-normal-icon(btn-zoomout, 58, @toolbar-icon-size);
.button-normal-icon(btn-columns, 82, @toolbar-icon-size); .button-normal-icon(btn-columns, 82, @toolbar-icon-size);
.button-normal-icon(btn-pagemargins, 83, @toolbar-icon-size); .button-normal-icon(btn-pagemargins, 83, @toolbar-icon-size);
.button-normal-icon(btn-notes, 83, @toolbar-icon-size); .button-normal-icon(btn-notes, 85, @toolbar-icon-size);
.button-normal-icon(mmerge-next, 71, @toolbar-icon-size); .button-normal-icon(mmerge-next, 71, @toolbar-icon-size);
.button-normal-icon(mmerge-last, 72, @toolbar-icon-size); .button-normal-icon(mmerge-last, 72, @toolbar-icon-size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7