diff --git a/apps/presentationeditor/main/app/template/ImageSettings.template b/apps/presentationeditor/main/app/template/ImageSettings.template
index 1341a2ed0..be505152e 100644
--- a/apps/presentationeditor/main/app/template/ImageSettings.template
+++ b/apps/presentationeditor/main/app/template/ImageSettings.template
@@ -41,15 +41,15 @@
|
|
diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template
index 4d8534512..87464cb90 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettings.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettings.template
@@ -26,7 +26,7 @@
- |
@@ -44,11 +44,11 @@
-
+
-
+
@@ -61,7 +61,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
|
@@ -86,7 +86,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
|
@@ -159,15 +159,15 @@
|
|
@@ -182,7 +182,7 @@
-
+
|
diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template
index df87a6486..91ec7097c 100644
--- a/apps/presentationeditor/main/app/template/SlideSettings.template
+++ b/apps/presentationeditor/main/app/template/SlideSettings.template
@@ -44,11 +44,11 @@
-
+
-
+
@@ -61,7 +61,7 @@
-
+
@@ -69,7 +69,7 @@
|
-
+
|
@@ -86,7 +86,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
|
diff --git a/apps/presentationeditor/main/app/template/TableSettings.template b/apps/presentationeditor/main/app/template/TableSettings.template
index 673ed83a9..33f3ae690 100644
--- a/apps/presentationeditor/main/app/template/TableSettings.template
+++ b/apps/presentationeditor/main/app/template/TableSettings.template
@@ -54,8 +54,8 @@
-
-
+
+
|
@@ -85,7 +85,7 @@
-
+
|
@@ -112,13 +112,13 @@
-
+
|
-
+
|
diff --git a/apps/presentationeditor/main/app/template/TextArtSettings.template b/apps/presentationeditor/main/app/template/TextArtSettings.template
index 38d4e8846..8956defd1 100644
--- a/apps/presentationeditor/main/app/template/TextArtSettings.template
+++ b/apps/presentationeditor/main/app/template/TextArtSettings.template
@@ -36,7 +36,7 @@
-
+
|
@@ -44,7 +44,7 @@
- |
@@ -62,11 +62,11 @@
-
+
-
+
@@ -79,7 +79,7 @@
-
+
@@ -87,7 +87,7 @@
|
-
+
|
@@ -104,7 +104,7 @@
-
+
@@ -126,7 +126,7 @@
-
+
|
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index fde3bdb0a..7fc991e99 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -510,7 +510,8 @@ define([
onGradientChange: function(slider, newValue, oldValue){
this.GradColor.values = slider.getValues();
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue, true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -943,7 +944,8 @@ define([
me.GradColor.currentIdx = 0;
}
this.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
+ var curValue = me.GradColor.values[me.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - curValue : curValue);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1360,7 +1362,7 @@ define([
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
var pos = me.GradColor.values[me.GradColor.currentIdx];
- me.spnGradPosition.setValue(pos, true);
+ me.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - pos : pos, true);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -1876,8 +1878,11 @@ define([
},
onPositionChange: function(btn) {
- var pos = btn.getNumberValue(),
- minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ var pos = btn.getNumberValue();
+ if (Common.UI.isRTL()) {
+ pos = this.sldrGradient.maxValue - pos;
+ }
+ var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
maxValue = (this.GradColor.currentIdx+1 maxValue;
if (this.api) {
diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js
index 1bb821d15..94bfb4918 100644
--- a/apps/presentationeditor/main/app/view/SlideSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideSettings.js
@@ -581,7 +581,8 @@ define([
onGradientChange: function(slider, newValue, oldValue){
this.GradColor.values = slider.getValues();
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue, true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -856,7 +857,7 @@ define([
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
var pos = me.GradColor.values[me.GradColor.currentIdx];
- me.spnGradPosition.setValue(pos, true);
+ me.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - pos : pos, true);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -1295,7 +1296,8 @@ define([
me.GradColor.currentIdx = 0;
}
me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1450,8 +1452,11 @@ define([
},
onPositionChange: function(btn) {
- var pos = btn.getNumberValue(),
- minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ var pos = btn.getNumberValue();
+ if (Common.UI.isRTL()) {
+ pos = this.sldrGradient.maxValue - pos;
+ }
+ var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
maxValue = (this.GradColor.currentIdx+1 maxValue;
if (this.api) {
diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js
index 0e12a775f..ec25614c5 100644
--- a/apps/presentationeditor/main/app/view/TableSettings.js
+++ b/apps/presentationeditor/main/app/view/TableSettings.js
@@ -799,7 +799,7 @@ define([
menu : new Common.UI.Menu({
style: 'width: 588px;',
items: [
- { template: _.template('') }
+ { template: _.template('') }
]
}),
dataHint: '1',
diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js
index 848e77b94..73cfdef3f 100644
--- a/apps/presentationeditor/main/app/view/TextArtSettings.js
+++ b/apps/presentationeditor/main/app/view/TextArtSettings.js
@@ -515,7 +515,8 @@ define([
onGradientChange: function(slider, newValue, oldValue){
this.GradColor.values = slider.getValues();
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue, true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -877,7 +878,8 @@ define([
me.GradColor.currentIdx = 0;
}
me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
+ var curValue = me.GradColor.values[me.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - curValue : curValue);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1316,7 +1318,7 @@ define([
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
var pos = me.GradColor.values[me.GradColor.currentIdx];
- me.spnGradPosition.setValue(pos, true);
+ me.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - pos : pos, true);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -1760,8 +1762,11 @@ define([
},
onPositionChange: function(btn) {
- var pos = btn.getNumberValue(),
- minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ var pos = btn.getNumberValue();
+ if (Common.UI.isRTL()) {
+ pos = this.sldrGradient.maxValue - pos;
+ }
+ var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
maxValue = (this.GradColor.currentIdx+1 maxValue;
if (this.api) {
diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less
index f3ed4c565..d6085fdf0 100644
--- a/apps/presentationeditor/main/resources/less/app.less
+++ b/apps/presentationeditor/main/resources/less/app.less
@@ -190,14 +190,6 @@
}
}
-#slide-texture-img-box {
- background: @background-normal;
- border: @scaled-one-px-value solid @border-regular-control;
- border-radius: 2px;
- float: right;
- padding: 14px 20px;
-}
-
// Skeleton of document
.doc-placeholder {
diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less
index 3a2b4daa6..884630bfb 100644
--- a/apps/presentationeditor/main/resources/less/rightmenu.less
+++ b/apps/presentationeditor/main/resources/less/rightmenu.less
@@ -6,6 +6,316 @@
label.input-label{
vertical-align: baseline;
}
+
+ id-slide-settings {
+ #slide-spin-transparency {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .slide-direction {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .angle-label {
+ margin-right: 5px;
+ margin-bottom: 3px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ .gradient-position {
+ margin-left: 10px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+
+ #id-slide-menu-direction {
+ .dataview .item {
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ #slide-texture-img-box {
+ background: @background-normal;
+ border: @scaled-one-px-value solid @border-regular-control;
+ border-radius: 2px;
+ float: right;
+ padding: 14px 20px;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #slide-foreground-color-btn, #slide-background-color-btn {
+ display: inline-block;
+ float:right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ id-shape-settings {
+ #shape-spin-transparency {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #shape-button-270, #shape-button-fliph {
+ display: inline-block;
+ margin-right: 4px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 4px;
+ }
+ }
+
+ #shape-button-90, #shape-button-flipv {
+ display: inline-block;
+ }
+
+ #shape-btn-change {
+ display: inline-block;
+ float:right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .grad-direction {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+
+ #id-shape-menu-direction {
+ .dataview .item {
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+ }
+
+ .angle-label {
+ margin-right: 5px;
+ margin-bottom: 3px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ .gradient-position {
+ margin-left: 10px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+
+ .texture-img {
+ padding: 14px 20px;
+ border: 1px solid #AFAFAF;
+ border-radius: 2px;
+ background: #ffffff;
+ float:right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #shape-foreground-color-btn, #shape-background-color-btn {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ id-image-settings {
+ #image-button-270, #image-button-fliph {
+ display: inline-block;
+ margin-right: 4px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 4px;
+ }
+ }
+
+ #image-button-90, #image-button-flipv {
+ display: inline-block;
+ }
+ }
+
+ id-table-settings {
+ #id-table-menu-template {
+ margin: 5px 5px 5px 10px;
+
+ .rtl & {
+ margin: 5px 10px 5px 5px;
+ }
+
+ .group-description {
+ padding: 3px 0 3px 10px;
+ .font-weight-bold();
+
+ .rtl & {
+ padding: 3px 10px 3px 0;
+ text-align: right;
+ }
+ }
+
+ .group-items-container {
+ .item {
+ &:hover {
+ .box-shadow(0 0 0 2px @border-preview-hover-ie) !important;
+ .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover) !important;
+ }
+
+ &.selected {
+ .box-shadow(0 0 0 2px @border-preview-select-ie) !important;
+ .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select) !important;
+ }
+ }
+ }
+ }
+
+ .border-color {
+ display: inline-block;
+ float: right;
+ vertical-align: middle;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .color-label {
+ margin-right: 5px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ #table-spin-cell-height, #table-spin-cell-width {
+ display: inline-block;
+ float:right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ id-textart-settings {
+ #textart-spin-transparency {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .grad-direction {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+
+ #id-textart-menu-direction {
+ .dataview .item {
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+ }
+
+ .angle-label {
+ margin-right: 5px;
+ margin-bottom: 3px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ .gradient-position {
+ margin-left: 10px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+
+ #textart-button-from-url {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .texture-img {
+ padding: 14px 20px;
+ border: 1px solid #AFAFAF;
+ border-radius: 2px;
+ background: #ffffff;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #textart-foreground-color-btn, #textart-background-color-btn {
+ display: inline-block;
+ float:right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
}
.item-wrap {
@@ -101,26 +411,4 @@
}
}
}
-}
-
-#id-table-menu-template {
- .group-description {
- padding: 3px 0 3px 10px;
- .font-weight-bold();
-
- }
-
- .group-items-container {
- .item {
- &:hover {
- .box-shadow(0 0 0 2px @border-preview-hover-ie) !important;
- .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover) !important;
- }
-
- &.selected {
- .box-shadow(0 0 0 2px @border-preview-select-ie) !important;
- .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select) !important;
- }
- }
- }
}
\ No newline at end of file
|