Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Изменения в расширенных настройках таблиц в соответствии с макетами https://nct.onlyoffice.com/products/files/#preview/50110.

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-02 15:16:16 +03:00
parent b6e18ebc97
commit 4b6dd42112
3 changed files with 58 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apps/documenteditor/main/app/template/TableSettingsAdvanced.template
View file

@ -1,36 +1,31 @@
<div id="id-adv-table-width" class="settings-panel active"> <div id="id-adv-table-width" class="settings-panel active">
<div class="inner-content"> <div class="inner-content">
<table cols="1" style="width: 100%;"> <table cols="3">
<tr> <tr>
<td class="padding-small" width="125px"> <td colspan="3" class="padding-small">
<label class="header"><%= scope.textTableSize %></label>
</td>
</tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 18px;">
<div id="tableadv-checkbox-width"></div> <div id="tableadv-checkbox-width"></div>
</td> </td>
</tr>
<tr>
<td class="padding-large"> <td class="padding-large">
<div id="tableadv-number-width" style="display: inline-block; margin-right: 10px;"></div> <label class="input-label"><%= scope.textWidth %></label>
<div id="tableadv-cmb-unit" style="display: inline-block;"></div> <div id="tableadv-number-width" style="margin-right: 10px;"></div>
</td> </td>
</tr>
<tr>
<td class="padding-small">
<div id="tableadv-checkbox-spacing"></div>
</td>
</tr>
<tr>
<td class="padding-large"> <td class="padding-large">
<div id="tableadv-number-spacing"></div> <label class="input-label"><%= scope.textMeasure %></label>
<div id="tableadv-cmb-unit" style="width: 115px;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" class="padding-large"> <td colspan="3" class="padding-large">
<div id="tableadv-checkbox-autofit"></div> <div id="tableadv-checkbox-autofit"></div>
</td> </td>
</tr> </tr>
</table> </table>
</div> <div class="padding-small"></div>
<div class="separator horizontal padding-large"></div>
<div class="inner-content">
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>
<td colspan=2 class="padding-small"> <td colspan=2 class="padding-small">
@ -58,11 +53,30 @@
</td> </td>
</tr> </tr>
</table> </table>
<div class="padding-small"></div>
<table cols="2">
<tr>
<td colspan="2" class="padding-small">
<label class="header"><%= scope.textOptions %></label>
</td>
</tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 18px;">
<div id="tableadv-checkbox-spacing"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textAllowSpacing %></label>
<div id="tableadv-number-spacing"></div>
</td>
</tr>
</table>
</div>
<div class="inner-content">
</div> </div>
</div> </div>
<div id="id-adv-table-cell-props" class="settings-panel"> <div id="id-adv-table-cell-props" class="settings-panel">
<div class="inner-content"> <div class="inner-content">
<table cols="3" style="width: 100%;"> <table cols="3">
<tr> <tr>
<td colspan="3" class="padding-small"> <td colspan="3" class="padding-small">
<label class="header"><%= scope.textCellSize %></label> <label class="header"><%= scope.textCellSize %></label>
@ -74,7 +88,7 @@
</td> </td>
<td class="padding-large"> <td class="padding-large">
<label class="input-label"><%= scope.textPrefWidth %></label> <label class="input-label"><%= scope.textPrefWidth %></label>
<div id="tableadv-number-prefwidth"></div> <div id="tableadv-number-prefwidth" style="margin-right: 10px;"></div>
</td> </td>
<td class="padding-large"> <td class="padding-large">
<label class="input-label"><%= scope.textMeasure %></label> <label class="input-label"><%= scope.textMeasure %></label>

33
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file

