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

Merge branch 'master' into open933

Browse Source
This commit is contained in:
Henry 2016-09-12 14:39:24 -07:00
commit 9a06325533
12 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
index.html
View File

@ -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',

2
package.json
View File

@ -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"
}, },

2
platform/commonUI/edit/bundle.js
View File

@ -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",

1
platform/commonUI/general/res/sass/_constants.scss
View File

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

37
platform/commonUI/general/res/sass/_views.scss
View File

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

36
platform/commonUI/general/res/sass/lists/_tabular.scss
View File

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

2
platform/features/table/res/templates/historical-table.html
View File

@ -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>

2
platform/features/table/res/templates/mct-table.html
View File

@ -1,8 +1,10 @@
<div class="l-control-bar">
<a class="s-button t-export icon-download labeled" <a class="s-button t-export icon-download labeled"
ng-click="exportAsCSV()" ng-click="exportAsCSV()"
title="Export This View's Data"> title="Export This View's Data">
Export Export
</a> </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>

2
platform/features/table/res/templates/rt-table.html
View File

@ -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>