[Frontend] Cleanups to Inspector config elements

open #729
In-progress!
Markup and CSS mods continued;
Config params added to PlotOptionsForm.js to
allow control-first layout per form row;
Changed titles of Inspector parts;
This commit is contained in:
Charles Hacskaylo 2016-03-10 10:31:05 -08:00
parent 318df9878d
commit bdbb045005
7 changed files with 69 additions and 59 deletions

View File

@ -86,7 +86,11 @@
.form-row { .form-row {
@include align-items(center); @include align-items(center);
border: none; border: none;
padding: 0; padding: $interiorMarginSm 0;
input[type='text'],
input[type='search'] {
width: 100%;
}
} }
} }
} }

View File

@ -42,7 +42,7 @@
box-sizing: border-box; box-sizing: border-box;
@include clearfix; @include clearfix;
border-top: 1px solid $colorFormLines; border-top: 1px solid $colorFormLines;
margin-top: $m; //margin-top: $m;
padding: $formTBPad 0; padding: $formTBPad 0;
position: relative; position: relative;
&.first { &.first {
@ -83,19 +83,6 @@
margin-right: 5px; margin-right: 5px;
} }
} }
.l-med input[type="text"] {
width: 200px;
}
.l-small input[type="text"] {
width: 50px;
}
.l-numeric input[type="text"] {
text-align: right;
}
.select { .select {
margin-right: $interiorMargin; margin-right: $interiorMargin;
} }
@ -124,25 +111,23 @@
} }
} }
.l-controls-first { .l-controls-first .form .form-row,
.form .form-row { .form .form-row.l-controls-first {
margin-top: $interiorMarginSm; >.label,
>.label, >.controls {
>.controls { line-height: inherit;
line-height: inherit; min-height: inherit;;
min-height: inherit;; }
} >.label {
>.label { @include flex(1 1 auto);
@include flex(1 1 auto); min-width: 0;
min-width: 0; width: auto;
width: auto; order: 2;
order: 2; }
} >.controls {
>.controls { @include flex(0 0 auto);
@include flex(0 0 auto); margin-right: $interiorMargin;
margin-right: $interiorMargin; order: 1;
order: 1;
}
} }
} }
@ -191,6 +176,18 @@ input[type="search"] {
} }
} }
.l-input-med input[type="text"] {
width: 200px !important;
}
.l-input-sm input[type="text"] {
width: 50px !important;
}
.l-numeric input[type="text"] {
text-align: right;
}
textarea { textarea {
@include nice-textarea($colorInputBg, $colorInputFg); @include nice-textarea($colorInputBg, $colorInputFg);
position: absolute; position: absolute;

View File

@ -88,7 +88,7 @@
left: 0; left: 0;
right: 0; right: 0;
overflow: auto; overflow: auto;
.field.l-med { .field.l-input-med {
input[type='text'] { input[type='text'] {
width: 100%; width: 100%;
} }

View File

@ -28,7 +28,7 @@
} }
</style> </style>
<div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part"> <div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part">
<em class="t-inspector-part-header" title="Display properties for this object">Display</em> <em class="t-inspector-part-header" title="Display properties for this object">Plot Options</em>
<mct-form <mct-form
ng-model="configuration.plot.xAxis" ng-model="configuration.plot.xAxis"
structure="xAxisForm" structure="xAxisForm"
@ -68,7 +68,7 @@
ng-model="configuration.plot.series[$index]" ng-model="configuration.plot.series[$index]"
structure="plotSeriesForm" structure="plotSeriesForm"
name="plotOptionsState" name="plotOptionsState"
class="flex-elem l-flex-row l-controls-first no-validate"> class="flex-elem l-flex-row no-validate">
</mct-form> </mct-form>
</span> </span>
</li> </li>

View File

@ -48,9 +48,9 @@ define(
'control': 'select', 'control': 'select',
'key': 'key', 'key': 'key',
'options': [ 'options': [
{'name':'scet', 'value': 'scet'}, {'name':'SCET', 'value': 'scet'},
{'name':'sclk', 'value': 'sclk'}, {'name':'SCLK', 'value': 'sclk'},
{'name':'lst', 'value': 'lst'} {'name':'LST', 'value': 'lst'}
] ]
} }
] ]
@ -64,32 +64,35 @@ define(
// itself. // itself.
'name': 'y-axis', 'name': 'y-axis',
'rows': [ 'rows': [
{
'name': 'Range',
'control': 'select',
'key': 'key',
'options': [
{'name':'EU', 'value': 'eu'},
{'name':'DN', 'value': 'dn'},
{'name':'Status', 'value': 'status'}
]
},
{ {
'name': 'Autoscale', 'name': 'Autoscale',
'control': 'checkbox', 'control': 'checkbox',
'key': 'autoscale' 'key': 'autoscale',
'layout': 'control-first'
}, },
{ {
'name': 'Min', 'name': 'Min',
'control': 'textfield', 'control': 'textfield',
'key': 'min', 'key': 'min',
'pattern': '[0-9]' 'pattern': '[0-9]',
'inputsize' : 'sm'
}, },
{ {
'name': 'Max', 'name': 'Max',
'control': 'textfield', 'control': 'textfield',
'key': 'max', 'key': 'max',
'pattern': '[0-9]' 'pattern': '[0-9]',
}, 'inputsize' : 'sm'
{
'name': 'Range',
'control': 'select',
'key': 'key',
'options': [
{'name':'eu', 'value': 'eu'},
{'name':'dn', 'value': 'dn'},
{'name':'status', 'value': 'status'}
]
} }
] ]
}] }]
@ -110,7 +113,8 @@ define(
{ {
'name': 'Markers', 'name': 'Markers',
'control': 'checkbox', 'control': 'checkbox',
'key': 'markers' 'key': 'markers',
'layout': 'control-first'
} }
] ]
}, },
@ -120,19 +124,22 @@ define(
'name': 'No Line', 'name': 'No Line',
'control': 'radio', 'control': 'radio',
'key': 'lineType', 'key': 'lineType',
'value': 'noLine' 'value': 'noLine',
'layout': 'control-first'
}, },
{ {
'name': 'Step Line', 'name': 'Step Line',
'control': 'radio', 'control': 'radio',
'key': 'lineType', 'key': 'lineType',
'value': 'stepLine' 'value': 'stepLine',
'layout': 'control-first'
}, },
{ {
'name': 'Linear Line', 'name': 'Linear Line',
'control': 'radio', 'control': 'radio',
'key': 'lineType', 'key': 'lineType',
'value': 'linearLine' 'value': 'linearLine',
'layout': 'control-first'
} }
] ]
} }

View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div ng-controller="TableOptionsController" class="l-controls-first flex-elem grows l-inspector-part"> <div ng-controller="TableOptionsController" class="l-controls-first flex-elem grows l-inspector-part">
<em class="t-inspector-part-header" title="Display properties for this object">Display</em> <em class="t-inspector-part-header" title="Display properties for this object">Table Options</em>
<mct-form <mct-form
ng-model="configuration.table.columns" ng-model="configuration.table.columns"
structure="columnsForm" structure="columnsForm"

View File

@ -31,7 +31,9 @@
req: row.required, req: row.required,
valid: mctFormInner.$dirty && mctFormInner.$valid, valid: mctFormInner.$dirty && mctFormInner.$valid,
invalid: mctFormInner.$dirty && !mctFormInner.$valid, invalid: mctFormInner.$dirty && !mctFormInner.$valid,
first: $index < 1 first: $index < 1,
'l-controls-first': row.layout === 'control-first',
'l-input-sm': row.inputsize === 'sm'
}"> }">
<div class='label flex-elem' title="{{row.description}}"> <div class='label flex-elem' title="{{row.description}}">
{{row.name}} {{row.name}}