Skip to content

Commit

Permalink
Merge branch 'master' into feature/change_annotation_concept
Browse files Browse the repository at this point in the history 
+ Fix the alignment of the items in the panels
+ Fix the disable-state scenario

# Conflicts:
#	dist/css/status_panel.css.map
#	dist/editor.html
#	dist/status_ctrl.js
#	dist/status_ctrl.js.map
#	src/editor.html
#	src/status_ctrl.js
  • Loading branch information
@YehonatanVonage
YehonatanVonage committed Mar 29, 2017
2 parents 0370d63 + aee49a3 commit 67edf51
Show file tree
Hide file tree
Showing 10 changed files with 331 additions and 118 deletions.
81 changes: 61 additions & 20 deletions dist/css/status_panel.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/status_panel.css.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions dist/editor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ <h5 class="section-heading">{{ measurement.alias }}</h5>
</div>
<gf-form-switch class="gf-form"
label-class="width-12"
label="Flip card" checked="ctrl.panel.flipCard"
on-change="ctrl.onRender()"></gf-form-switch>
<div class="gf-form">
<span class="gf-form-label width-12">Flip interval</span>
<input type="text" ng-model="ctrl.panel.flipTime" class="gf-form-input max-width-12" ng-change="ctrl.onRender()">
</div>
<gf-form-switch class="gf-form"
label-class="width-12"

label="Make panel gray when no data" checked="ctrl.panel.isGrayColor"
label="Make panel gray when no data" checked="ctrl.panel.isGrayOnNoData"
on-change="ctrl.onRender()"></gf-form-switch>
</div>
Expand Down
88 changes: 52 additions & 36 deletions dist/module.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,65 @@
<strong>Error</strong>: There are multiple measurements with the same alias. Please give each measurement a unique name.
</div>

<div ng-hide="ctrl.duplicates" class="status-panel-annotation_row">
<div ng-repeat="annotation in ctrl.annotation" >
<div class="row-overflow" ng-style="{ 'max-width': ctrl.maxWidth }">
<a ng-show="annotation.url" ng-href="{{ annotation.url | interpolateTemplateVars:this }}" target="_blank">{{ annoation.alias }}</a>
<span ng-hide="annotation.url">{{ annotation.alias }}</span>
<span bs-tooltip="'{{ annotation.display_value }}'"> - {{ annotation.display_value | numberOrText}} </span>
<div class="st-card-front" ng-hide="ctrl.duplicates">
<div class="ok-text">OK</div>
<div class="warning-text">Warning</div>
<div class="fail-text">Critical</div>
<div class="no-data-text">No data</div>
<div class="disabled-text">Disabled</div>
</div>
<div class="st-card-back" ng-hide="ctrl.duplicates">

<div class="top_section">
<div class="status-panel-annotation_row" ng-if="ctrl.annotation.length > 0">
<div ng-repeat="annotation in ctrl.annotation" >
<div class="row-overflow" ng-style="{ 'max-width': ctrl.maxWidth }">
<a ng-show="annotation.url" ng-href="{{ annotation.url | interpolateTemplateVars:this }}" target="_blank">{{ annoation.alias }}</a>
<span ng-hide="annotation.url">{{ annotation.alias }}</span>
<span bs-tooltip="'{{ annotation.display_value }}'"> - {{ annotation.display_value | numberOrText}} </span>
</div>
</div>
</div>
</div>
</div>

<div ng-hide="ctrl.duplicates" class="status_name_row">
<h1>
<a ng-href="{{ 'dashboard/' + ctrl.uri | interpolateTemplateVars:this }}" target="_blank" ng-show="ctrl.uri">
{{ ctrl.panel.displayName | interpolateTemplateVars:this }}
</a>
<span ng-hide="ctrl.uri">
{{ ctrl.panel.displayName | interpolateTemplateVars:this }}
</span>
</h1>
</div>
<div class="bottom_section" ng-style="ctrl.annotation.length === 0 && { 'min-height': ctrl.minHeight }">
<div class="status_name_row">
<h1>
<a ng-href="{{ 'dashboard/' + ctrl.uri | interpolateTemplateVars:this }}" target="_blank" ng-if="ctrl.uri">
{{ ctrl.panel.displayName | interpolateTemplateVars:this }}
</a>
<span ng-hide="ctrl.uri">
{{ ctrl.panel.displayName | interpolateTemplateVars:this }}
</span>
</h1>

<div class="status_alerts_row" ng-hide="ctrl.duplicates">
<div ng-repeat="display in ctrl.display">
<a ng-show="display.url" ng-href="{{ display.url | interpolateTemplateVars:this }}" target="_blank">{{ display.alias }}</a>
<span ng-hide="display.url">{{ display.alias }}</span>
<span ng-show="display.display"> - {{ display.display_value | numberOrText }}</span>
</div>
</div>

<div ng-repeat="crit in ctrl.crit">
<a ng-show="crit.url" ng-href="{{ crit.url | interpolateTemplateVars:this }}" target="_blank">{{ crit.alias }}</a>
<span ng-hide="crit.url">{{ crit.alias }}</span>
<span ng-show="crit.display"> - {{ crit.display_value | numberOrText }}</span>
</div>
<div class="status_alerts_row">
<div ng-repeat="display in ctrl.display">
<a ng-show="display.url" ng-href="{{ display.url | interpolateTemplateVars:this }}" target="_blank">{{ display.alias }}</a>
<span ng-hide="display.url">{{ display.alias }}</span>
<span ng-show="display.display"> - {{ display.display_value | numberOrText }}</span>
</div>

<div ng-repeat="warn in ctrl.warn">
<a ng-show="warn.url" ng-href="{{ warn.url | interpolateTemplateVars:this }}" target="_blank">{{ warn.alias }}</a>
<span ng-hide="warn.url">{{ warn.alias }}</span>
<span ng-show="warn.display"> - {{ warn.display_value | numberOrText }}</span>
</div>
<div ng-repeat="crit in ctrl.crit">
<a ng-show="crit.url" ng-href="{{ crit.url | interpolateTemplateVars:this }}" target="_blank">{{ crit.alias }}</a>
<span ng-hide="crit.url">{{ crit.alias }}</span>
<span ng-show="crit.display"> - {{ crit.display_value | numberOrText }}</span>
</div>

<div ng-repeat="warn in ctrl.warn">
<a ng-show="warn.url" ng-href="{{ warn.url | interpolateTemplateVars:this }}" target="_blank">{{ warn.alias }}</a>
<span ng-hide="warn.url">{{ warn.alias }}</span>
<span ng-show="warn.display"> - {{ warn.display_value | numberOrText }}</span>
</div>

<div ng-repeat="disabled in ctrl.disabled">
<a ng-show="disabled.url" ng-href="{{ disabled.url | interpolateTemplateVars:this }}" target="_blank">{{ disabled.alias }}</a>
<span ng-hide="disabled.url">{{ disabled.alias }}</span>
<div ng-repeat="disabled in ctrl.disabled">
<a ng-show="disabled.url" ng-href="{{ disabled.url | interpolateTemplateVars:this }}" target="_blank">{{ disabled.alias }}</a>
<span ng-hide="disabled.url">{{ disabled.alias }}</span>
</div>
</div>
</div>

</div>
</div>
30 changes: 29 additions & 1 deletion dist/status_ctrl.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/status_ctrl.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 67edf51

Please sign in to comment.