Merge pull request #1167 from nasa/open1166

Review and integrate generalized control-bar styling for views

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 */

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;
+            }
+        }
+    }
+
+}

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;
-                }
-            }
-        }
-    }
-}

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>

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">
-   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()">
     <table class="sizing-table">
         <tbody>

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>