Skip to content

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

[SSE] Change layout for FormatSettingsDialog.

parent 5cf5f1e0
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 36 deletions
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file @ 75904432
...@@ -48,8 +48,8 @@ define([ ...@@ -48,8 +48,8 @@ define([
SSE.Views.FormatSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ SSE.Views.FormatSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: { options: {
contentWidth: 330, contentWidth: 200,
height: 250 height: 330
}, },
initialize : function(options) { initialize : function(options) {
...@@ -88,60 +88,59 @@ define([ ...@@ -88,60 +88,59 @@ define([
title: this.textTitle, title: this.textTitle,
template: [ template: [
'<div class="box" style="height:' + (me.options.height - 85) + 'px;">', '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
'<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">', '<div class="content-panel" style="padding: 0 20px;"><div class="inner-content">',
'<div class="settings-panel active">', '<div class="settings-panel active">',
'<table cols="2" style="width: 100%;">', '<table cols="1" style="width: 100%;">',
'<tr>', '<tr>',
'<td class="padding-small" style="width:170px;">', '<td style="width:170px;padding-bottom: 3px;">',
'<label class="header">', me.textTitle,'</label>', '<label class="input-label">', me.textTitle,'</label>',
'<div id="format-settings-combo-format" class="input-group-nr" style="width:140px;"></div>', '<div id="format-settings-combo-format" class="input-group-nr" style="width:180px;"></div>',
'</td>', '</td>',
'</tr>',
'<tr>',
'<td class="padding-small">', '<td class="padding-small">',
'<label class="input-label" style="margin-bottom: -1px;">', me.textSample,'</label>', '<label id="format-settings-label-example" style="max-width: 180px; overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">100</label>',
'<label id="format-settings-label-example" style="display: block; font-size: 18px;max-width: 140px; overflow: hidden; text-overflow: ellipsis;">100</label>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr class="format-decimal">', '<tr class="format-decimal">',
'<td class="padding-large format-negative">',
'<label class="input-label">', me.textNegative,'</label>',
'<div id="format-settings-combo-negative" class="input-group-nr" style="width:140px;"></div>',
'</td>',
'<td class="padding-large" style="vertical-align: bottom;">', '<td class="padding-large" style="vertical-align: bottom;">',
'<label class="input-label" style="margin-right: 10px;">', me.textDecimal,'</label>', '<label class="input-label">', me.textDecimal,'</label>',
'<div id="format-settings-spin-decimal" style="display: inline-block;"></div>', '<div id="format-settings-spin-decimal"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr class="format-separator">', '<tr class="format-separator">',
'<td class="padding-small"></td>', '<td class="padding-large">',
'<td class="padding-small">',
'<div id="format-settings-checkbox-separator"></div>', '<div id="format-settings-checkbox-separator"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr class="format-type">',
'<td class="padding-small"></td>',
'<td class="padding-small">',
'<label class="input-label">', me.textType,'</label>',
'<div id="format-settings-combo-type" class="input-group-nr" style="width:140px;"></div>',
'</td>',
'</tr>',
'<tr class="format-symbols">', '<tr class="format-symbols">',
'<td class="padding-small"></td>', '<td class="padding-large">',
'<td class="padding-small">',
'<label class="input-label">', me.textSymbols,'</label>', '<label class="input-label">', me.textSymbols,'</label>',
'<div id="format-settings-combo-symbols" class="input-group-nr" style="width:140px;"></div>', '<div id="format-settings-combo-symbols" class="input-group-nr" style="width:180px;"></div>',
'</td>',
'</tr>',
'<tr class="format-decimal">',
'<td class="padding-large format-negative">',
'<label class="input-label">', me.textNegative,'</label>',
'<div id="format-settings-combo-negative" class="input-group-nr" style="width:180px;"></div>',
'</td>',
'</tr>',
'<tr class="format-type">',
'<td class="padding-large">',
'<label class="input-label">', me.textType,'</label>',
'<div id="format-settings-combo-type" class="input-group-nr" style="width:180px;"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr class="format-code">', '<tr class="format-code">',
'<td colspan="2" class="padding-small">', '<td colspan="1" class="padding-large">',
'<label class="input-label">', me.textCode,'</label>', '<label class="input-label">', me.textCode,'</label>',
'<div id="format-settings-combo-code" class="input-group-nr" style=""></div>', '<div id="format-settings-combo-code" class="input-group-nr" style="width:180px;"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'</table>', '</table>',
'</div></div>', '</div></div>',
'</div>', '</div>',
'</div>', '</div>',
'<div class="separator horizontal"/>',
'<div class="footer center">', '<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px; width: 86px;">' + me.textOk + '</button>', '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px; width: 86px;">' + me.textOk + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textCancel + '</button>', '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textCancel + '</button>',
...@@ -166,7 +165,7 @@ define([ ...@@ -166,7 +165,7 @@ define([
this.cmbFormat = new Common.UI.ComboBox({ this.cmbFormat = new Common.UI.ComboBox({
el: $('#format-settings-combo-format'), el: $('#format-settings-combo-format'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;', menuStyle: 'min-width: 180px;',
editable: false, editable: false,
data: this.numFormatData data: this.numFormatData
}); });
...@@ -176,7 +175,7 @@ define([ ...@@ -176,7 +175,7 @@ define([
this.cmbNegative = new Common.UI.ComboBox({ this.cmbNegative = new Common.UI.ComboBox({
el: $('#format-settings-combo-negative'), el: $('#format-settings-combo-negative'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;max-height:210px;', menuStyle: 'min-width: 180px;max-height:210px;',
editable: false, editable: false,
data: [], data: [],
scrollAlwaysVisible: true scrollAlwaysVisible: true
...@@ -204,7 +203,7 @@ define([ ...@@ -204,7 +203,7 @@ define([
this.cmbSymbols = new Common.UI.ComboBox({ this.cmbSymbols = new Common.UI.ComboBox({
el: $('#format-settings-combo-symbols'), el: $('#format-settings-combo-symbols'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;max-height:210px;', menuStyle: 'min-width: 180px;max-height:210px;',
editable: false, editable: false,
data: [], data: [],
scrollAlwaysVisible: true scrollAlwaysVisible: true
...@@ -214,7 +213,7 @@ define([ ...@@ -214,7 +213,7 @@ define([
this.cmbType = new Common.UI.ComboBox({ this.cmbType = new Common.UI.ComboBox({
el: $('#format-settings-combo-type'), el: $('#format-settings-combo-type'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 140px;max-height:210px;', menuStyle: 'min-width: 180px;max-height:210px;',
editable: false, editable: false,
data: [], data: [],
scrollAlwaysVisible: true scrollAlwaysVisible: true
...@@ -423,7 +422,10 @@ define([ ...@@ -423,7 +422,10 @@ define([
} }
} else { } else {
var formatsarr = this.api.asc_getFormatCells(null), var info = new Asc.asc_CFormatCellsInfo();
info.asc_setType(Asc.c_oAscNumFormatType.None);
var formatsarr = this.api.asc_getFormatCells(info),
data = []; data = [];
formatsarr.forEach(function(item) { formatsarr.forEach(function(item) {
data.push({value: item, displayValue: item}); data.push({value: item, displayValue: item});
...@@ -443,7 +445,6 @@ define([ ...@@ -443,7 +445,6 @@ define([
}, },
textTitle: 'Number Format', textTitle: 'Number Format',
textSample: 'Sample',
textDecimal: 'Decimal', textDecimal: 'Decimal',
textNegative: 'Negative numbers', textNegative: 'Negative numbers',
textSeparator: 'Use 1000 separator', textSeparator: 'Use 1000 separator',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7