Merge branch 'master' into open933

nasa · Sep 12, 2016 · 9a06325 · 9a06325
2 parents e639e05 + 4c6ca58
commit 9a06325
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 100 deletions.
diff --git a/index.html b/index.html
@@ -19,16 +19,15 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<!DOCTYPE html>
-<html>
-<head lang="en">
-    <meta charset="UTF-8">
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title></title>
-    <script type="text/javascript"
-            src="bower_components/requirejs/require.js">
+    <script src="bower_components/requirejs/require.js">
     </script>
-    <script type="text/javascript">
+    <script>
         require(['main'], function (mct) {
             require([
                 './example/imagery/bundle',
@@ -39,10 +38,10 @@
     </script>
     <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="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-16x16.png" sizes="16x16">
-	<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
+    <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-16x16.png" sizes="16x16">
+    <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
 </head>
 <body class="user-environ">
     <div class="l-splash-holder s-splash-holder">

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "mkdirp": "^0.5.1",
     "moment": "^2.11.1",
     "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",
     "split": "^1.0.0"
   },

diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js
@@ -387,7 +387,7 @@ define([
             "constants": [
                 {
                     "key": "editModeBlacklist",
-                    "value": ["copy", "follow", "window", "link", "locate"]
+                    "value": ["copy", "follow", "link", "locate"]
                 },
                 {
                     "key": "nonEditContextBlacklist",

diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss
@@ -126,6 +126,7 @@ $menuLineH: 1.5rem;
 $menuLineHPx: 24px;
 $btnStdH: 25px;
 $btnToolbarH: $btnStdH;
+$controlBarH: $btnStdH;
 $btnFrameH: 16px;
 
 /************************** PATHS */

diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss
@@ -1,8 +1,11 @@
 /* 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 {
 	@include absPosDefault(0);
-	font-size: 0.8rem;
 	h2 {
 		color: #fff;
 		margin-bottom: $interiorMargin;
@@ -15,4 +18,36 @@
 	.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;
+            }
+        }
+    }
+
 }
diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss
@@ -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;
-                }
-            }
-        }
-    }
-}
diff --git a/platform/features/table/res/templates/historical-table.html b/platform/features/table/res/templates/historical-table.html
@@ -4,6 +4,6 @@
         rows="rows"
         enableFilter="true"
         enableSort="true"
-        class="tabular-holder t-exportable">
+        class="tabular-holder has-control-bar">
     </mct-table>
 </div>
diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html
@@ -1,8 +1,10 @@
-<a class="s-button t-export icon-download labeled"
-   ng-click="exportAsCSV()"
-   title="Export This View's Data">
-    Export
-</a>
+<div class="l-control-bar">
+    <a class="s-button t-export icon-download labeled"
+       ng-click="exportAsCSV()"
+       title="Export This View's Data">
+        Export
+    </a>
+</div>
 <div class="l-view-section scrolling" style="overflow: auto;" mct-resize="resize()">
     <table class="sizing-table">
         <tbody>

diff --git a/platform/features/table/res/templates/rt-table.html b/platform/features/table/res/templates/rt-table.html
@@ -4,7 +4,7 @@
         rows="rows"
         enableFilter="true"
         enableSort="true"
-        class="tabular-holder t-exportable"
+        class="tabular-holder has-control-bar"
         auto-scroll="true">
     </mct-table>
 </div>
diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html
@@ -36,18 +36,18 @@
         ng-controller="ColorController as colors"
         ng-show="toggle.isActive()">
         <div
-	        class="l-palette-row l-option-row"
-	        ng-if="!structure.mandatory">
+            class="l-palette-row l-option-row"
+            ng-if="!structure.mandatory">
             <div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}"
                 ng-click="ngModel[field] = 'transparent'">
             </div>
             <span class="l-palette-item-label">None</span>
         </div>
         <div
-	        class="l-palette-row"
+            class="l-palette-row"
             ng-repeat="group in colors.groups()">
             <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-click="ngModel[field] = color">
             </div>

diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html
@@ -21,18 +21,18 @@
 -->
 <span ng-controller="CompositeController as compositeCtrl">
     <ng-form name="mctFormItem" ng-repeat="item in structure.items">
-	    <div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
-	        <mct-control key="item.control"
-	                     ng-model="ngModel[field]"
-	                     ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
-	                     ng-pattern="ngPattern"
-	                     options="item.options"
-	                     structure="row"
-	                     field="$index">
-	        </mct-control>
-	        <span class="composite-control-label">
-	            {{item.name}}
-	        </span>
-	    </div>
+        <div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
+            <mct-control key="item.control"
+                         ng-model="ngModel[field]"
+                         ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
+                         ng-pattern="ngPattern"
+                         options="item.options"
+                         structure="row"
+                         field="$index">
+            </mct-control>
+            <span class="composite-control-label">
+                {{item.name}}
+            </span>
+        </div>
     </ng-form>
 </span>
diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html
@@ -20,31 +20,31 @@
  at runtime from the About dialog for additional information.
 -->
 <form novalidate>
-	<div class="tool-bar btn-bar contents abs">
-	    <span ng-repeat="section in structure.sections"
-	          class="l-control-group"
-	          ng-if="!section.hidden"
-	          title="{{section.description}}">
-	        <ng-form ng-repeat="item in section.items"
-	                 ng-class="{ 'input-labeled': item.name }"
-	                 ng-hide="item.hidden"
-	                 class="inline"
-	                 title="{{item.description}}"
-	                 name="mctFormInner">
+    <div class="tool-bar btn-bar contents abs">
+        <span ng-repeat="section in structure.sections"
+              class="l-control-group"
+              ng-if="!section.hidden"
+              title="{{section.description}}">
+            <ng-form ng-repeat="item in section.items"
+                     ng-class="{ 'input-labeled': item.name }"
+                     ng-hide="item.hidden"
+                     class="inline"
+                     title="{{item.description}}"
+                     name="mctFormInner">
 
-	            <label ng-if="item.name">
-	                {{item.name}}:
-	            </label>
-	            <mct-control key="item.control"
-	                         ng-class="{ disabled: item.disabled }"
-	                         ng-model="ngModel"
-	                         ng-required="item.required"
-	                         ng-pattern="getRegExp(item.pattern)"
-	                         options="item.options"
-	                         structure="item"
-	                         field="item.key">
-	            </mct-control>
-	        </ng-form>
-	    </span>
-	</div>
+                <label ng-if="item.name">
+                    {{item.name}}:
+                </label>
+                <mct-control key="item.control"
+                             ng-class="{ disabled: item.disabled }"
+                             ng-model="ngModel"
+                             ng-required="item.required"
+                             ng-pattern="getRegExp(item.pattern)"
+                             options="item.options"
+                             structure="item"
+                             field="item.key">
+                </mct-control>
+            </ng-form>
+        </span>
+    </div>
 </form>