ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-12 12:18:16 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #735 from nasa/open729

Browse Source 
Review and integrate open729
This commit is contained in:
Andrew Henry
2016-03-14 16:12:18 -07:00
parent dfb0a570a3 bf3b964ad2
commit 4e89ffbe07
11 changed files with 140 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

@ -60,7 +60,8 @@ var gulp = require('gulp'),
singleRun: true singleRun: true
}, },
sass: { sass: {
includePaths: bourbon.includePaths includePaths: bourbon.includePaths,
sourceComments: true
}, },
replace: { replace: {
variables: { variables: {

3
platform/commonUI/browse/res/templates/browse/object-properties.html
View File

@ -32,6 +32,7 @@
</li> </li>
<li ng-if="contextutalParents.length > 0"> <li ng-if="contextutalParents.length > 0">
<em class="t-inspector-part-header" title="The location of this linked object.">Location</em> <em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
<div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
<span class="inspector-location" <span class="inspector-location"
ng-repeat="parent in contextutalParents" ng-repeat="parent in contextutalParents"
ng-class="{ last:($index + 1) === contextualParents.length }"> ng-class="{ last:($index + 1) === contextualParents.length }">
@ -44,7 +45,7 @@
</span> </span>
</li> </li>
<li ng-if="primaryParents.length > 0"> <li ng-if="primaryParents.length > 0">
<em class="t-inspector-part-header" title="The location of the original object that this was linked from.">Original Location</em> <div class="section-header">Object's Original</div>
<span class="inspector-location" <span class="inspector-location"
ng-repeat="parent in primaryParents" ng-repeat="parent in primaryParents"
ng-class="{ last:($index + 1) === primaryParents.length }"> ng-class="{ last:($index + 1) === primaryParents.length }">

9
platform/commonUI/edit/res/templates/elements.html
View File

@ -19,16 +19,19 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div ng-controller="ElementsController"> <div ng-controller="ElementsController" class="flex-elem l-flex-col holder grows">
<mct-include key="'input-filter'" <mct-include key="'input-filter'"
class="flex-elem holder" class="flex-elem holder"
ng-model="filterBy"> ng-model="filterBy">
</mct-include> </mct-include>
<div class="current-elements abs" style="height: 100%;"> <div class="flex-elem grows vscroll">
<ul class="tree"> <ul class="tree">
<li ng-repeat="containedObject in composition | filter:searchText"> <li ng-repeat="containedObject in composition | filter:searchText">
<span class="tree-item"> <span class="tree-item">
<mct-representation key="'label'" mct-object="containedObject"> <mct-representation
class="rep-object-label"
key="'label'"
mct-object="containedObject">
</mct-representation> </mct-representation>
</span> </span>
</li> </li>

28
platform/commonUI/general/res/sass/_inspector.scss
View File

@ -61,9 +61,24 @@
.l-inspector-part { .l-inspector-part {
box-sizing: border-box; box-sizing: border-box;
padding-right: $interiorMargin; padding-right: $interiorMargin;
.form { .tree .form {
margin-left: $treeVCW + $interiorMarginLg; margin-left: $treeVCW + $interiorMarginLg;
margin-bottom: $interiorMarginLg; }
.section-header {
background: none;
color: $colorInspectorPropName;
border-radius: unset;
font-size: inherit;
padding: $interiorMarginSm 0;
}
mct-form:not(:last-child) .form {
border-bottom: 1px solid $colorInspectorSectionHeaderBg;
}
.form {
margin-bottom: $interiorMarginSm;
padding-bottom: $interiorMarginLg;
.form-section { .form-section {
margin-bottom: 0; margin-bottom: 0;
&:not(.first) { &:not(.first) {
@ -72,7 +87,14 @@
.form-row { .form-row {
@include align-items(center); @include align-items(center);
border: none; border: none;
padding: 0; padding: $interiorMarginSm 0;
.label {
min-width: 80px;
}
input[type='text'],
input[type='search'] {
width: 100%;
}
} }
} }
} }

81
platform/commonUI/general/res/sass/forms/_elems.scss
View File

@ -20,13 +20,7 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
.section-header { .section-header {
border-radius: $basicCr; text-transform: uppercase;
background: $colorFormSectionHeader;
$c: lighten($colorBodyFg, 20%);
color: $c;
font-size: 0.8em;
padding: $formTBPad $formLRPad;
text-transform: uppercase;
} }
.form { .form {
@ -37,12 +31,20 @@
margin-bottom: $interiorMarginLg * 2; margin-bottom: $interiorMarginLg * 2;
} }
.section-header {
border-radius: $basicCr;
background: $colorFormSectionHeader;
$c: lighten($colorBodyFg, 20%);
color: $c;
font-size: 0.8em;
padding: $formTBPad $formLRPad;
}
.form-row { .form-row {
$m: $interiorMargin; $m: $interiorMargin;
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;
padding: $formTBPad 0; padding: $formTBPad 0;
position: relative; position: relative;
&.first { &.first {
@ -52,9 +54,7 @@
>.label, >.label,
>.controls { >.controls {
box-sizing: border-box; box-sizing: border-box;
@include clearfix;
font-size: 0.8rem; font-size: 0.8rem;
line-height: $formInputH;
min-height: $formInputH; min-height: $formInputH;
} }
@ -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;

2
platform/commonUI/general/res/sass/overlay/_overlay.scss
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%;
} }

2
platform/commonUI/general/res/templates/object-inspector.html
View File

@ -40,7 +40,7 @@
<mct-representation <mct-representation
key="'edit-elements'" key="'edit-elements'"
mct-object="domainObject" mct-object="domainObject"
class="flex-elem holder grows vscroll current-elements"> class="flex-elem l-flex-col holder grows current-elements">
</mct-representation> </mct-representation>
</div> </div>
</div> </div>

72
platform/features/plot/res/templates/plot-options-browse.html
View File

@ -19,58 +19,52 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<style>
.l-inspect .l-inspector-part .no-margin .form {
margin-left: 0;
}
.reduced-min-width .form .form-row > .label {
min-width: 80px;
}
</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"
name="xAxisFormState" name="xAxisFormState"
class="flex-elem l-flex-row no-validate no-margin reduced-min-width"> class="flex-elem l-flex-row no-validate no-margin">
</mct-form> </mct-form>
<mct-form <mct-form
ng-model="configuration.plot.yAxis" ng-model="configuration.plot.yAxis"
structure="yAxisForm" structure="yAxisForm"
name="yAxisFormState" name="yAxisFormState"
class="flex-elem l-flex-row no-validate no-margin reduced-min-width"> class="flex-elem l-flex-row no-validate no-margin">
</mct-form> </mct-form>
<div class="section-header ng-binding ng-scope"> <div class="form">
Plot Series <div class="section-header ng-binding ng-scope">
</div> Plot Series
<ul class="first flex-elem grows vscroll"> </div>
<ul class="tree"> <ul class="first flex-elem grows vscroll">
<li ng-repeat="child in children"> <ul class="tree">
<span ng-controller="ToggleController as toggle"> <li ng-repeat="child in children">
<span ng-controller="TreeNodeController as treeNode"> <span ng-controller="ToggleController as toggle">
<span class="tree-item menus-to-left"> <span ng-controller="TreeNodeController as treeNode">
<span <span class="tree-item menus-to-left">
class='ui-symbol view-control flex-elem has-children' <span
ng-class="{ expanded: toggle.isActive() }" class='ui-symbol view-control flex-elem has-children'
ng-click="toggle.toggle(); treeNode.trackExpansion()"> ng-class="{ expanded: toggle.isActive() }"
ng-click="toggle.toggle(); treeNode.trackExpansion()">
</span>
<mct-representation
class="rep-object-label"
key="'label'"
mct-object="child">
</mct-representation>
</span> </span>
<mct-representation
class="rep-object-label"
key="'label'"
mct-object="child">
</mct-representation>
</span> </span>
<mct-form
ng-class="{hidden: !toggle.isActive()}"
ng-model="configuration.plot.series[$index]"
structure="plotSeriesForm"
name="plotOptionsState"
class="flex-elem l-flex-row no-validate">
</mct-form>
</span> </span>
<mct-form </li>
ng-class="{hidden: !toggle.isActive()}" </ul>
ng-model="configuration.plot.series[$index]"
structure="plotSeriesForm"
name="plotOptionsState"
class="flex-elem l-flex-row l-controls-first no-validate">
</mct-form>
</span>
</li>
</ul> </ul>
</ul> </div>
</div> </div>

44
platform/features/plot/src/PlotOptionsForm.js
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,6 +64,16 @@ 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',
@ -73,23 +83,15 @@ define(
'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 +112,8 @@ define(
{ {
'name': 'Markers', 'name': 'Markers',
'control': 'checkbox', 'control': 'checkbox',
'key': 'markers' 'key': 'markers',
'layout': 'control-first'
} }
] ]
}, },
@ -120,19 +123,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'
} }
] ]
} }

6
platform/features/table/res/templates/table-options-edit.html
View File

@ -19,12 +19,12 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div ng-controller="TableOptionsController" class="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"
name="columnsFormState" name="columnsFormState"
class="flex-elem l-flex-row no-validate no-margin reduced-min-width"> class="flex-elem l-flex-row no-validate no-margin">
</mct-form> </mct-form>
</div> </div>

4
platform/forms/res/templates/form.html
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}}