Merge branch 'master' of github.com:nasa/openmct into open1168

2025-04-24 21:10:05 +00:00 · 2016-09-13 02:47:16 +09:00 · 2016-09-13 02:47:16 +09:00 · ea35395d7e
commit ea35395d7e
parent 24cb72e5b5 4c6ca58c95
13 changed files with 102 additions and 100 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@
 *.gzip
 *.tgz
 *.DS_Store
+*.swp

 # Compiled CSS, unless directly added
 *.sass-cache
--- 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',
--- 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"
  },
--- 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",
--- 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 */
--- 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;
@ -16,3 +19,35 @@
 		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;
+            }
+        }
+    }
+
+}
--- 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;
-                }
-            }
-        }
-    }
-}
--- 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>
--- 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"
+<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>
+    </a>
+</div>
 <div class="l-view-section scrolling" style="overflow: auto;" mct-resize="resize()">
    <table class="sizing-table">
        <tbody>
--- 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>