+

gerbil · Dec 5, 2014 · c649ccd · c649ccd
1 parent e970895
commit c649ccd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/index.html b/app/index.html
@@ -10,6 +10,7 @@
     <!-- bower:css -->
     <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <link rel="stylesheet" href="bower_components/angularjs-toaster/toaster.css" />
+    <link rel="stylesheet" href="bower_components/PACE/themes/green/pace-theme-minimal.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
@@ -48,6 +49,7 @@
 <script src="bower_components/angular-touch/angular-touch.js"></script>
 <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
 <script src="bower_components/angularjs-toaster/toaster.js"></script>
+<script src="bower_components/PACE/pace.js"></script>
 <!-- endbower -->
 <!-- endbuild -->
 

diff --git a/app/scripts/controllers/alarms.js b/app/scripts/controllers/alarms.js
@@ -50,7 +50,7 @@ angular.module('dashboardApp')
         }
 
         // Promise should be created to be deleted afterwards
-        var promise = $interval(refreshData, 500000);
+        var promise = $interval(refreshData, 25000);
 
         // Cancel interval on page changes
         $scope.$on('$destroy', function () {

diff --git a/app/styles/main.css b/app/styles/main.css
@@ -77,7 +77,6 @@ body {
 
 .progress {
     margin-bottom: 2px;
-    background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
 }
 
 .progress .bar {

diff --git a/app/views/alarms/index.html b/app/views/alarms/index.html
@@ -20,13 +20,13 @@ <h4>{{server}}</h4>
                                         </tr>
                                         </thead>
                                         <tbody>
-                                        <tr ng-repeat="alarm in serverList[server]" class="{{alarm.STATUS == 'ALARM' ? 'achtung' : ''}}">
+                                        <tr ng-repeat="alarm in serverList[server]" class="{{(alarm.STATUS == 'ALARM' && alarm.ACTIVE == 'YES') ? 'achtung' : ''}}">
                                             <td ng-click="openAlarmInfoModal('lg', server, alarm.ID)">{{alarm.CHECKNAME}}</td>
                                             <td class="text-center"><span class="glyphicon {{alarm.ACTIVE == 'YES' ? 'glyphicon-ok' : 'glyphicon-remove'}} big"></span></td>
                                             <td class="text-center"><span class="glyphicon {{alarm.STATUS == 'OK' ? 'glyphicon-ok-circle green' : 'glyphicon-remove-circle'}} big"></span></td>
                                             <td>
                                                 <div class="progress" title="{{alarm.CURVALUE}}  / {{alarm.VALLIMIT}}">
-                                                    <div class="bar {{percent > 80 ? 'danger' : ''}}" style="width: {{percent = ((alarm.CURVALUE /
+                                                    <div class="bar {{(percent > 80 && alarm.ACTIVE == 'YES') ? 'danger' : ''}}" style="width: {{percent = ((alarm.CURVALUE /
                                                      alarm.VALLIMIT) * 100)}}%;"></div>
                                                 </div>
                                             </td>