diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 10bb87fbd..70a59ebc3 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -884,8 +884,22 @@ .menu-iconsets { margin: 5px 5px 0 10px; + .rtl & { + margin: 5px 10px 0 5px; + } + + .group-description { + text-align: right; + } + .group-items-container > div { margin-right: 8px !important; + + .rtl & { + margin-right: 4px !important; + margin-left: 8px !important; + } + &:not(:hover), &:not(.selected) { .box-shadow(none); @@ -894,6 +908,10 @@ .item-iconset { img { margin: 2px; + + .rtl & { + float: right; + } } width: 100px; diff --git a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js index 98e599c10..400376053 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js @@ -50,7 +50,8 @@ define([ SSE.Views.ChartDataDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - height: 490 + height: 490, + id: 'window-chart-data' }, initialize : function(options) { @@ -81,12 +82,12 @@ define([ '', '', '', - '', - '', - '', - '
', - '
', - '
', + '', + '', + '', + '
', + '
', + '
', '
', '', '', diff --git a/apps/spreadsheeteditor/main/app/view/ChartDataRangeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartDataRangeDialog.js index 8bf492c6c..204b48c45 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartDataRangeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartDataRangeDialog.js @@ -76,7 +76,7 @@ define([ '
', '', '', - '', + '', '', '', '<% if (type==1) { %>', @@ -90,7 +90,7 @@ define([ '
', '', '', - '', + '', '', '', '<% if (isScatter) { %>', @@ -104,7 +104,7 @@ define([ '
', '', '', - '', + '', '', '', '<% } %>', diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 13a6a14e8..7083d0b12 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -197,10 +197,10 @@ define([ template: _.template(['
'].join('')), itemTemplate: _.template([ '
', - '
', - '
<%= value %>
', - '
', - '
', + '
', + '
<%= value %>
', + '
', + '
', '
' ].join('')) }); diff --git a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js index 711839b95..d082600cc 100644 --- a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js @@ -52,7 +52,8 @@ define([ style: 'min-width: 350px;', cls: 'modal-dlg enable-key-events', animate: {mask: false}, - buttons: ['ok', 'cancel'] + buttons: ['ok', 'cancel'], + id: 'window-header-footer' }, initialize : function(options) { @@ -103,24 +104,24 @@ define([ '
', '', '', - '', - '', + '', + '', '
', '', '
', - '
', - '
', - '
', - '
', - '
','
', - '
','
', - '
','
', - '
', + '
', + '
', + '
', + '
', + '
','
', + '
','
', + '
','
', + '
', '
', '
', '
', '
', - '
', + '
', '
', '
', '
', @@ -132,19 +133,19 @@ define([ '
', '', '
', - '
', - '
', - '
', - '
', - '
','
', - '
','
', - '
','
', - '
', + '
', + '
', + '
', + '
', + '
','
', + '
','
', + '
','
', + '
', '
', '', '
', '
', - '
', + '
', '
', '', '
', diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index b6b777cf4..d8e34e79b 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -269,8 +269,8 @@ define([ _.template([ '<% _.each(items, function(item) { %>', '
  • ', - '
  • ', '<% }); %>', '
  • ', @@ -1381,8 +1381,8 @@ define([ _.template([ '<% _.each(items, function(item) { %>', '
  • ', - '
  • ', '<% }); %>', '
  • ', @@ -2527,7 +2527,7 @@ define([ id : 'id-toolbar-mnu-item-border-color', caption : this.textBordersColor, iconCls : 'mnu-icon-item mnu-border-color', - template : _.template('<%= caption %>'), + template : _.template('<%= caption %>'), menu : new Common.UI.Menu({ menuAlign : 'tl-tr', cls: 'shifted-left', @@ -2535,7 +2535,7 @@ define([ { id: 'id-toolbar-menu-auto-bordercolor', caption: this.textAutoColor, - template: _.template('<%= caption %>'), + template: _.template('<%= caption %>'), stopPropagation: true }, {caption: '--'}, @@ -2543,7 +2543,7 @@ define([ {caption: '--'}, { id: "id-toolbar-menu-new-bordercolor", - template: _.template('' + this.textNewColor + ''), + template: _.template('' + this.textNewColor + ''), stopPropagation: true } ] diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index b646af85a..3130a9507 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -312,4 +312,138 @@ margin-left: 5px; } } +} + +#window-chart-data { + .up-down-btns { + display: inline-block; + float: right; + + .rtl & { + float: left; + } + + #chart-dlg-btn-up { + display: inline-block; + margin-right: 2px; + + .rtl & { + margin-right: 0; + margin-left: 2px; + } + } + + #chart-dlg-btn-down { + display: inline-block; + } + } + + #chart-dlg-btn-add, + #chart-dlg-btn-edit, + #chart-dlg-btn-delete { + min-width: 70px; + margin-right: 5px; + + .rtl & { + margin-right: 0; + margin-left: 5px; + } + } +} + +#id-dlg-chart-range-lbl1, +#id-dlg-chart-range-lbl2, +#id-dlg-chart-range-lbl3 { + margin-left: 5px; + + .rtl & { + margin-left: 0; + margin-right: 5px; + } +} + +#chart-type-dlg-series-list { + .series-color { + width: 8px; + height: 12px; + display: inline-block; + vertical-align: middle; + } + + .series-value { + width: 95px; + padding-left: 5px; + display: inline-block; + vertical-align: middle; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + + .rtl & { + padding-left: 0; + padding-right: 5px; + } + } + + .series-cmb { + width: 110px; + padding-left: 5px; + display: inline-block; + vertical-align: middle; + + .rtl & { + padding-left: 0; + padding-right: 5px; + } + } + + .series-chk { + padding-left: 55px; + display: inline-block; + vertical-align: middle; + + .rtl & { + padding-left: 0; + padding-right: 55px; + } + } +} + +#window-header-footer { + #id-dlg-hf-btn-even, + #id-dlg-hf-btn-first { + margin-left: -1px; + + .rtl & { + margin-left: 0; + margin-right: -1px; + } + } + + .margin-left-small { + margin-left: 2px; + + .rtl & { + margin-left: 0; + margin-right: 2px; + } + } + + .margin-left-big { + margin-left: 6px; + + .rtl & { + margin-left: 0; + margin-right: 6px; + } + } + + .preview-container { + margin-right: -1px; + + .rtl & { + margin-right: 0; + margin-left: -1px; + } + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 14790def0..66b02b9d3 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -249,3 +249,76 @@ } } } + +#id-toolbar-mnu-item-border-color { + > span { + background-image: none; + width: 12px; + height: 12px; + margin: 2px 9px 0 -11px; + border-style: solid; + border-width: 3px; + border-color: #000; + + .rtl & { + margin: 2px -11px 0 9px; + } + } +} + +#id-toolbar-menu-new-bordercolor { + > a { + padding-left: 12px; + + .rtl & { + padding-left: 0; + padding-right: 12px; + } + } +} + +#id-toolbar-menu-auto-bordercolor { + .color-auto { + background-image: none; + width: 12px; + height: 12px; + margin: 1px 7px 0 1px; + background-color: #000; + + .rtl & { + margin: 1px 1px 0 7px; + } + } +} + +#slot-btn-format { + .display-value { + position: absolute; + left: 0; + width: 100px; + + .rtl & { + left: auto; + right: 0; + } + } + + .example-val { + display: inline-block; + width: 100%; + max-width: 300px; + overflow: hidden; + text-overflow: ellipsis; + text-align: right; + vertical-align: bottom; + padding-left: 100px; + color: silver; + white-space: nowrap; + + .rtl & { + text-align: left; + padding-left: 0; + padding-right: 100px; + } + } +}