Merge branch 'feature/advanced-settings-autoheight' into develop

This commit is contained in:
Julia Radzhabova
2023-10-25 23:38:46 +03:00
128 changed files with 481 additions and 727 deletions

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);

View File

@ -179,7 +179,7 @@ define([
'<% if (typeof (buttons) !== "undefined" && _.size(buttons) > 0) { %>' +
'<div class="footer">' +
'<% for(var bt in buttons) { %>' +
'<button class="btn normal dlg-btn <%= buttons[bt].cls %>" result="<%= bt %>"><%= buttons[bt].text %></button>'+
'<button class="btn normal dlg-btn <%= buttons[bt].cls %>" result="<%= bt %>" <% if (buttons[bt].id) { %>id="<%=buttons[bt].id%>" <% } %> ><%= buttons[bt].text %></button>'+
'<% } %>' +
'</div>' +
'<% } %>' +
@ -629,12 +629,12 @@ define([
var newBtns = {};
_.each(options.buttons, function(b){
if (typeof(b) == 'object') {
if (b.value !== undefined)
newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')};
if (b.value !== undefined) {
newBtns[b.value] = {text: b.caption, cls: 'auto' + ((b.primary || options.primary==b.value) ? ' primary' : '')};
b.id && (newBtns[b.value].id = b.id);
}
} else if (b!==undefined) {
newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b || _.indexOf(options.primary, b)>-1) ? 'primary' : ''};
if (b=='custom')
newBtns[b].cls += ' custom';
newBtns[b] = {text: arrBtns[b], cls: (options.primary==b || _.indexOf(options.primary, b)>-1) ? 'primary' : ''};
}
});

View File

@ -1,4 +1,4 @@
<div class="color-box">
<div class="box">
<div id="id-hsb-colorpicker" style="vertical-align:top;">
</div>
<div class="color-info" style="">

View File

@ -45,26 +45,32 @@ define([
initialize : function(options) {
var _options = {};
_.extend(_options, {
height: 200,
height: 'auto',
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" style="height:' + (_options.height-85) + 'px;">',
'<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);
@ -105,6 +111,15 @@ define([
cnt_panel.width(this.contentWidth);
$window.width(((menu_panel.length>0) ? menu_panel.width() : 0) + cnt_panel.outerWidth() + 2);
if (this.options.contentHeight) {
$window.find('.body > .box').css('height', this.options.contentHeight);
} else if (typeof this.options.height === 'number') {
var bodyEl = $window.find('.body'),
hfHeight = parseInt($window.find('.header').css('height')) + parseInt($window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')) +
parseInt($window.css('border-bottom-width')) + parseInt($window.css('border-top-width'));
$window.find('.body > .box').css('height', this.options.height - hfHeight);
}
this.content_panels = $window.find('.settings-panel');
if (this.btnsCategory.length>0)
this.btnsCategory[0].toggle(true, true);
@ -113,10 +128,20 @@ define([
setHeight: function(height) {
Common.UI.Window.prototype.setHeight.call(this, height);
var $window = this.getChild();
var boxEl = $window.find('.body > .box');
var $window = this.getChild(),
bodyEl = $window.find('.body'),
footerHeight = parseInt($window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom'));
$window.find('.body > .box').css('height', parseInt(bodyEl.css('height')) - footerHeight);
},
boxEl.css('height', height - 85);
setInnerHeight: function(height) { // height of box element
var $window = this.getChild(),
bodyEl = $window.find('.body'),
hfHeight = parseInt($window.find('.header').css('height')) + parseInt($window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')) +
parseInt($window.css('border-bottom-width')) + parseInt($window.css('border-top-width'));
Common.UI.Window.prototype.setHeight.call(this, height + hfHeight);
$window.find('.body > .box').css('height', height);
},
onDlgBtnClick: function(event) {

View File

@ -52,8 +52,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
Common.Views.AutoCorrectDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 375,
height: 430,
buttons: null,
contentHeight: 345,
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" style="height:' + (this.options.height-85) + 'px;">',
'<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;

View File

@ -48,7 +48,6 @@ define([
Common.Views.CopyWarningDialog = Common.UI.Window.extend(_.extend({
options: {
width : 500,
height : 325,
cls : 'modal-dlg copy-warning',
buttons: ['ok']
},
@ -76,7 +75,7 @@ define([
'<p class="message">' + this.textToPaste + '</p>',
'</div>',
'</div>',
'<div id="copy-warning-checkbox" class="text-align-left" style="margin-top: 20px;"></div>',
'<div id="copy-warning-checkbox" class="text-align-left" style="padding: 15px 0;"></div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('');
@ -95,17 +94,6 @@ define([
});
this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.autoSize();
},
autoSize: function() {
var text_cnt = this.getChild('.box'),
footer = this.getChild('.footer'),
header = this.getChild('.header'),
body = this.getChild('.body');
body.height(parseInt(text_cnt.height()) + parseInt(footer.css('height')));
this.setHeight(parseInt(body.css('height')) + parseInt(header.css('height')));
},
onBtnClick: function(event) {

View File

@ -48,7 +48,6 @@ define([
_.extend(_options, {
title: this.textTitle,
width: 600,
height: 536,
header: true
}, options);

View File

@ -48,7 +48,7 @@ define([
initialize : function(options) {
Common.UI.Window.prototype.initialize.call(this, {
cls: 'extended-color-dlg',
cls: 'extended-color-dlg modal-dlg',
tpl: this.tpl({
txtNew: this.textNew,
txtCurrent: this.textCurrent,
@ -56,8 +56,7 @@ define([
txtCancel: this.cancelButtonText
}),
header: false,
width: 340,
height: 272
width: 340
});
this.hexRe = /\s*#?([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)\s*/;

View File

@ -55,26 +55,24 @@ define([
value = Common.localStorage.getItem(this.storageName + '-height');
value && (height = parseInt(value));
var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
_.extend(_options, {
width: width,
height: (_inner_height - height)<0 ? _inner_height : height,
cls: 'advanced-settings-dlg',
header: true,
toolclose: 'hide',
toolcallback: _.bind(this.onToolClose, this),
resizable: true
}, options);
this._headerFooterHeight = 85;
// (!_options.buttons || _.size(_options.buttons)<1) && (_options.cls += ' no-footer');
_options.contentHeight = height;
this.template = [
'<div id="id-editor-container" class="box" style="height:' + (_options.height-this._headerFooterHeight) + 'px; padding: 0 5px;">',
'<div id="id-editor-container" class="box" style="height:' + _options.contentHeight + 'px; padding: 0 5px;">',
'<div id="' + (_options.sdkplaceholder || '') + '" style="width: 100%;height: 100%;"></div>',
'</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('');
@ -90,6 +88,16 @@ define([
render: function() {
Common.UI.Window.prototype.render.call(this);
this.boxEl = this.$window.find('.body > .box');
var bodyEl = this.$window.find('> .body');
this._headerFooterHeight = this.initConfig.header ? parseInt(this.$window.find('.header').css('height')) : 0;
this._headerFooterHeight += parseInt(this.$window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom'));
this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
if (_inner_height < this.initConfig.contentHeight + this._headerFooterHeight) {
this.initConfig.contentHeight = _inner_height - this._headerFooterHeight;
this.boxEl.css('height', this.initConfig.contentHeight);
}
this.btnSave = new Common.UI.Button({
el: this.$window.find('#id-btn-editor-apply'),

View File

@ -47,7 +47,6 @@ define([
Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({
options: {
width: 230,
height: 157,
style: 'min-width: 230px;',
cls: 'modal-dlg',
id: 'window-insert-table',

View File

@ -52,38 +52,15 @@ define([
var t = this,
_options = {};
var width, height;
if (options.preview) {
width = 414;
height = (options.type==Common.Utils.importTextType.Data) ? 385 : 277;
} else {
width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 280);
switch (options.type) {
case Common.Utils.importTextType.CSV:
case Common.Utils.importTextType.Paste:
case Common.Utils.importTextType.Columns:
height = 190;
break;
case Common.Utils.importTextType.Data:
height = 245;
break;
default:
height = options.warning ? 187 : 147;
break;
}
}
_.extend(_options, {
closable : false, // true if save settings
preview : options.preview,
warning : options.warning,
codepages : options.codepages,
warningMsg : options.warningMsg,
width : width,
height : height,
width : options.preview ? 414 : (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 280),
header : true,
cls : 'open-dlg',
cls : 'modal-dlg open-dlg',
contentTemplate : '',
toolcallback : _.bind(t.onToolClose, t),
closeFile : false
@ -93,13 +70,13 @@ define([
this.txtOpenFile = options.txtOpenFile || this.txtOpenFile;
this.template = options.template || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="box">',
'<div class="content-panel" >',
'<% if (type == Common.Utils.importTextType.DRM) { %>',
'<% if (warning) { %>',
'<div>',
'<div class="icon warn"></div>',
'<div class="padding-left-50"><div style="font-size: 12px;">' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '</div>',
'<div class="padding-left-50"><div style="font-size: 12px;word-break:break-word;">' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '</div>',
'<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="width: 290px;"></div></div>',
'</div>',
@ -111,7 +88,7 @@ define([
'<% } %>',
'<% } else { %>',
'<% if (codepages && codepages.length>0) { %>',
'<div <% if (!!preview && (type == Common.Utils.importTextType.CSV || type == Common.Utils.importTextType.Paste || type == Common.Utils.importTextType.Columns)) { %> class="margin-right-10" style="width: 230px;display: inline-block;margin-bottom:15px;" <% } else { %> style="width: 100%;margin-bottom:15px;"<% } %> >',
'<div <% if (!!preview && (type == Common.Utils.importTextType.CSV || type == Common.Utils.importTextType.Paste || type == Common.Utils.importTextType.Columns)) { %> class="margin-right-10" style="width: 230px;display: inline-block;" <% } else { %> style="width: 100%;"<% } %> >',
'<label class="header">' + t.txtEncoding + '</label>',
'<div>',
'<div id="id-codepages-combo" class="input-group-nr" style="width: 100%; display: inline-block; vertical-align: middle;"></div>',
@ -119,7 +96,7 @@ define([
'</div>',
'<% } %>',
'<% if (type == Common.Utils.importTextType.CSV) { %>',
'<div style="display: inline-block; margin-bottom:15px;">',
'<div style="display: inline-block; <% if (!preview) { %> margin-top:15px;<% } %>">',
'<label class="header">' + t.txtDelimiter + '</label>',
'<div>',
'<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 100px;display: inline-block; vertical-align: middle;"></div>',
@ -128,7 +105,7 @@ define([
'</div>',
'<% } %>',
'<% if (type == Common.Utils.importTextType.Paste || type == Common.Utils.importTextType.Columns || type == Common.Utils.importTextType.Data) { %>',
'<div style="display: inline-block; margin-bottom:15px;width: 100%;">',
'<div style="display: inline-block; <% if (codepages && codepages.length>0) { %>margin-top:15px;<% } %>width: 100%;">',
'<label class="header">' + t.txtDelimiter + '</label>',
'<div>',
'<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 100px;display: inline-block; vertical-align: middle;"></div>',
@ -138,7 +115,7 @@ define([
'</div>',
'<% } %>',
'<% if (!!preview) { %>',
'<div style="">',
'<div style="margin-top:15px;">',
'<label class="header">' + t.txtPreview + '</label>',
'<div style="position: relative;">',
'<div style="width: 100%;">',
@ -161,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('');

View File

@ -54,7 +54,6 @@ define([
_.extend(_options, {
width : 395,
height : 270,
header : true,
cls : 'modal-dlg',
contentTemplate : '',

View File

@ -57,16 +57,15 @@ define([
automove: false
}, options);
var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
if (!_options.header) header_footer -= 34;
this.bordersOffset = 40;
_options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width;
_options.height += header_footer;
_options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height;
_options.cls += ' advanced-settings-dlg invisible-borders';
(!_options.buttons || _.size(_options.buttons)<1) && (_options.cls += ' no-footer');
_options.contentHeight = _options.height;
_options.height = 'auto';
this.template = [
'<div id="id-plugin-container" class="box" style="height:' + (_options.height-header_footer) + 'px;">',
'<div id="id-plugin-container" class="box" style="height:' + _options.contentHeight + 'px;">',
'<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
'</div>',
'<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
@ -84,13 +83,21 @@ define([
render: function() {
Common.UI.Window.prototype.render.call(this);
this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'});
var bodyEl = this.$window.find('> .body');
bodyEl.css({height: 'auto', overflow: 'hidden'});
this.boxEl = this.$window.find('.body > .box');
this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
if (!this.options.header) this._headerFooterHeight -= 34;
this._headerFooterHeight = this.options.header ? parseInt(this.$window.find('.header').css('height')) : 0;
if (this.options.buttons && _.size(this.options.buttons)>0)
this._headerFooterHeight += parseInt(this.$window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom'));
this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
if (Common.Utils.innerHeight()-this.bordersOffset*2 < this.options.contentHeight + this._headerFooterHeight) {
this.options.contentHeight = Common.Utils.innerHeight()-this.bordersOffset*2 - this._headerFooterHeight;
this.boxEl.css('height', this.options.contentHeight);
}
this.$window.find('.header').prepend($('<div class="tools left hidden"></div>'));
var iframe = document.createElement("iframe");

View File

@ -987,7 +987,6 @@ define([
Common.Views.ReviewChangesDialog = Common.UI.Window.extend(_.extend({
options: {
width : 330,
height : 90,
title : 'Review Changes',
modal : false,
cls : 'review-changes modal-dlg',

View File

@ -45,7 +45,6 @@ define([
_.extend(_options, {
title: this.textTitle,
width: 420,
height: 681,
header: true
}, options);

View File

@ -45,7 +45,6 @@ define([
_.extend(_options, {
title: this.textTitle,
width: 1024,
height: 621,
header: true
}, options);

View File

@ -44,6 +44,13 @@
padding-right: 10px;
}
}
padding-bottom: 15px;
}
&.no-footer {
.body {
padding-bottom: 0;
}
}
.footer {

View File

@ -815,6 +815,12 @@
.padding-right(40px);
}
.vertical-align-baseline {
vertical-align: baseline;
.ie & {
vertical-align: middle;
}
}
//.adaptive-solid-border(@width, @color, @borderside: all) {
// @lb-border: if((@borderside = all), border, e('border-@{borderside}'));
// @lb-border-width: if((@borderside = all), border-width, e('border-@{borderside}-width'));

View File

@ -1344,7 +1344,7 @@
opacity: @component-disabled-opacity;
}
&.custom {
&.auto {
width: auto;
min-width: 86px;
}

View File

@ -1,7 +1,5 @@
.extended-color-dlg {
.color-box {
padding: 16px 16px 5px 16px;
.box {
& > div {
display: inline-block;
}
@ -64,18 +62,4 @@
}
}
}
.footer {
height: 37px;
width: 100%;
bottom: 0;
text-align: center;
padding: 7px 0 0 0;
button {
width: 75px;
height: 22px;
}
}
}

View File

@ -1,9 +1,6 @@
.open-dlg {
.body {
height: auto;
top: 34px;
& > div {
width: 100%;
}
@ -15,14 +12,9 @@
.content-panel {
vertical-align: top;
padding: 15px 15px 0;
padding-bottom: 10px;
width: 100%;
.inner-content {
padding-left: 10px;
padding-right: 10px;
}
label {
.font-size-normal();
font-weight: normal;
@ -89,16 +81,4 @@
}
}
}
.footer {
padding-top: 15px;
&.center {
text-align: center;
}
&.justify {
padding-left: 30px;
padding-right: 30px;
}
}
}

View File

@ -363,7 +363,7 @@
.modal-dlg {
.body {
height: auto;
padding: 15px;
padding: 15px 0;
.input-row {
height: @input-height-base;
@ -379,10 +379,15 @@
label {
.font-size-normal();
}
.box {
padding-right: 15px;
padding-left: 15px;
}
}
.footer {
padding-top: 15px;
padding: 15px 15px 0;
&.center {
text-align: center;
@ -392,22 +397,22 @@
.text-align-right();
}
}
.separator.horizontal {
width: 100%;
}
}
// CopyWarningDialog
.copy-warning {
.body {
padding: 15px 0;
& > div {
width: 100%;
padding: 0 20px;
}
.box {
text-align: center;
padding-bottom: 15px;
}
.message{
text-align: justify;
@ -435,9 +440,5 @@
text-align: center;
}
}
.footer {
padding: 20px;
}
}
}

View File

@ -2652,9 +2652,8 @@ define([
width: 500,
msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn,
iconCls: 'info',
buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'],
buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'],
primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok',
customButtonText: this.textStrict,
dontshow: true,
callback: _.bind(function(btn, dontshow){
if (dontshow) Common.localStorage.setItem("de-hide-try-undoredo", 1);

View File

@ -93,8 +93,8 @@
<div id="id-adv-image-rotate" class="settings-panel active">
<div class="inner-content padding-large">
<div style="width: 100%;">
<label class="input-label"><%= scope.textAngle %></label>
<div id="image-advanced-spin-angle" class="margin-left-5" style="display: inline-block;"></div>
<label class="input-label vertical-align-baseline"><%= scope.textAngle %></label>
<div id="image-advanced-spin-angle" class="margin-left-5 vertical-align-baseline" style="display: inline-block;"></div>
</div>
</div>
<div class="separator horizontal padding-large"></div>

View File

@ -165,8 +165,8 @@
<label class="header"><%= scope.textOpenType %></label>
</div>
<div class="padding-large">
<label class="input-label"><%= scope.textLigatures %></label>
<div id="paragraphadv-cmb-ligatures" class="margin-left-5" style="display: inline-block; vertical-align: baseline;"></div>
<label class="input-label vertical-align-baseline"><%= scope.textLigatures %></label>
<div id="paragraphadv-cmb-ligatures" class="margin-left-5 vertical-align-baseline" style="display: inline-block;"></div>
</div>
<div class="doc-content-color" style="outline: 1px solid #cbcbcb;">
<div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>

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>

View File

@ -50,8 +50,8 @@ define([
DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 320,
height: 366,
buttons: null,
buttons: ['close'],
separator: false,
id: 'window-bookmarks'
},
@ -60,10 +60,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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">',
@ -107,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;

View File

@ -48,7 +48,7 @@ define([
DE.Views.CaptionDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 351,
height: 350,
separator: false,
id: 'window-caption'
},
@ -57,10 +57,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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">',
@ -121,9 +121,8 @@ define([
'</tr>',
'</table>',
'</div>',
'</div></div>',
'</div>'
].join('')
'</div>'
].join(''))({scope: this})
}, options);
this.objectType = options.objectType;

View File

@ -50,7 +50,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310,
height: 405,
contentHeight: 320,
toggleGroup: 'control-adv-settings-group',
storageName: 'de-control-settings-adv-category'
},

View File

@ -45,7 +45,6 @@ define([
DE.Views.CrossReferenceDialog = Common.UI.Window.extend(_.extend({
options: {
width: 400,
height: 410,
style: 'min-width: 240px;',
cls: 'modal-dlg',
modal: false,

View File

@ -59,7 +59,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 203px;">',
'<div class="box">',
'<div class="input-row" style="margin-bottom: 10px;">',
'<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num" class="float-right"></div>',
'</div>',

View File

@ -54,15 +54,12 @@ define([
},
initialize : function (options) {
var t = this,
_options = {};
_.extend(this.options, {
title: this.txtTitle
}, options || {});
this.template = [
'<div class="box" style="height: 275px;">',
'<div class="box">',
'<div class="input-row">',
'<label class="font-weight-bold">' + this.textLang + '</label>',
'</div>',
@ -71,7 +68,7 @@ define([
'<label class="font-weight-bold">' + this.textFormat + '</label>',
'</div>',
'<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 162px; overflow: hidden;"></div>',
'<div class="input-row">',
'<div class="input-row" style="margin-bottom: 8px;">',
'<div id="datetime-dlg-update" style="margin-top: 3px;margin-bottom: 10px;"></div>',
'<button type="button" class="btn btn-text-default auto float-right" id="datetime-dlg-default">' + this.textDefault + '</button>',
'</div>',

View File

@ -59,7 +59,7 @@ define([
DE.Views.DropcapSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 320,
height : 380,
contentHeight: 295,
toggleGroup : 'dropcap-adv-settings-group',
storageName: 'de-dropcap-settings-adv-category'
},
@ -702,7 +702,7 @@ define([
}, this);
if (this.isFrame)
this.setHeight(500);
this.setInnerHeight(415);
this.btnsCategory[(this.isFrame) ? 1 : 0].setVisible(false);
if (this.storageName) {

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(''));

View File

@ -46,7 +46,6 @@ define([
DE.Views.HyphenationDialog = Common.UI.Window.extend(_.extend({
options: {
width: 290,
height: 'auto',
header: true,
style: 'min-width: 290px;',
cls: 'modal-dlg',
@ -60,7 +59,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="">',
'<div class="box">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td colspan="2" style="padding-bottom: 15px;">',

View File

@ -50,7 +50,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
DE.Views.ImageSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 340,
height: 485,
contentHeight: 400,
toggleGroup: 'image-adv-settings-group',
sizeOriginal: {width: 0, height: 0},
sizeMax: {width: 55.88, height: 55.88},

View File

@ -46,7 +46,6 @@ define([
DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({
options: {
width: 290,
height: 332,
header: true,
style: 'min-width: 290px;',
cls: 'modal-dlg',
@ -60,7 +59,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="">',
'<div class="box">',
'<div id="line-numbers-add-line-numbering" style="margin-bottom: 15px;"></div>',
'<div style="margin-bottom: 15px;">',
'<div class="margin-right-9" style="display: inline-block;"><label>' + this.textStartAt + '</label><div id="line-numbers-start-at"></div></div>',

View File

@ -196,7 +196,7 @@ define([
'</td>',
'<% if (type == 2) { %>',
'<td style="width: ' + this.rightPanelWidth + 'px;vertical-align: top;">',
'<div id="id-dlg-panel-more-settings" class="padding-left-20" style="width: ' + this.rightPanelWidth + 'px;">',
'<div id="id-dlg-panel-more-settings" class="padding-left-5 padding-right-15" style="width: ' + this.rightPanelWidth + 'px;">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td colspan="2">',

View File

@ -45,19 +45,14 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
DE.Views.MailMergeEmailDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
alias: 'MailMergeEmail',
contentWidth: 500,
height: 435
contentWidth: 500
},
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (this.options.height-85) + 'px;">',
'<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);
},

View File

@ -639,9 +639,8 @@ define([
title: this.notcriticalErrorTitle,
msg: opts.data.error,
iconCls: 'warn',
buttons: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : ['custom', 'cancel'],
buttons: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : [{value: 'custom', caption: this.textGoToMail}, 'cancel'],
primary: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : 'custom',
customButtonText: this.textGoToMail,
callback: _.bind(function(btn){
if (btn == 'custom') {
window.open(opts.data.createEmailAccountUrl, "_blank");

View File

@ -47,10 +47,9 @@ define([
DE.Views.NoteSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 395,
contentWidth: 310,
id: 'window-note-settings',
buttons: null
separator: false
},
initialize : function(options) {
@ -58,10 +57,16 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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">',
@ -115,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;

View File

@ -44,7 +44,6 @@ define([
DE.Views.NotesRemoveDialog = Common.UI.Window.extend(_.extend({
options: {
width: 214,
height: 139,
header: true,
style: 'min-width: 214px;',
cls: 'modal-dlg',

View File

@ -58,7 +58,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 85px;">',
'<div class="box">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td colspan="2">',
@ -77,8 +77,7 @@ define([
'</td>',
'</tr>',
'</table>',
'</div>',
'<div class="separator horizontal"></div>'
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);

View File

@ -51,7 +51,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 370,
height: 415,
contentHeight: 330,
toggleGroup: 'paragraph-adv-settings-group',
storageName: 'de-para-settings-adv-category'
},

View File

@ -52,23 +52,15 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
options: {
alias: 'RolesManagerDlg',
contentWidth: 500,
height: 353,
buttons: null
buttons: ['close']
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box" style="height:' + (this.options.height-85) + 'px;">',
'<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;

View File

@ -51,17 +51,19 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow',
options: {
alias: 'SaveFormDlg',
contentWidth: 320,
height: 280,
buttons: null
separator: false
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box" style="height:' + (this.options.height-85) + 'px;">',
'<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%;">',
@ -82,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;

View File

@ -44,7 +44,6 @@ define([
DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({
options: {
width: 350,
height: 196,
style: 'min-width: 230px;',
cls: 'modal-dlg',
buttons: ['ok', 'cancel']

View File

@ -56,7 +56,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 150px;">',
'<div class="box">',
'<div class="input-row">',
'<label>' + this.textFormula + '</label>',
'</div>',
@ -65,7 +65,7 @@ define([
'<label>' + this.textFormat + '</label>',
'</div>',
'<div id="id-dlg-formula-format" class="input-row" style="margin-bottom: 20px;"></div>',
'<div class="input-row">',
'<div class="input-row" style="margin-bottom: 10px;">',
'<div id="id-dlg-formula-function" style="display: inline-block; width: 50%;" class="float-left padding-right-10"></div>',
'<div id="id-dlg-formula-bookmark" style="display: inline-block; width: 50%;"></div>',
'</div>',

View File

@ -48,21 +48,21 @@ define([
DE.Views.TableOfContentsSettings = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 500,
height: 460,
contentHeight: 375,
id: 'window-table-contents'
},
initialize : function(options) {
var me = this;
var height = options.type ? 385 : 460;
var height = options.type ? 300 : 375;
_.extend(this.options, {
title: options.type ? this.textTitleTOF : this.textTitle,
height: height,
template: [
'<div class="box" style="height:' + (height - 85) + 'px;">',
'<div class="content-panel" style="padding: 15px 10px;"><div class="inner-content">',
'<div class="settings-panel active">',
contentHeight: height,
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">',
@ -81,8 +81,8 @@ define([
'</tr>',
'<tr>',
'<td class="padding-large">',
'<label class="input-label">' + me.textLeader + '</label>',
'<div id="tableofcontents-combo-leader" class="input-group-nr margin-left-10" style="display: inline-block; width:95px;"></div>',
'<label class="input-label vertical-align-baseline">' + me.textLeader + '</label>',
'<div id="tableofcontents-combo-leader" class="input-group-nr margin-left-10 vertical-align-baseline" style="display: inline-block; width:95px;"></div>',
'</td>',
'</tr>',
'<tr>',
@ -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>',
@ -115,8 +115,8 @@ define([
'<div id="tableofcontents-chb-full-caption"></div>',
'<% } else { %>',
'<div id="tableofcontents-from-levels" style="width:220px;">',
'<label class="input-label">' + me.textLevels + '</label>',
'<div id="tableofcontents-spin-levels" class="margin-left-10" style="display: inline-block; width:95px;"></div>',
'<label class="input-label vertical-align-baseline">' + me.textLevels + '</label>',
'<div id="tableofcontents-spin-levels" class="margin-left-10 vertical-align-baseline" style="display: inline-block; width:95px;"></div>',
'</div>',
'<div id="tableofcontents-from-styles" class="hidden">',
'<table>',
@ -130,16 +130,13 @@ define([
'<% } %>',
'</td>',
'<td class="padding-small" style="vertical-align: top;">',
'<label class="input-label margin-left-10">' + me.textStyles + '</label>',
'<div id="tableofcontents-combo-styles" class="input-group-nr margin-left-10" style="display: inline-block; width:95px;"></div>',
'<label class="input-label margin-left-10 vertical-align-baseline">' + me.textStyles + '</label>',
'<div id="tableofcontents-combo-styles" class="input-group-nr margin-left-10 vertical-align-baseline" style="display: inline-block; width:95px;"></div>',
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

View File

@ -53,7 +53,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
DE.Views.TableSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 340,
height: 436,
contentHeight: 351,
toggleGroup: 'table-adv-settings-group',
storageName: 'de-table-settings-adv-category'
},

View File

@ -46,7 +46,6 @@ define([
DE.Views.TableToTextDialog = Common.UI.Window.extend(_.extend({
options: {
width: 300,
height: 254,
header: true,
style: 'min-width: 240px;',
cls: 'modal-dlg',

View File

@ -46,8 +46,7 @@ define([
DE.Views.TextToTableDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 405,
buttons: ['ok', 'cancel']
separator: false
},
initialize : function(options) {
@ -55,10 +54,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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">',
@ -131,10 +130,8 @@ define([
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

View File

@ -76,7 +76,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
DE.Views.WatermarkSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 400,
height: 442,
separator: false,
id: 'window-watermark'
},
@ -85,19 +85,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
_.extend(this.options, {
title: this.textTitle,
template: _.template(
[
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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;

View File

@ -41,6 +41,7 @@
}
.canvas-box {
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
background-color: #fff;
}

View File

@ -2053,9 +2053,8 @@ define([
width: 500,
msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn,
iconCls: 'info',
buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'],
buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'],
primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok',
customButtonText: this.textStrict,
dontshow: true,
callback: _.bind(function(btn, dontshow){
if (dontshow) Common.localStorage.setItem("pdfe-hide-try-undoredo", 1);

View File

@ -1656,7 +1656,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(''));

View File

@ -2206,9 +2206,8 @@ define([
width: 500,
msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn,
iconCls: 'info',
buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'],
buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'],
primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok',
customButtonText: this.textStrict,
dontshow: true,
callback: _.bind(function(btn, dontshow){
if (dontshow) window.localStorage.setItem("pe-hide-try-undoredo", 1);

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>

View File

@ -69,8 +69,8 @@
<div id="id-adv-image-rotate" class="settings-panel active">
<div class="inner-content padding-large">
<div style="width: 100%;">
<label class="input-label"><%= scope.textAngle %></label>
<div id="image-advanced-spin-angle" class="margin-left-5" style="display: inline-block;"></div>
<label class="input-label vertical-align-baseline"><%= scope.textAngle %></label>
<div id="image-advanced-spin-angle" class="margin-left-5 vertical-align-baseline" style="display: inline-block;"></div>
</div>
</div>
<div class="separator horizontal padding-large"></div>

View File

@ -43,9 +43,8 @@ define([
PE.Views.AnimationDialog = Common.UI.Window.extend(_.extend({
options: {
width: 350,
height: 396,
header: true,
cls: 'animation-dlg',
cls: 'modal-dlg',
buttons: ['ok', 'cancel']
},
initialize : function(options) {
@ -53,11 +52,11 @@ define([
title: this.textTitle
}, options || {});
this.template = [
'<div class="box" style="width: 318px; margin: 0 auto">',
'<div class="box">',
'<div class = "input-row" id = "animation-group"></div>',
'<div class = "input-row" id = "animation-level" ></div>',
'<div class = "input-row" id = "animation-list" style = "margin: 16px 0; height: 216px;"></div>',
// '<div class = "input-row" id = "animation-setpreview" style = "margin: 16px 0;"></div>',
'<div class = "input-row" id = "animation-level" style = "margin-top: 16px; "></div>',
'<div class = "input-row" id = "animation-list" style = "margin-top: 16px; height: 216px;"></div>',
// '<div class = "input-row" id = "animation-setpreview" style = "margin-top: 16px;"></div>',
'</div>'
].join('');
this.allEffects = Common.define.effectData.getEffectFullData();
@ -90,14 +89,11 @@ define([
var $window = this.getChild();
var footer = $window.find('.footer');
footer.css({"text-align": "center"});
this.cmbGroup = new Common.UI.ComboBox({
el : $('#animation-group'),
cls: 'input-group-nr',
editable: false,
style : 'margin-top: 16px; width: 100%;',
style : 'width: 100%;',
menuStyle: 'min-width: 100%;',
takeFocusOnClose: true,
data : this.EffectGroupData,
@ -110,7 +106,7 @@ define([
cls: 'input-group-nr',
editable: false,
valueField: 'id',
style : 'margin-top: 16px; width: 100%;',
style : 'width: 100%;',
menuStyle: 'min-width: 100%;',
takeFocusOnClose: true
});

View File

@ -46,7 +46,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
PE.Views.ChartSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 342,
contentHeight: 257,
toggleGroup: 'chart-adv-settings-group',
properties: null,
storageName: 'pe-chart-settings-adv-category',

View File

@ -62,7 +62,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 275px;">',
'<div class="box">',
'<div class="input-row">',
'<label class="font-weight-bold">' + this.textLang + '</label>',
'</div>',
@ -71,7 +71,7 @@ define([
'<label class="font-weight-bold">' + this.textFormat + '</label>',
'</div>',
'<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 162px; overflow: hidden;"></div>',
'<div class="input-row">',
'<div class="input-row" style="margin-bottom: 8px;">',
'<div id="datetime-dlg-update" style="margin-top: 3px;margin-bottom: 10px;"></div>',
'<button type="button" class="btn btn-text-default auto float-right" id="datetime-dlg-default">' + this.textDefault + '</button>',
'</div>',

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(''));

View File

@ -59,14 +59,13 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 55px;">',
'<div class="box">',
'<div class="input-row">',
'<label class="text">' + this.textSpacing + '</label>',
'</div>',
'<div id="grid-spacing-combo" class="input-group-nr"></div>',
'<div id="grid-spacing-spin" class="margin-left-10"></div>',
'</div>',
'<div class="separator horizontal"></div>'
'<div id="grid-spacing-combo" class="input-group-nr" style="margin-bottom:10px;"></div>',
'<div id="grid-spacing-spin" class="margin-left-10" style="margin-bottom:10px;"></div>',
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);

View File

@ -47,8 +47,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
PE.Views.HeaderFooterDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 360,
height: 415,
buttons: null,
contentHeight: 330,
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" style="height:' + (me.options.height - 85) + 'px;">',
'<div class="content-panel" style="padding: 10px 5px;"><div class="inner-content">',
'<div class="settings-panel active">',
'<div class="box">',
'<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

View File

@ -48,7 +48,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
options: {
alias: 'ImageSettingsAdvanced',
contentWidth: 340,
height: 342,
contentHeight: 257,
sizeOriginal: {width: 0, height: 0},
sizeMax: {width: 55.88, height: 55.88},
storageName: 'pe-img-settings-adv-category'

View File

@ -49,7 +49,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
PE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 370,
height: 394,
contentHeight: 309,
toggleGroup: 'paragraph-adv-settings-group',
storageName: 'pe-para-settings-adv-category'
},

View File

@ -49,7 +49,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
PE.Views.ShapeSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 342,
contentHeight: 257,
toggleGroup: 'shape-adv-settings-group',
sizeOriginal: {width: 0, height: 0},
sizeMax: {width: 55.88, height: 55.88},

View File

@ -58,7 +58,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 200px;">',
'<div class="box">',
'<div class="input-row">',
'<label class="text font-weight-bold">' + this.textSlideSize + '</label>',
'</div>',
@ -82,9 +82,8 @@ define([
'<div class="input-row">',
'<label class="text font-weight-bold">' + this.txtSlideNum + '</label>',
'</div>',
'<div id="slide-size-spin-slidenum" class="" style="margin-bottom: 10px;"></div>',
'</div>',
'<div class="separator horizontal"></div>'
'<div id="slide-size-spin-slidenum" class="" style="margin-bottom: 5px;"></div>',
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);

View File

@ -58,10 +58,9 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 20px;">',
'<div id="slideshow-checkbox-loop"></div>',
'</div>',
'<div class="separator horizontal"></div>'
'<div class="box">',
'<div id="slideshow-checkbox-loop" style="margin-bottom:5px;"></div>',
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);

View File

@ -47,7 +47,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
options: {
alias: 'TableSettingsAdvanced',
contentWidth: 280,
height: 385,
contentHeight: 300,
storageName: 'pe-table-settings-adv-category',
sizeMax: {width: 55.88, height: 55.88},
},

View File

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

View File

@ -2941,9 +2941,8 @@ define([
width: 500,
msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn,
iconCls: 'info',
buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'],
buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'],
primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok',
customButtonText: this.textStrict,
dontshow: true,
callback: _.bind(function(btn, dontshow){
if (dontshow) window.localStorage.setItem("sse-hide-try-undoredo", 1);

View File

@ -75,8 +75,8 @@
</td>
<td class="padding-large">
<div class="base float-right">
<label class="input-label"><%= scope.textBase %></label>
<div id="chart-dlg-input-base-<%=idx%>" class="margin-left-5" style="display: inline-block;"></div>
<label class="input-label vertical-align-baseline"><%= scope.textBase %></label>
<div id="chart-dlg-input-base-<%=idx%>" class="margin-left-5 vertical-align-baseline" style="display: inline-block;"></div>
</div>
</td>
</tr>

View File

@ -19,7 +19,7 @@
</td>
</tr>
<tr>
<td colspan=2 class="padding-small">
<td colspan=2>
<div style="position: relative;">
<div style="width: 100%;" id="format-manager-rules-list">
<div id="id-preview">

View File

@ -1,8 +1,8 @@
<div id="id-adv-image-rotate" class="settings-panel active">
<div class="inner-content padding-large">
<div style="width: 100%;">
<label class="input-label"><%= scope.textAngle %></label>
<div id="image-advanced-spin-angle" class="margin-left-5" style="display: inline-block;"></div>
<label class="input-label vertical-align-baseline"><%= scope.textAngle %></label>
<div id="image-advanced-spin-angle" class="margin-left-5 vertical-align-baseline" style="display: inline-block;"></div>
</div>
</div>
<div class="separator horizontal padding-large"></div>

View File

@ -13,7 +13,7 @@
</td>
</tr>
<tr>
<td colspan=2 class="padding-small">
<td colspan=2">
<div id="name-manager-range-list" class="range-tableview" style="width:100%; height: 191px;"></div>
</td>
</tr>

View File

@ -3,10 +3,10 @@
<div id="printadv-dlg-combo-range" class="input-group-nr"></div>
<div id="printadv-dlg-chb-ignore" style="margin-top: 5px;"></div>
<div id="printadv-dlg-pages">
<label class="margin-right-6"><%= scope.textPages %></label>
<div id="printadv-dlg-spin-pages-from" class="margin-right-6"></div>
<label class="margin-right-6"><%= scope.textTo %></label>
<div id="printadv-dlg-spin-pages-to"></div>
<label class="margin-right-6 vertical-align-baseline"><%= scope.textPages %></label>
<div id="printadv-dlg-spin-pages-from" class="margin-right-6 vertical-align-baseline"></div>
<label class="margin-right-6 vertical-align-baseline"><%= scope.textTo %></label>
<div id="printadv-dlg-spin-pages-to" class="vertical-align-baseline"></div>
</div>
</div>
<div class="padding-large inner-content" >

View File

@ -19,7 +19,7 @@
</td>
</tr>
<tr>
<td colspan=2 class="padding-small">
<td colspan=2>
<div id="protect-ranges-list" class="range-tableview" style="width:100%; height: 164px;"></div>
</td>
</tr>

View File

@ -21,7 +21,7 @@
<td colspan=2 class="padding-very-small"></td>
</tr>
<tr>
<td colspan=2 class="padding-small">
<td colspan=2>
<div id="protect-edit-ranges-list" class="range-tableview" style="width:100%; height: 188px;"></div>
</td>
</tr>

View File

@ -19,7 +19,7 @@
</td>
</tr>
<tr>
<td colspan="2" class="padding-small">
<td colspan="2">
<div id="sort-dialog-list" class="" style="width:100%; height: 173px;"></div>
</td>
</tr>

View File

@ -8,7 +8,7 @@
</td>
</tr>
<tr>
<td class="padding-small">
<td>
<div id="watch-dialog-list" class="range-tableview" style="width:100%; height: 164px;"></div>
</td>
</tr>

View File

@ -55,17 +55,17 @@ define([
_.extend(_options, {
width : options.type === 'date' ? 528 : 501,
height : 230,
contentWidth : 180,
header : true,
cls : 'filter-dlg' + (options.type === 'date' ? ' date-filter' : ''),
cls : 'filter-dlg modal-dlg' + (options.type === 'date' ? ' date-filter' : ''),
contentTemplate : '',
title : t.txtTitle,
items : []
items : [],
buttons: ['ok', 'cancel']
}, options);
this.template = options.template || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="box">',
'<div class="content-panel" >',
'<label class="header">', t.textShowRows, '</label>',
'<div class="combo-container-1">',
@ -87,11 +87,6 @@ define([
'<% } %>',
'</div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok">', t.okButtonText, '</button>',
'<button class="btn normal dlg-btn" result="cancel">', t.cancelButtonText, '</button>',
'</div>'
].join('');
@ -375,10 +370,9 @@ define([
_.extend(_options, {
width : (this.type=='value') ? 450 : 318,
height : 160,
contentWidth : 180,
header : true,
cls : 'filter-dlg',
cls : 'filter-dlg modal-dlg',
contentTemplate : '',
title : t.txtTitle,
items : [],
@ -386,7 +380,7 @@ define([
}, options);
this.template = options.template || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="box">',
'<div class="content-panel" >',
'<label>', t.textType, '</label>',
'<div>',
@ -397,8 +391,7 @@ define([
'<div id="id-top10-fields-combo" class="input-group-nr" style="width:100px;display: inline-block; vertical-align: middle;"></div>',
'</div>',
'</div>',
'</div>',
'<div class="separator horizontal" style="width:100%"></div>'
'</div>'
].join('');
this.api = options.api;
@ -581,13 +574,13 @@ define([
_.extend(_options, {
width : 501,
height : 210,
contentWidth : 180,
header : true,
cls : 'filter-dlg',
cls : 'filter-dlg modal-dlg',
contentTemplate : '',
title : (options.type=='label') ? t.txtTitleLabel : t.txtTitleValue,
items : []
items : [],
buttons: ['ok', 'cancel']
}, options);
this.api = options.api;
@ -595,7 +588,7 @@ define([
this.type = options.type || 'value';
this.template = options.template || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="box">',
'<div class="content-panel" >',
'<label class="header">', ((t.type=='label') ? t.textShowLabel : t.textShowValue), '</label>',
'<div style="margin-top:15px;">',
@ -610,11 +603,6 @@ define([
'<label style="display:block;">' + t.textUse2 + '</label>',
'</div>',
'</div>',
'</div>',
'<div class="separator horizontal" style="width:100%"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok">', t.okButtonText, '</button>',
'<button class="btn normal dlg-btn" result="cancel">', t.cancelButtonText, '</button>',
'</div>'
].join('');
@ -860,10 +848,9 @@ define([
_.extend(_options, {
width : 250,
height : 215,
contentWidth : 180,
header : true,
cls : 'filter-dlg',
cls : 'filter-dlg modal-dlg',
contentTemplate : '',
title : t.txtTitle,
items : [],
@ -871,15 +858,14 @@ define([
}, options);
this.template = options.template || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="box">',
'<div class="content-panel" >',
'<div id="id-sort-filter-radio-asc" style="margin-bottom: 4px;"></div>',
'<div id="id-sort-filter-fields-asc" class="input-group-nr margin-left-22" style="margin-bottom: 10px;"></div>',
'<div id="id-sort-filter-radio-desc" style="margin-bottom: 4px;"></div>',
'<div id="id-sort-filter-fields-desc" class="input-group-nr margin-left-22"></div>',
'</div>',
'</div>',
'<div class="separator horizontal" style="width:100%"></div>'
'</div>'
].join('');
this.api = options.api;
@ -1062,7 +1048,7 @@ define([
height : height || 277,
contentWidth : (width - 50) || 400,
header : false,
cls : 'filter-dlg autofilter invisible-borders',
cls : 'filter-dlg modal-dlg autofilter invisible-borders',
contentTemplate : '',
title : t.txtTitle,
modal : false,

View File

@ -49,7 +49,6 @@ define([
SSE.Views.ChartDataDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 370,
height: 490,
id: 'window-chart-data'
},
@ -58,10 +57,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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>',
@ -102,16 +101,13 @@ define([
'</td>',
'</tr>',
'<tr>',
'<td class="padding-small">',
'<td class="padding-large">',
'<button type="button" class="btn btn-text-default auto margin-right-5" id="chart-dlg-btn-category-edit" style="min-width: 70px;">', me.textEdit, '</button>',
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.handler = options.handler;

View File

@ -52,7 +52,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
SSE.Views.ChartSettingsDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 327,
height: 535,
contentHeight: 450,
toggleGroup: 'chart-settings-dlg-group',
storageName: 'sse-chart-settings-adv-category'
},

View File

@ -69,7 +69,8 @@ define([
SSE.Views.ChartTypeDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 370,
height: 385
contentHeight: 300,
separator: false
},
initialize : function(options) {
@ -77,10 +78,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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;

View File

@ -47,7 +47,7 @@ define([
SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310,
height: 250,
separator: false,
id: 'window-create-pivot'
},
@ -56,10 +56,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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;">',
@ -87,15 +87,13 @@ define([
'</td>',
'</tr>',
'<tr>',
'<td class="padding-left-22">',
'<td class="padding-small padding-left-22">',
'<div id="create-pivot-input-dest" class="input-row" style=""></div>',
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

View File

@ -46,7 +46,7 @@ define([
SSE.Views.CreateSparklineDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310,
height: 195
separator: false
},
initialize : function(options) {
@ -54,10 +54,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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;">',
@ -75,15 +75,13 @@ define([
'</td>',
'</tr>',
'<tr>',
'<td>',
'<td class="padding-small">',
'<div id="create-spark-input-dest" class="input-row" style=""></div>',
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

View File

@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
SSE.Views.DataValidationDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 320,
height: 330,
contentHeight: 245,
toggleGroup: 'data-validation-group',
storageName: 'sse-data-validation-category'
},

View File

@ -51,18 +51,18 @@ define([
options: {
alias: 'ExternalLinksDlg',
contentWidth: 510,
height: 294,
buttons: null
separator: false,
buttons: ['close']
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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">',
@ -73,18 +73,13 @@ define([
'</td>',
'</tr>',
'<tr>',
'<td class="padding-small">',
'<td>',
'<div id="external-links-list" class="range-tableview" style="width:100%; height: 171px;"></div>',
'</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;
@ -98,7 +93,6 @@ define([
this.wrapEvents = {
onUpdateExternalReferenceList: _.bind(this.refreshList, this)
};
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},
render: function () {

View File

@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FieldSettingsDialog.templa
SSE.Views.FieldSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 284,
height: 450,
contentHeight: 365,
toggleGroup: 'pivot-field-settings-group',
storageName: 'sse-pivot-field-settings-category'
},

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(''));

View File

@ -51,7 +51,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
options: {
alias: 'FormatRulesEditDlg',
contentWidth: 491,
height: 445,
id: 'window-format-rules'
},
@ -60,12 +59,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
_.extend(this.options, {
title: this.txtTitleNew,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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;
@ -1500,7 +1495,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
(cmbData.length>0) && this.cmbRule.setValue((ruleType!==undefined) ? ruleType : cmbData[0].value);
}
this.setControls(index, this.cmbRule.getValue());
this.setHeight(index==9 ? 445 : 355);
this.setInnerHeight(index==9 ? 360 : 270);
if (rec) {
var type = rec.get('type');

View File

@ -90,20 +90,16 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
SSE.Views.FormatRulesManagerDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
alias: 'FormatRulesManagerDlg',
contentWidth: 560,
height: 340,
buttons: ['ok', 'cancel']
separator: false,
contentWidth: 560
},
initialize: function (options) {
var me = this;
_.extend(this.options, {
title: this.txtTitle,
template: [
'<div class="box" style="height:' + (this.options.height-85) + 'px;">',
'<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;

View File

@ -48,7 +48,7 @@ define([
SSE.Views.FormatSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 284,
height: 340
contentHeight: 255
},
initialize : function(options) {
@ -88,14 +88,14 @@ define([
this.props = options.props;
this.linked = options.linked || false;
var height = this.linked ? 360 : 340;
var height = this.linked ? 275 : 255;
_.extend(this.options, {
title: this.textTitle,
height: height,
template: [
'<div class="box" style="height:' + (height - 85) + 'px;">',
'<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
contentHeight: height,
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);

View File

@ -56,17 +56,19 @@ define([
_.extend(_options, {
width : 375,
height : 490,
header : true,
cls : 'formula-dlg',
cls : 'modal-dlg formula-dlg',
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 || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="box" style="height:405px;">',
'<div class="content-panel" >',
'<div id="formula-dlg-search" style="height:22px; margin-bottom:10px;"></div>',
'<label class="header">' + t.textGroupDescription + '</label>',
@ -77,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;

View File

@ -45,18 +45,18 @@ define([
SSE.Views.FormulaWizard = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 580,
height: 397
contentHeight: 312
},
initialize : function(options) {
var me = this;
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (this.options.height - 85) + 'px;">',
'<div class="content-panel" style="padding: 0;"><div class="inner-content">',
'<div class="settings-panel active">',
'<table style="height:' + (this.options.height - 85 - 7) + 'px;">',
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,6 +119,8 @@ define([
this.lblFormulaResult = $window.find('#formula-wizard-value');
this.lblFunctionResult = $window.find('#formula-wizard-lbl-val-func');
this.innerPanel.find('> table').css('height', this.options.contentHeight - 7);
this._preventCloseCellEditor = false;
this.afterRender();

View File

@ -81,7 +81,7 @@ define([
};
this.template = [
'<div class="box" style="height: 400px;">',
'<div class="box">',
'<table cols="2" style="width: 450px;margin-bottom: 30px;">',
'<tr>',
'<td style="padding-bottom: 8px;">',

View File

@ -48,7 +48,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp
SSE.Views.ImageSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 342,
contentHeight: 257,
toggleGroup: 'image-adv-settings-group',
properties: null,
storageName: 'sse-image-settings-adv-category'

View File

@ -47,7 +47,7 @@ define([
SSE.Views.ImportFromXmlDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310,
height: 200
separator: false
},
initialize : function(options) {
@ -55,10 +55,10 @@ define([
_.extend(this.options, {
title: this.textTitle,
template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<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">',
@ -76,15 +76,13 @@ define([
'</td>',
'</tr>',
'<tr>',
'<td class="padding-left-22">',
'<td class="padding-small padding-left-22">',
'<div id="import-xml-input-dest" class="input-row" style=""></div>',
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>'
].join('')
'</div></div>'
].join(''))({scope: this})
}, options);
this.api = options.api;

Some files were not shown because too many files have changed in this diff Show More