alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'open-master' into open1223

Browse Source 
Merge in latest from master branch into topic branch for
limits, WTD-1223.

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/plots.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	platform/commonUI/general/res/sass/plots/_plots-main.scss
	platform/features/scrolling/res/templates/scrolling.html
This commit is contained in:
Victor Woeltjen
2015-06-08 10:23:36 -07:00
parent 88f938b1b6 3a36fda8ab
commit f4adc6a889
25 changed files with 2672 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
platform/features/scrolling/res/templates/scrolling.html
View File

@@ -20,43 +20,31 @@
at runtime from the About dialog for additional information.
-->
<div class="w1" ng-controller="TelemetryController as telemetry">
<!-- Dynamically set height based on number of rows desired. In current CSS, each row occupies 18px -->
<div class="w2"
ng-style="{ height: rows.length * 18 + 'px' }"
ng-controller="ScrollingListController">
<div class="tabular">
<div class="tr header">
<!-- Enable sorting by binding click handlers to the <em> element in each <th>. Note that CSS classes must be added dynamically to the current <th> that is sorting. For example, if sorting by ID: <div class="th sort asc"> or <div class="th sort desc">. -->
<div class="th" ng-repeat="header in headers">
<em>{{header}}</em>{{header}}
</div>
</div>
<!-- ng-class is temporarily hard-coded in next element -->
<div
class="tr"
ng-repeat="row in rows track by $index"
ng-class="{ 's-stale': $index%3==0 }"
>
<!-- ng-class is temporarily hard-coded in next element -->
<div
class="td"
ng-class="{ 's-cell-type-value': $index > 1 }"
ng-repeat="cell in row track by $index"
>
<!-- ng-class is temporarily hard-coded in next element -->
<span
class="l-cell-contents"
ng-class="cell.cssClass"
>
{{cell}}
</span>
</div>
</div>
</div>
</div>
<div class="w2"
ng-controller="ScrollingListController">
<!-- To add filtering, add class 'filterable' to <table> and uncomment 2nd <tr> in <thead> -->
<table class="tabular">
<thead>
<tr>
<th ng-repeat="header in headers">
{{header}}
</th>
</tr>
<!--tr>
<th ng-repeat="header in headers">
<input type="text" />
</th>
</tr-->
</thead>
<tbody>
<tr ng-repeat="row in rows">
<td ng-repeat="cell in row">
{{cell}}
</td>
</tr>
</tbody>
</table>
</div>
</div>