pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 04:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring AdvancedSettingsWindow templates

Browse Source
This commit is contained in:
Julia Radzhabova
2023-10-25 22:38:52 +03:00
parent b3ae32e477
commit bbcbfc32ce
46 changed files with 242 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/common/forms/lib/view/modals.js
View File

@ -44,13 +44,13 @@ define([
width: 300,
header: true,
style: 'min-width: 300px;',
cls: 'modal-dlg',
buttons: null
cls: 'modal-dlg'
},
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle
title: this.textTitle,
buttons: [{value: 'ok', caption: this.txtCopy}]
}, options || {});
this.template = [
@ -73,10 +73,7 @@ define([
'</tr>',
'</table>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal primary dlg-btn" style="min-width: 86px;width: auto;">' + this.txtCopy + '</button>',
'</div>'
'<div class="separator horizontal"></div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);
@ -160,13 +157,13 @@ define([
width: 300,
header: true,
style: 'min-width: 300px;',
cls: 'modal-dlg',
buttons: null
cls: 'modal-dlg'
},
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle
title: this.textTitle,
buttons: [{value: 'ok', caption: this.txtCopy}]
}, options || {});
this.template = [
@ -189,10 +186,7 @@ define([
'</tr>',
'</table>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal primary dlg-btn" style="min-width: 86px;width: auto;">' + this.txtCopy + '</button>',
'</div>'
'<div class="separator horizontal"></div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);

14
apps/common/main/lib/view/AdvancedSettingsWindow.js
View File

@ -49,22 +49,28 @@ define([
header: true,
cls: 'advanced-settings-dlg',
toggleGroup: 'advanced-settings-group',
contentTemplate: '',
contentTemplate: '', // use instead 'template' for internal layout
contentStyle: '',
items: [],
buttons: ['ok', 'cancel']
buttons: ['ok', 'cancel'],
separator: true
}, options);
this.template = options.template || [
'<div class="box">',
'<% if (items.length>0) { %>',
'<div class="menu-panel">',
'<% _.each(items, function(item) { %>',
'<button class="btn btn-category" content-target="<%= item.panelId %>"><span class=""><%= item.panelCaption %></span></button>',
'<% }); %>',
'</div>',
'<div class="separator"></div>',
'<div class="content-panel" >' + _options.contentTemplate + '</div>',
'<% } %>',
'<div class="content-panel" style="<%= contentStyle %>">' + _options.contentTemplate + '</div>',
'</div>',
'<div class="separator horizontal"></div>'
'<% if (separator) { %>',
'<div class="separator horizontal"></div>',
'<% } %>'
].join('');
_options.tpl = _.template(this.template)(_options);

18
apps/common/main/lib/view/AutoCorrectDialog.js
View File

@ -53,7 +53,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
options: {
contentWidth: 375,
contentHeight: 345,
buttons: null,
buttons: ['close'],
toggleGroup: 'autocorrect-dialog-group'
},
@ -77,21 +77,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
title: this.textTitle,
storageName: this.appPrefix + 'autocorrect-dialog-category',
items: items,
template: [
'<div class="box">',
'<div class="menu-panel" style="overflow: hidden;">',
'<% _.each(items, function(item) { %>',
'<button class="btn btn-category" content-target="<%= item.panelId %>"><span class=""><%= item.panelCaption %></span></button>',
'<% }); %>',
'</div>',
'<div class="separator"></div>',
'<div class="content-panel">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
contentTemplate: _.template(contentTemplate)({scope: this})
}, options || {});
this.api = this.options.api;

2
apps/common/main/lib/view/ExternalEditor.js
View File

@ -72,7 +72,7 @@ define([
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer" style="text-align: center;">',
'<button id="id-btn-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
'<button id="id-btn-editor-apply" class="btn normal dlg-btn primary auto" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
'<button id="id-btn-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
'</div>'
].join('');

4
apps/common/main/lib/view/OpenDialog.js
View File

@ -138,10 +138,10 @@ define([
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
'<% if (closeFile) { %>',
'<button class="btn normal dlg-btn custom margin-left-10" result="cancel">' + t.closeButtonText + '</button>',
'<button class="btn normal dlg-btn auto margin-left-10" result="cancel">' + t.closeButtonText + '</button>',
'<% } %>',
'<% if (closable) { %>',
'<button class="btn normal dlg-btn custom margin-left-10" result="cancel">' + t.cancelButtonText + '</button>',
'<button class="btn normal dlg-btn auto margin-left-10" result="cancel">' + t.cancelButtonText + '</button>',
'<% } %>',
'</div>'
].join('');

6
apps/documenteditor/main/app/template/WatermarkSettings.template
View File

@ -1,4 +1,6 @@
<table cols="1">
<div class="settings-panel active">
<div class="inner-content">
<table cols="1" style="width: 100%;">
<tr><td class="padding-small">
<div id="watermark-radio-none"></div>
</td></tr>
@ -65,3 +67,5 @@
</table>
</td></tr>
</table>
</div>
</div>

20
apps/documenteditor/main/app/view/BookmarksDialog.js
View File

@ -50,7 +50,8 @@ define([
DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 320,
buttons: null,
buttons: ['close'],
separator: false,
id: 'window-bookmarks'
},
@ -59,10 +60,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 5px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-extra-small">',
@ -106,13 +107,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textClose + '</button>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

14
apps/documenteditor/main/app/view/CaptionDialog.js
View File

@ -48,6 +48,7 @@ define([
DE.Views.CaptionDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 351,
separator: false,
id: 'window-caption'
},
@ -56,10 +57,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 5px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="4" style="width: auto;">',
'<tr>',
'<td colspan="3" class="padding-small">',
@ -120,9 +121,8 @@ define([
'</tr>',
'</table>',
'</div>',
'</div></div>',
'</div>'
].join('')
'</div>'
].join(''))({scope: this})
}, options);
this.objectType = options.objectType;

2
apps/documenteditor/main/app/view/FileMenuPanels.js
View File

@ -1960,7 +1960,7 @@ define([
'<td class="right"><div id="id-info-rights"></div></td>',
'</tr>',
'<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom margin-right-10">' + this.txtBtnAccessRights + '</button></td>',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary auto margin-right-10">' + this.txtBtnAccessRights + '</button></td>',
'</tr>',
'</table>'
].join(''));

8
apps/documenteditor/main/app/view/MailMergeEmailDlg.js
View File

@ -51,12 +51,8 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},

29
apps/documenteditor/main/app/view/NoteSettingsDialog.js
View File

@ -47,9 +47,9 @@ define([
DE.Views.NoteSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
contentWidth: 310,
id: 'window-note-settings',
buttons: null
separator: false
},
initialize : function(options) {
@ -57,10 +57,16 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
buttons: [
{value: 'insert', caption: this.textInsert},
{value: 'apply', caption: this.textApply, id: 'note-settings-btn-apply'},
'cancel'
],
primary: 'insert',
contentStyle: 'padding: 0 5px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-small">',
@ -114,15 +120,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="insert" style="width: 86px;">' + me.textInsert + '</button>',
'<button id="note-settings-btn-apply" class="btn normal dlg-btn" result="apply" style="width: 86px;">' + me.textApply + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.cancelButtonText + '</button>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

13
apps/documenteditor/main/app/view/RolesManagerDlg.js
View File

@ -52,22 +52,15 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
options: {
alias: 'RolesManagerDlg',
contentWidth: 500,
buttons: null
buttons: ['close']
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

21
apps/documenteditor/main/app/view/SaveFormDlg.js
View File

@ -51,16 +51,19 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow',
options: {
alias: 'SaveFormDlg',
contentWidth: 320,
buttons: null
separator: false
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">',
buttons: [
{value: 'ok', caption: this.saveButtonText},
'cancel'
],
contentStyle: 'padding: 0;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table style="width: 100%;">',
@ -81,14 +84,8 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow',
'</tr>',
'</table>',
'</div>',
'</div>',
'</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="width: 86px;">' + this.saveButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.cancelButtonText + '</button>',
'</div>'
].join('')
'</div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

19
apps/documenteditor/main/app/view/TableOfContentsSettings.js
View File

@ -59,10 +59,10 @@ define([
_.extend(this.options, {
title: options.type ? this.textTitleTOF : this.textTitle,
contentHeight: height,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 15px 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 15px 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td class="padding-small">',
@ -92,7 +92,7 @@ define([
'</tr>',
'<tr>',
'<td class="padding-small">',
'<% if (type == 1) { %>',
'<% if (scope.type == 1) { %>',
'<label class="input-label padding-small" style="display: block;">' + me.textBuildTableOF + '</label>',
'<div id="tableofcontents-radio-caption" class="padding-small" style="display: block;"></div>',
'<div id="tableofcontents-radio-style" class="" style="display: block;"></div>',
@ -105,7 +105,7 @@ define([
'</tr>',
'<tr>',
'<td class="padding-small" style="vertical-align: top;">',
'<% if (type == 1) { %>',
'<% if (scope.type == 1) { %>',
'<div id="tableofcontents-tof-from-caption" style="width:220px;">',
'<div id="tableofcontents-combo-captions" style="display: inline-block; width:129px; margin-bottom: 10px;"></div>',
'</div>',
@ -135,11 +135,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

17
apps/documenteditor/main/app/view/TextToTableDialog.js
View File

@ -45,7 +45,8 @@ define([
DE.Views.TextToTableDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300
contentWidth: 300,
separator: false
},
initialize : function(options) {
@ -53,10 +54,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 5px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="2" style="width: auto;">',
'<tr>',
'<td colspan="2" class="padding-small">',
@ -129,10 +130,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

16
apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
View File

@ -76,6 +76,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
DE.Views.WatermarkSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 400,
separator: false,
id: 'window-watermark'
},
@ -84,19 +85,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
_.extend(this.options, {
title: this.textTitle,
template: _.template(
[
'<div class="box">',
'<div class="content-panel" style="padding: 10px 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
template,
'</div></div>',
'</div>',
'</div>'
].join('')
)({
scope: this
})
contentStyle: 'padding: 10px 5px;',
contentTemplate: _.template(template)({scope: this})
}, options);
this.handler = options.handler;

2
apps/pdfeditor/main/app/view/FileMenuPanels.js
View File

@ -1655,7 +1655,7 @@ define([
'<td class="right"><div id="id-info-rights"></div></td>',
'</tr>',
'<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom margin-right-10">' + this.txtBtnAccessRights + '</button></td>',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary auto margin-right-10">' + this.txtBtnAccessRights + '</button></td>',
'</tr>',
'</table>'
].join(''));

2
apps/presentationeditor/main/app/template/HeaderFooterDialog.template
View File

@ -1,4 +1,4 @@
<table cols="1">
<table cols="1" style="width: 100%;">
<tr><td class="padding-small">
<div class="input-row-tabs">
<button type="button" class="btn btn-text-default auto" id="hf-dlg-btn-slide"><%= scope.textSlide %></button><button type="button" class="btn btn-text-default auto" id="hf-dlg-btn-notes"><%= scope.textNotes %></button>

2
apps/presentationeditor/main/app/view/FileMenuPanels.js
View File

@ -1443,7 +1443,7 @@ define([
'<td class="right"><div id="id-info-rights"></div></td>',
'</tr>',
'<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom">' + this.txtBtnAccessRights + '</button></td>',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary auto">' + this.txtBtnAccessRights + '</button></td>',
'</tr>',
'</table>'
].join(''));

18
apps/presentationeditor/main/app/view/HeaderFooterDialog.js
View File

@ -48,7 +48,6 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
options: {
contentWidth: 360,
contentHeight: 330,
buttons: null,
id: 'window-header-footer'
},
@ -57,11 +56,17 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
_.extend(this.options, {
title: this.textHFTitle,
buttons: [
{value: 'all', caption: this.applyAllText},
{value: 'ok', caption: this.applyText, id: 'hf-dlg-btn-apply'},
'cancel'
],
primary: 'all',
template: _.template(
[
'<div class="box">',
'<div class="content-panel" style="padding: 10px 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
'<div class="content-panel" style="padding: 10px 5px;">',
'<div class="settings-panel active"><div class="inner-content">',
template,
'</div></div>',
'</div>',
@ -76,12 +81,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
'</div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="all" style="width: auto; min-width: 86px;">' + me.applyAllText + '</button>',
'<button id="hf-dlg-btn-apply" class="btn normal dlg-btn" result="ok" style="width: auto; min-width: 86px;">' + me.applyText + '</button>',
'<button class="btn normal dlg-btn" result="cancel">' + me.cancelButtonText + '</button>',
'</div>'
'<div class="separator horizontal"></div>'
].join('')
)({
scope: this

3
apps/presentationeditor/main/resources/less/rightmenu.less
View File

@ -1,7 +1,4 @@
.settings-panel {
}
.right-panel .settings-panel {
label.input-label{
vertical-align: baseline;

15
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View File

@ -57,10 +57,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td>',
@ -106,11 +106,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

17
apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js
View File

@ -69,7 +69,8 @@ define([
SSE.Views.ChartTypeDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 370,
contentHeight: 300
contentHeight: 300,
separator: false
},
initialize : function(options) {
@ -77,10 +78,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-large">',
@ -100,10 +101,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

15
apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
View File

@ -47,6 +47,7 @@ define([
SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310,
separator: false,
id: 'window-create-pivot'
},
@ -55,10 +56,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td style="padding-bottom: 2px;">',
@ -91,10 +92,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

17
apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js
View File

@ -45,7 +45,8 @@ define([
SSE.Views.CreateSparklineDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310
contentWidth: 310,
separator: false
},
initialize : function(options) {
@ -53,10 +54,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td style="padding-bottom: 2px;">',
@ -79,10 +80,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

20
apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js
View File

@ -51,17 +51,18 @@ define([
options: {
alias: 'ExternalLinksDlg',
contentWidth: 500,
buttons: null
separator: false,
buttons: ['close']
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-large">',
@ -77,13 +78,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

2
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View File

@ -1835,7 +1835,7 @@ define([
'<td class="right"><div id="id-info-rights"></div></td>',
'</tr>',
'<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom">' + this.txtBtnAccessRights + '</button></td>',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary auto">' + this.txtBtnAccessRights + '</button></td>',
'</tr>',
'</table>'
].join(''));

8
apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
View File

@ -59,12 +59,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
_.extend(this.options, {
title: this.txtTitleNew,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

8
apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
View File

@ -90,6 +90,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
SSE.Views.FormatRulesManagerDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
alias: 'FormatRulesManagerDlg',
separator: false,
contentWidth: 560
},
@ -97,11 +98,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

13
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View File

@ -92,10 +92,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
contentHeight: height,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td style="width:170px;padding-bottom: 3px;">',
@ -155,11 +155,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);

11
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
View File

@ -61,7 +61,10 @@ define([
contentTemplate : '',
title : t.txtTitle,
items : [],
buttons: null
buttons: [
{value: 'ok', caption: this.okButtonText, primary: true, id: 'formula-dlg-btn-ok'},
'cancel'
],
}, options);
this.template = options.template || [
@ -76,11 +79,7 @@ define([
'<label id="formula-dlg-desc" style="margin-top: 4px; display: block;">' + '</label>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button id="formula-dlg-btn-ok" class="btn normal dlg-btn primary" result="ok" style="width: 86px;">' + this.okButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.cancelButtonText + '</button>',
'</div>'
'<div class="separator horizontal"></div>'
].join('');
this.api = options.api;

19
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
View File

@ -52,11 +52,11 @@ define([
var me = this;
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;"><div class="inner-content">',
'<div class="settings-panel active">',
'<table>',
contentStyle: 'padding: 0;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table style="width: 100%;">',
'<tr><td>',
'<label id="formula-wizard-name" style="display: block;margin-bottom: 8px;"></label>',
'<div id="formula-wizard-panel-args" style="">',
@ -81,11 +81,8 @@ define([
'</div>',
'</td></tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.props = this.options.props;
@ -122,7 +119,7 @@ define([
this.lblFormulaResult = $window.find('#formula-wizard-value');
this.lblFunctionResult = $window.find('#formula-wizard-lbl-val-func');
this.contentPanel.find('.settings-panel > table').css('height', this.options.contentHeight - 7);
this.innerPanel.find('> table').css('height', this.options.contentHeight - 7);
this._preventCloseCellEditor = false;

17
apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js
View File

@ -46,7 +46,8 @@ define([
SSE.Views.ImportFromXmlDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310
contentWidth: 310,
separator: false
},
initialize : function(options) {
@ -54,10 +55,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-small">',
@ -80,10 +81,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

15
apps/spreadsheeteditor/main/app/view/MacroDialog.js
View File

@ -47,7 +47,8 @@ define([
SSE.Views.MacroDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 250
contentWidth: 250,
separator: false
},
initialize : function(options) {
@ -55,10 +56,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
contentStyle: 'padding: 0 5px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-extra-small">',
@ -76,10 +77,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

13
apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
View File

@ -52,7 +52,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
options: {
alias: 'NameManagerDlg',
contentWidth: 540,
buttons: null,
buttons: ['close'],
separator: false,
id: 'window-name-manager'
},
@ -60,14 +61,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

15
apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js
View File

@ -58,10 +58,10 @@ define([
_.extend(this.options, {
title: this.txtTitleNew,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-small">',
@ -89,11 +89,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

15
apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js
View File

@ -49,6 +49,7 @@ define([
SSE.Views.NamedRangePasteDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
alias: 'NamedRangePasteDlg',
separator: false,
contentWidth: 250
},
@ -57,10 +58,10 @@ define([
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td>',
@ -69,10 +70,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

15
apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js
View File

@ -50,6 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template',
options: {
alias: 'ProtectRangesDlg',
contentWidth: 480,
separator: false,
id: 'window-protect-ranges'
},
@ -57,18 +58,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template',
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
].join(''),
buttons: [
// {
// value: 'protect-sheet',
// caption: this.textProtect
// },
'ok','cancel']
// primary: 'protect-sheet'
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

13
apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js
View File

@ -51,21 +51,16 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.te
options: {
alias: 'ProtectedRangesManagerDlg',
contentWidth: 490,
buttons: null
separator: false,
buttons: ['close']
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

8
apps/spreadsheeteditor/main/app/view/SortDialog.js
View File

@ -74,6 +74,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
options: {
alias: 'SortDialog',
contentWidth: 560,
separator: false,
buttons: ['ok', 'cancel']
},
@ -81,11 +82,8 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

16
apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js
View File

@ -46,7 +46,8 @@ define([
SSE.Views.SortOptionsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 230
contentWidth: 230,
separator: false
},
initialize : function(options) {
@ -54,10 +55,9 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel"><div class="inner-content">',
'<div class="settings-panel active">',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-large">',
@ -85,10 +85,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.props = options.props;

17
apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js
View File

@ -47,7 +47,8 @@ define([
SSE.Views.SpecialPasteDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 350
contentWidth: 350,
separator: false
},
initialize : function(options) {
@ -55,10 +56,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 5px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td colspan=2 class="padding-small">',
@ -157,10 +158,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

17
apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
View File

@ -48,7 +48,8 @@ define([
SSE.Views.ValueFieldSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 284
contentWidth: 284,
separator: false
},
initialize : function(options) {
@ -56,10 +57,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentStyle: 'padding: 0 10px;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td colspan="2" class="padding-small" style="white-space: nowrap;">',
@ -97,10 +98,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

23
apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
View File

@ -52,18 +52,20 @@ define([
SSE.Views.ViewManagerDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
alias: 'ViewManagerDlg',
contentWidth: 460,
buttons: null
contentWidth: 460
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">',
'<div class="settings-panel active">',
buttons: [
{value: 'ok', caption: this.textGoTo, primary: true},
'close'
],
contentStyle: 'padding: 0;',
contentTemplate: _.template([
'<div class="settings-panel active">',
'<div class="inner-content">',
'<table cols="1" style="width: 100%;">',
'<tr>',
@ -82,15 +84,8 @@ define([
'</tr>',
'</table>',
'</div>',
'</div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="min-width: 86px;width: auto;">' + this.textGoTo + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
].join(''))({scope: this})
}, options);
this.api = options.api;

13
apps/spreadsheeteditor/main/app/view/WatchDialog.js
View File

@ -52,21 +52,16 @@ define([ 'text!spreadsheeteditor/main/app/template/WatchDialog.template',
alias: 'WatchDialog',
contentWidth: 560,
modal: false,
buttons: null
separator: false,
buttons: ['close']
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box">',
'<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'</div>'
].join('')
contentStyle: 'padding: 0;',
contentTemplate: _.template(contentTemplate)({scope: this})
}, options);
this.api = options.api;

3
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View File

@ -1,7 +1,4 @@
.settings-panel {
}
.right-panel .settings-panel {
label.input-label{
vertical-align: baseline;