mirror of
https://github.com/nasa/openmct.git
synced 2025-03-10 22:43:55 +00:00
Merge branch 'master' into open933
This commit is contained in:
Henry
commit
9a06325533
21
index.html
21
index.html
@ -19,16 +19,15 @@
|
|||||||
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.
|
||||||
-->
|
-->
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html>
|
<html lang="en">
|
||||||
<head lang="en">
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
||||||
<title></title>
|
<title></title>
|
||||||
<script type="text/javascript"
|
<script src="bower_components/requirejs/require.js">
|
||||||
src="bower_components/requirejs/require.js">
|
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
require(['main'], function (mct) {
|
require(['main'], function (mct) {
|
||||||
require([
|
require([
|
||||||
'./example/imagery/bundle',
|
'./example/imagery/bundle',
|
||||||
@ -39,10 +38,10 @@
|
|||||||
</script>
|
</script>
|
||||||
<link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
|
<link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
|
||||||
<link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
|
<link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
|
||||||
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
|
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
|
||||||
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
|
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
|
||||||
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
|
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
|
||||||
<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
|
<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
|
||||||
</head>
|
</head>
|
||||||
<body class="user-environ">
|
<body class="user-environ">
|
||||||
<div class="l-splash-holder s-splash-holder">
|
<div class="l-splash-holder s-splash-holder">
|
||||||
|
|||||||
@ -40,7 +40,7 @@
|
|||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"moment": "^2.11.1",
|
"moment": "^2.11.1",
|
||||||
"node-bourbon": "^4.2.3",
|
"node-bourbon": "^4.2.3",
|
||||||
"phantomjs-prebuilt": "^2.1.0",
|
"phantomjs-prebuilt": "2.1.11 || >2.1.12 <3.0.0",
|
||||||
"requirejs": "2.1.x",
|
"requirejs": "2.1.x",
|
||||||
"split": "^1.0.0"
|
"split": "^1.0.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -387,7 +387,7 @@ define([
|
|||||||
"constants": [
|
"constants": [
|
||||||
{
|
{
|
||||||
"key": "editModeBlacklist",
|
"key": "editModeBlacklist",
|
||||||
"value": ["copy", "follow", "window", "link", "locate"]
|
"value": ["copy", "follow", "link", "locate"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "nonEditContextBlacklist",
|
"key": "nonEditContextBlacklist",
|
||||||
|
|||||||
@ -126,6 +126,7 @@ $menuLineH: 1.5rem;
|
|||||||
$menuLineHPx: 24px;
|
$menuLineHPx: 24px;
|
||||||
$btnStdH: 25px;
|
$btnStdH: 25px;
|
||||||
$btnToolbarH: $btnStdH;
|
$btnToolbarH: $btnStdH;
|
||||||
|
$controlBarH: $btnStdH;
|
||||||
$btnFrameH: 16px;
|
$btnFrameH: 16px;
|
||||||
|
|
||||||
/************************** PATHS */
|
/************************** PATHS */
|
||||||
|
|||||||
@ -1,8 +1,11 @@
|
|||||||
/* Styles for sub-dividing views generically */
|
/* Styles for sub-dividing views generically */
|
||||||
|
.l-control-bar {
|
||||||
|
// Element that can be placed above l-view-section, holds controls, buttons, etc.
|
||||||
|
height: $controlBarH;
|
||||||
|
}
|
||||||
|
|
||||||
.l-view-section {
|
.l-view-section {
|
||||||
@include absPosDefault(0);
|
@include absPosDefault(0);
|
||||||
font-size: 0.8rem;
|
|
||||||
h2 {
|
h2 {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
margin-bottom: $interiorMargin;
|
margin-bottom: $interiorMargin;
|
||||||
@ -16,3 +19,35 @@
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.has-control-bar {
|
||||||
|
.l-view-section {
|
||||||
|
top: $controlBarH + $interiorMargin;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.child-frame {
|
||||||
|
.has-control-bar {
|
||||||
|
$btnExportH: $btnFrameH;
|
||||||
|
.l-control-bar {
|
||||||
|
@include trans-prop-nice(opacity, $dur: 50ms);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
.l-view-section {
|
||||||
|
@include trans-prop-nice(top, $dur: 150ms, $delay: 50ms);
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
&:hover {
|
||||||
|
.l-control-bar {
|
||||||
|
@include trans-prop-nice(opacity, 150ms, 100ms);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
.l-view-section {
|
||||||
|
@include trans-prop-nice(top, $dur: 150ms);
|
||||||
|
top: $btnExportH + $interiorMargin;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -160,39 +160,3 @@ table {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/********************************************************** SPECIFIC TABULAR VIEWS */
|
|
||||||
.tabular-holder {
|
|
||||||
&.t-exportable {
|
|
||||||
$btnExportH: 25px;
|
|
||||||
.l-view-section {
|
|
||||||
top: $btnExportH + $interiorMargin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.child-frame {
|
|
||||||
.tabular-holder {
|
|
||||||
&.t-exportable {
|
|
||||||
$btnExportH: $btnFrameH;
|
|
||||||
.s-button.t-export {
|
|
||||||
@include trans-prop-nice(opacity, $dur: 50ms);
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
.l-view-section {
|
|
||||||
@include trans-prop-nice(top, $dur: 150ms, $delay: 50ms);
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
&:hover {
|
|
||||||
.s-button.t-export {
|
|
||||||
@include trans-prop-nice(opacity, 150ms, 100ms);
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
.l-view-section {
|
|
||||||
@include trans-prop-nice(top, $dur: 150ms);
|
|
||||||
top: $btnExportH + $interiorMargin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -4,6 +4,6 @@
|
|||||||
rows="rows"
|
rows="rows"
|
||||||
enableFilter="true"
|
enableFilter="true"
|
||||||
enableSort="true"
|
enableSort="true"
|
||||||
class="tabular-holder t-exportable">
|
class="tabular-holder has-control-bar">
|
||||||
</mct-table>
|
</mct-table>
|
||||||
</div>
|
</div>
|
||||||
@ -1,8 +1,10 @@
|
|||||||
<a class="s-button t-export icon-download labeled"
|
<div class="l-control-bar">
|
||||||
ng-click="exportAsCSV()"
|
<a class="s-button t-export icon-download labeled"
|
||||||
title="Export This View's Data">
|
ng-click="exportAsCSV()"
|
||||||
Export
|
title="Export This View's Data">
|
||||||
</a>
|
Export
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<div class="l-view-section scrolling" style="overflow: auto;" mct-resize="resize()">
|
<div class="l-view-section scrolling" style="overflow: auto;" mct-resize="resize()">
|
||||||
<table class="sizing-table">
|
<table class="sizing-table">
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
rows="rows"
|
rows="rows"
|
||||||
enableFilter="true"
|
enableFilter="true"
|
||||||
enableSort="true"
|
enableSort="true"
|
||||||
class="tabular-holder t-exportable"
|
class="tabular-holder has-control-bar"
|
||||||
auto-scroll="true">
|
auto-scroll="true">
|
||||||
</mct-table>
|
</mct-table>
|
||||||
</div>
|
</div>
|
||||||
@ -36,18 +36,18 @@
|
|||||||
ng-controller="ColorController as colors"
|
ng-controller="ColorController as colors"
|
||||||
ng-show="toggle.isActive()">
|
ng-show="toggle.isActive()">
|
||||||
<div
|
<div
|
||||||
class="l-palette-row l-option-row"
|
class="l-palette-row l-option-row"
|
||||||
ng-if="!structure.mandatory">
|
ng-if="!structure.mandatory">
|
||||||
<div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}"
|
<div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}"
|
||||||
ng-click="ngModel[field] = 'transparent'">
|
ng-click="ngModel[field] = 'transparent'">
|
||||||
</div>
|
</div>
|
||||||
<span class="l-palette-item-label">None</span>
|
<span class="l-palette-item-label">None</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="l-palette-row"
|
class="l-palette-row"
|
||||||
ng-repeat="group in colors.groups()">
|
ng-repeat="group in colors.groups()">
|
||||||
<div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'icon-check' : '' }}"
|
<div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'icon-check' : '' }}"
|
||||||
ng-repeat="color in group"
|
ng-repeat="color in group"
|
||||||
ng-style="{ background: color }"
|
ng-style="{ background: color }"
|
||||||
ng-click="ngModel[field] = color">
|
ng-click="ngModel[field] = color">
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -21,18 +21,18 @@
|
|||||||
-->
|
-->
|
||||||
<span ng-controller="CompositeController as compositeCtrl">
|
<span ng-controller="CompositeController as compositeCtrl">
|
||||||
<ng-form name="mctFormItem" ng-repeat="item in structure.items">
|
<ng-form name="mctFormItem" ng-repeat="item in structure.items">
|
||||||
<div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
|
<div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
|
||||||
<mct-control key="item.control"
|
<mct-control key="item.control"
|
||||||
ng-model="ngModel[field]"
|
ng-model="ngModel[field]"
|
||||||
ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
|
ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
|
||||||
ng-pattern="ngPattern"
|
ng-pattern="ngPattern"
|
||||||
options="item.options"
|
options="item.options"
|
||||||
structure="row"
|
structure="row"
|
||||||
field="$index">
|
field="$index">
|
||||||
</mct-control>
|
</mct-control>
|
||||||
<span class="composite-control-label">
|
<span class="composite-control-label">
|
||||||
{{item.name}}
|
{{item.name}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</ng-form>
|
</ng-form>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@ -20,31 +20,31 @@
|
|||||||
at runtime from the About dialog for additional information.
|
at runtime from the About dialog for additional information.
|
||||||
-->
|
-->
|
||||||
<form novalidate>
|
<form novalidate>
|
||||||
<div class="tool-bar btn-bar contents abs">
|
<div class="tool-bar btn-bar contents abs">
|
||||||
<span ng-repeat="section in structure.sections"
|
<span ng-repeat="section in structure.sections"
|
||||||
class="l-control-group"
|
class="l-control-group"
|
||||||
ng-if="!section.hidden"
|
ng-if="!section.hidden"
|
||||||
title="{{section.description}}">
|
title="{{section.description}}">
|
||||||
<ng-form ng-repeat="item in section.items"
|
<ng-form ng-repeat="item in section.items"
|
||||||
ng-class="{ 'input-labeled': item.name }"
|
ng-class="{ 'input-labeled': item.name }"
|
||||||
ng-hide="item.hidden"
|
ng-hide="item.hidden"
|
||||||
class="inline"
|
class="inline"
|
||||||
title="{{item.description}}"
|
title="{{item.description}}"
|
||||||
name="mctFormInner">
|
name="mctFormInner">
|
||||||
|
|
||||||
<label ng-if="item.name">
|
<label ng-if="item.name">
|
||||||
{{item.name}}:
|
{{item.name}}:
|
||||||
</label>
|
</label>
|
||||||
<mct-control key="item.control"
|
<mct-control key="item.control"
|
||||||
ng-class="{ disabled: item.disabled }"
|
ng-class="{ disabled: item.disabled }"
|
||||||
ng-model="ngModel"
|
ng-model="ngModel"
|
||||||
ng-required="item.required"
|
ng-required="item.required"
|
||||||
ng-pattern="getRegExp(item.pattern)"
|
ng-pattern="getRegExp(item.pattern)"
|
||||||
options="item.options"
|
options="item.options"
|
||||||
structure="item"
|
structure="item"
|
||||||
field="item.key">
|
field="item.key">
|
||||||
</mct-control>
|
</mct-control>
|
||||||
</ng-form>
|
</ng-form>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
Loading…
x
Reference in New Issue
Block a user