diff --git a/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template index a4988f40d..44037f331 100644 --- a/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template @@ -7,14 +7,14 @@ - +
- +
@@ -29,7 +29,7 @@ - +
diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template index af45d6434..bd32ccc50 100644 --- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template @@ -32,7 +32,7 @@ - +
diff --git a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template index 0900539cd..d8da572f2 100644 --- a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template @@ -7,14 +7,14 @@ - +
- +
@@ -30,7 +30,7 @@ - +
diff --git a/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template b/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template index bd404ed5d..ce2911922 100644 --- a/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template @@ -7,14 +7,14 @@ - +
- +
@@ -30,7 +30,7 @@ - +
diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js index 3b2f2b48f..fdf71e4f1 100644 --- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js @@ -84,7 +84,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem this.spnWidth = new Common.UI.MetricSpinner({ el: $('#chart-advanced-spin-width'), step: .1, - width: 100, + width: 85, defaultUnit : "cm", value: '3 cm', maxValue: 55.88, @@ -111,7 +111,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem this.spnHeight = new Common.UI.MetricSpinner({ el: $('#chart-advanced-spin-height'), step: .1, - width: 100, + width: 85, defaultUnit : "cm", value: '3 cm', maxValue: 55.88, @@ -179,23 +179,25 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem this.cmbFromX = new Common.UI.ComboBox({ el: $('#chart-advanced-combo-from-x'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); this.cmbFromY = new Common.UI.ComboBox({ el: $('#chart-advanced-combo-from-y'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); // Alt Text @@ -231,7 +233,8 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.inputAltTitle, this.textareaAltDescription // 0 tab + this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab + this.inputAltTitle, this.textareaAltDescription // 1 tab ]; }, @@ -242,6 +245,9 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem setTimeout(function(){ switch (index) { case 0: + me.spnWidth.focus(); + break; + case 1: me.inputAltTitle.focus(); break; } diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index 9bebcb84b..cccaa9eba 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -182,23 +182,25 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem this.cmbFromX = new Common.UI.ComboBox({ el: $('#image-advanced-combo-from-x'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); this.cmbFromY = new Common.UI.ComboBox({ el: $('#image-advanced-combo-from-y'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); // Rotation diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index 128a8a1e9..c8db5180d 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -92,7 +92,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.spnWidth = new Common.UI.MetricSpinner({ el: $('#shape-advanced-spin-width'), step: .1, - width: 100, + width: 85, defaultUnit : "cm", value: '3 cm', maxValue: 55.88, @@ -119,7 +119,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.spnHeight = new Common.UI.MetricSpinner({ el: $('#shape-advanced-spin-height'), step: .1, - width: 100, + width: 85, defaultUnit : "cm", value: '3 cm', maxValue: 55.88, @@ -187,23 +187,25 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.cmbFromX = new Common.UI.ComboBox({ el: $('#shape-advanced-combo-from-x'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); this.cmbFromY = new Common.UI.ComboBox({ el: $('#shape-advanced-combo-from-y'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); // Margins @@ -568,7 +570,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem getFocusedComponents: function() { return [ - this.spnWidth, this.spnHeight, // 0 tab + this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab this.cmbCapType, this.cmbJoinType, // 2 tab this.radioNofit, this.radioShrink, this.radioFit, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js index 2df4ed43a..6a14c31ed 100644 --- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js @@ -100,7 +100,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this.spnWidth = new Common.UI.MetricSpinner({ el: $('#tableadv-spin-width'), step: .1, - width: 100, + width: 85, defaultUnit : "cm", value: '3 cm', maxValue: 55.88, @@ -123,7 +123,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this.spnHeight = new Common.UI.MetricSpinner({ el: $('#tableadv-spin-height'), step: .1, - width: 100, + width: 85, defaultUnit : "cm", value: '3 cm', maxValue: 55.88, @@ -184,23 +184,25 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem this.cmbFromX = new Common.UI.ComboBox({ el: $('#tableadv-combo-from-x'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); this.cmbFromY = new Common.UI.ComboBox({ el: $('#tableadv-combo-from-y'), cls: 'input-group-nr', - style: "width: 100px;", - menuStyle: 'min-width: 100px;', + style: "width: 115px;", + menuStyle: 'min-width: 115px;', data: [ { value: 'left', displayValue: this.textTopLeftCorner }, { value: 'center', displayValue: this.textCenter } - ] + ], + editable: false }); this._marginsChange = function(field, newValue, oldValue, eOpts, source, property){ @@ -427,9 +429,10 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem getFocusedComponents: function() { return [ + this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab this.chCellMargins, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, - this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, // 0 tab - this.inputAltTitle, this.textareaAltDescription // 1 tab + this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, // 1 tab + this.inputAltTitle, this.textareaAltDescription // 2 tab ]; }, @@ -440,12 +443,15 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem setTimeout(function(){ switch (index) { case 0: + me.spnWidth.focus(); + break; + case 1: if (!me.spnMarginTop.isDisabled()) me.spnMarginTop.focus(); else me.spnTableMarginTop.focus(); break; - case 1: + case 2: me.inputAltTitle.focus(); break; }