@ -63,11 +63,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
_.extend(this.options, { _.extend(this.options, {
title: this.textTitle, title: this.textTitle,
items: [ items: [
{panelId: 'id-adv-table-width', panelCaption: this.textWidthSpaces}, {panelId: 'id-adv-table-width', panelCaption: this.textTable},
{panelId: 'id-adv-table-wrap', panelCaption: this.textWrap}, {panelId: 'id-adv-table-cell-props', panelCaption: this.textCellProps},
{panelId: 'id-adv-table-borders', panelCaption: this.textBordersBackgroung}, {panelId: 'id-adv-table-borders', panelCaption: this.textBordersBackgroung},
{panelId: 'id-adv-table-position', panelCaption: this.textPosition}, {panelId: 'id-adv-table-position', panelCaption: this.textTablePosition},
{panelId: 'id-adv-table-cell-props', panelCaption: this.textCellProps} {panelId: 'id-adv-table-wrap', panelCaption: this.textWrap}
], ],
contentTemplate: _.template(contentTemplate)({ contentTemplate: _.template(contentTemplate)({
scope: this scope: this
@ -143,7 +143,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.chWidth = new Common.UI.CheckBox({ this.chWidth = new Common.UI.CheckBox({
el: $('#tableadv-checkbox-width'), el: $('#tableadv-checkbox-width'),
value: true, value: true,
labelText: this.textWidth labelText: ''
}); });
this.chWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.chWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var value = (newValue=='checked'); var value = (newValue=='checked');
@ -160,7 +160,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.nfWidth = new Common.UI.MetricSpinner({ this.nfWidth = new Common.UI.MetricSpinner({
el: $('#tableadv-number-width'), el: $('#tableadv-number-width'),
step: .1, step: .1,
width: 85, width: 115,
defaultUnit : "cm", defaultUnit : "cm",
value: '10 cm', value: '10 cm',
maxValue: 55.88, maxValue: 55.88,
@ -174,8 +174,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
var currmetric = Common.Utils.Metric.getCurrentMetric(); var currmetric = Common.Utils.Metric.getCurrentMetric();
this.cmbUnit = new Common.UI.ComboBox({ this.cmbUnit = new Common.UI.ComboBox({
el : $('#tableadv-cmb-unit'), el : $('#tableadv-cmb-unit'),
style : 'width: 85px;', style : 'width: 115px;',
menuStyle : 'min-width: 85px;', menuStyle : 'min-width: 115px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : [
@ -197,7 +197,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.chAllowSpacing = new Common.UI.CheckBox({ this.chAllowSpacing = new Common.UI.CheckBox({
el: $('#tableadv-checkbox-spacing'), el: $('#tableadv-checkbox-spacing'),
value: true, value: true,
labelText: this.textAllowSpacing labelText: ''
}); });
this.chAllowSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.chAllowSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var value = (newValue=='checked'); var value = (newValue=='checked');
@ -217,7 +217,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.nfSpacing = new Common.UI.MetricSpinner({ this.nfSpacing = new Common.UI.MetricSpinner({
el: $('#tableadv-number-spacing'), el: $('#tableadv-number-spacing'),
step: .1, step: .1,
width: 85, width: 115,
defaultUnit : "cm", defaultUnit : "cm",
value: '0.5 cm', value: '0.5 cm',
maxValue: 2.14, maxValue: 2.14,
@ -1065,7 +1065,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.CellBackContainer = $('#tableadv-panel-cell-back'); this.CellBackContainer = $('#tableadv-panel-cell-back');
this.TableBackContainer = $('#tableadv-panel-table-back'); this.TableBackContainer = $('#tableadv-panel-table-back');
this.btnsCategory[4].on('click', _.bind(this.onCellCategoryClick, this)); this.btnsCategory[1].on('click', _.bind(this.onCellCategoryClick, this));
this.afterRender(); this.afterRender();
}, },
@ -2106,7 +2106,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
}, },
textWidth: 'Width', textWidth: 'Width',
textAllowSpacing: 'Allow spacing between cells', textAllowSpacing: 'Spacing between cells',
textAlign: 'Alignment', textAlign: 'Alignment',
textIndLeft: 'Indent from Left', textIndLeft: 'Indent from Left',
textWidthSpaces: 'Width & Spaces', textWidthSpaces: 'Width & Spaces',
@ -2124,7 +2124,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textRightTooltip: 'Right', textRightTooltip: 'Right',
textCenterTooltip: 'Center', textCenterTooltip: 'Center',
textTitle: 'Table - Advanced Settings', textTitle: 'Table - Advanced Settings',
textDefaultMargins: 'Default Margins', textDefaultMargins: 'Default Cell Margins',
textCheckMargins: 'Use default margins', textCheckMargins: 'Use default margins',
textBordersBackgroung: 'Borders & Background', textBordersBackgroung: 'Borders & Background',
textOnlyCells: 'For selected cells only', textOnlyCells: 'For selected cells only',
@ -2154,7 +2154,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textOptions: 'Options', textOptions: 'Options',
textAnchorText: 'Text', textAnchorText: 'Text',
textAutofit: 'Automatically resize to fit contents', textAutofit: 'Automatically resize to fit contents',
textCellProps: 'Cell Properties', textCellProps: 'Cell',
tipAll: 'Set Outer Border and All Inner Lines', tipAll: 'Set Outer Border and All Inner Lines',
tipNone: 'Set No Borders', tipNone: 'Set No Borders',
tipInner: 'Set Inner Lines Only', tipInner: 'Set Inner Lines Only',
@ -2173,7 +2173,10 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textPrefWidth: 'Preferred width', textPrefWidth: 'Preferred width',
textMeasure: 'Measure in', textMeasure: 'Measure in',
textCellOptions: 'Cell Options', textCellOptions: 'Cell Options',
textWrapText: 'Wrap text' textWrapText: 'Wrap text',
textTable: 'Table',
textTableSize: 'Table Size',
textTablePosition: 'Table Position'
}, DE.Views.TableSettingsAdvanced || {})); }, DE.Views.TableSettingsAdvanced || {}));
}); });

9
apps/documenteditor/main/locale/en.json
View file

@ -1307,7 +1307,7 @@
"DE.Views.TableSettingsAdvanced.okButtonText": "OK", "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Alignment", "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alignment", "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Allow spacing between cells", "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
"DE.Views.TableSettingsAdvanced.textAnchorText": "Text", "DE.Views.TableSettingsAdvanced.textAnchorText": "Text",
"DE.Views.TableSettingsAdvanced.textAutofit": "Automatically resize to fit contents", "DE.Views.TableSettingsAdvanced.textAutofit": "Automatically resize to fit contents",
"DE.Views.TableSettingsAdvanced.textBackColor": "Cell Background", "DE.Views.TableSettingsAdvanced.textBackColor": "Cell Background",
@ -1317,11 +1317,11 @@
"DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Borders & Background", "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Borders & Background",
"DE.Views.TableSettingsAdvanced.textBorderWidth": "Border Size", "DE.Views.TableSettingsAdvanced.textBorderWidth": "Border Size",
"DE.Views.TableSettingsAdvanced.textBottom": "Bottom", "DE.Views.TableSettingsAdvanced.textBottom": "Bottom",
"DE.Views.TableSettingsAdvanced.textCellProps": "Cell Properties", "DE.Views.TableSettingsAdvanced.textCellProps": "Cell",
"DE.Views.TableSettingsAdvanced.textCenter": "Center", "DE.Views.TableSettingsAdvanced.textCenter": "Center",
"DE.Views.TableSettingsAdvanced.textCenterTooltip": "Center", "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Center",
"DE.Views.TableSettingsAdvanced.textCheckMargins": "Use default margins", "DE.Views.TableSettingsAdvanced.textCheckMargins": "Use default margins",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Margins", "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Cell Margins",
"DE.Views.TableSettingsAdvanced.textDistance": "Distance from Text", "DE.Views.TableSettingsAdvanced.textDistance": "Distance from Text",
"DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal", "DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal",
"DE.Views.TableSettingsAdvanced.textIndLeft": "Indent from Left", "DE.Views.TableSettingsAdvanced.textIndLeft": "Indent from Left",
@ -1342,7 +1342,10 @@
"DE.Views.TableSettingsAdvanced.textRightOf": "to the right of", "DE.Views.TableSettingsAdvanced.textRightOf": "to the right of",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "Right", "DE.Views.TableSettingsAdvanced.textRightTooltip": "Right",
"DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors", "DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors",
"DE.Views.TableSettingsAdvanced.textTable": "Table",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position",
"DE.Views.TableSettingsAdvanced.textTableSize": "Table Size",
"DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors", "DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors",
"DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings", "DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings",
"DE.Views.TableSettingsAdvanced.textTop": "Top", "DE.Views.TableSettingsAdvanced.textTop": "Top",