From 678ac9da706a781cbc5e428cb24e8b4eecaf65d0 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 17 Jan 2017 20:44:36 +0300
Subject: [PATCH] [SSE] Update FormatSettingsDialog layout.

---
 .../main/app/view/FormatSettingsDialog.js     | 52 +++++++++----------
 apps/spreadsheeteditor/main/locale/en.json    | 29 +++++++++++
 2 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
index f26c831666..33012cc726 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
@@ -48,8 +48,8 @@ define([
 
     SSE.Views.FormatSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
-            contentWidth: 200,
-            height: 330
+            contentWidth: 284,
+            height: 340
         },
 
         initialize : function(options) {
@@ -88,19 +88,23 @@ define([
                 title: this.textTitle,
                 template: [
                     '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
-                    '<div class="content-panel" style="padding: 0 20px;"><div class="inner-content">',
+                    '<div class="content-panel" style="padding: 0 10px;"><div class="inner-content">',
                     '<div class="settings-panel active">',
                     '<table cols="1" style="width: 100%;">',
                         '<tr>',
                             '<td style="width:170px;padding-bottom: 3px;">',
-                                '<label class="input-label">', me.textTitle,'</label>',
-                                '<div id="format-settings-combo-format" class="input-group-nr" style="width:180px;"></div>',
+                                '<label class="input-label">', me.textCategory,'</label>',
+                                '<div id="format-settings-combo-format" class="input-group-nr" style="width:264px;"></div>',
+                            '</td>',
+                        '</tr>',
+                        '<tr>',
+                            '<td class="padding-large" style="white-space: nowrap;">',
+                                '<label style="vertical-align: middle; margin-right: 3px;">' + me.txtSample + '</label>',
+                                '<label id="format-settings-label-example" style="vertical-align: middle; max-width: 220px; overflow: hidden; text-overflow: ellipsis;>100</label>',
                             '</td>',
                         '</tr>',
                         '<tr>',
                             '<td class="padding-small">',
-                                '<label style="color: #adadad; vertical-align: middle; margin-right: 3px;">' + me.txtSample + '</label>',
-                                '<label id="format-settings-label-example" style="vertical-align: middle; max-width: 180px; overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">100</label>',
                             '</td>',
                         '</tr>',
                         '<tr class="format-decimal">',
@@ -117,31 +121,32 @@ define([
                         '<tr class="format-symbols">',
                             '<td class="padding-large">',
                                 '<label class="input-label">', me.textSymbols,'</label>',
-                                '<div id="format-settings-combo-symbols" class="input-group-nr" style="width:180px;"></div>',
+                                '<div id="format-settings-combo-symbols" class="input-group-nr" style="width:264px;"></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>',
+                                '<label class="input-label">', me.textFormat,'</label>',
+                                '<div id="format-settings-combo-negative" class="input-group-nr" style="width:264px;"></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>',
+                                '<label class="input-label">', me.textFormat,'</label>',
+                                '<div id="format-settings-combo-type" class="input-group-nr" style="width:264px;"></div>',
                             '</td>',
                         '</tr>',
                         '<tr class="format-code">',
                             '<td colspan="1" class="padding-large">',
-                                '<label class="input-label">', me.textCode,'</label>',
-                                '<div id="format-settings-combo-code" class="input-group-nr" style="width:180px;"></div>',
+                                '<label class="input-label">', me.textFormat,'</label>',
+                                '<div id="format-settings-combo-code" class="input-group-nr" style="width:264px;"></div>',
                             '</td>',
                         '</tr>',
                     '</table>',
                     '</div></div>',
                     '</div>',
                     '</div>',
+                    '<div class="separator horizontal"/>',
                     '<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" result="cancel" style="width: 86px;">' + me.textCancel + '</button>',
@@ -166,7 +171,7 @@ define([
             this.cmbFormat = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-format'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 180px;',
+                menuStyle: 'min-width: 264px;',
                 editable: false,
                 data: this.numFormatData
             });
@@ -176,7 +181,7 @@ define([
             this.cmbNegative = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-negative'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 180px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:210px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -204,7 +209,7 @@ define([
             this.cmbSymbols = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-symbols'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 180px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:210px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -214,7 +219,7 @@ define([
             this.cmbType = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-type'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 180px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:210px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -447,12 +452,11 @@ define([
         },
 
         textTitle: 'Number Format',
+        textCategory: 'Category',
         textDecimal: 'Decimal',
-        textNegative: 'Negative numbers',
         textSeparator: 'Use 1000 separator',
-        textType: 'Type',
+        textFormat: 'Format',
         textSymbols: 'Symbols',
-        textCode: 'Code',
         textCancel: 'Cancel',
         textOk: 'OK',
         txtGeneral:         'General',
@@ -466,11 +470,6 @@ define([
         txtFraction:        'Fraction',
         txtScientific:      'Scientific',
         txtText:            'Text',
-        txtDollar:          '$ Dollar',
-        txtEuro:            '€ Euro',
-        txtRouble:          'р. Rouble',
-        txtPound:           '£ Pound',
-        txtYen:             '¥ Yen',
         txtUpto1: 'Up to one digit',
         txtUpto2: 'Up to two digits',
         txtUpto3: 'Up to three digits',
@@ -482,6 +481,5 @@ define([
         txtAs100: 'As hundredths',
         txtSample: 'Sample:'
 
-
     }, SSE.Views.FormatSettingsDialog || {}))
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index fdd164c117..e51ebed987 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1045,6 +1045,35 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings",
+  "SSE.Views.FormatSettingsDialog.textTitle": "Number Format",
+  "SSE.Views.FormatSettingsDialog.textCategory": "Category",
+  "SSE.Views.FormatSettingsDialog.textDecimal": "Decimal",
+  "SSE.Views.FormatSettingsDialog.textSeparator": "Use 1000 separator",
+  "SSE.Views.FormatSettingsDialog.textFormat": "Format",
+  "SSE.Views.FormatSettingsDialog.textSymbols": "Symbols",
+  "SSE.Views.FormatSettingsDialog.textCancel": "Cancel",
+  "SSE.Views.FormatSettingsDialog.textOk": "OK",
+  "SSE.Views.FormatSettingsDialog.txtGeneral": "General",
+  "SSE.Views.FormatSettingsDialog.txtNumber": "Number",
+  "SSE.Views.FormatSettingsDialog.txtCustom": "Custom",
+  "SSE.Views.FormatSettingsDialog.txtCurrency": "Currency",
+  "SSE.Views.FormatSettingsDialog.txtAccounting": "Accounting",
+  "SSE.Views.FormatSettingsDialog.txtDate": "Date",
+  "SSE.Views.FormatSettingsDialog.txtTime": "Time",
+  "SSE.Views.FormatSettingsDialog.txtPercentage": "Percentage",
+  "SSE.Views.FormatSettingsDialog.txtFraction": "Fraction",
+  "SSE.Views.FormatSettingsDialog.txtScientific": "Scientific",
+  "SSE.Views.FormatSettingsDialog.txtText": "Text",
+  "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit",
+  "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits",
+  "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits",
+  "SSE.Views.FormatSettingsDialog.txtAs2": "As halfs",
+  "SSE.Views.FormatSettingsDialog.txtAs8": "As eighths",
+  "SSE.Views.FormatSettingsDialog.txtAs4": "As fourths",
+  "SSE.Views.FormatSettingsDialog.txtAs16": "As sixteenths",
+  "SSE.Views.FormatSettingsDialog.txtAs10": "As tenths",
+  "SSE.Views.FormatSettingsDialog.txtAs100": "As hundredths",
+  "SSE.Views.FormatSettingsDialog.txtSample": "Sample:",
   "SSE.Views.FormulaDialog.cancelButtonText": "Cancel",
   "SSE.Views.FormulaDialog.okButtonText": "OK",
   "SSE.Views.FormulaDialog.sCategoryAll": "All",