Merge pull request #7423 from eileenmcnaughton/CRM-17691

[civicrm-core.git] / ang / crmStatusPage / StatusPage.html

diff --git a/ang/crmStatusPage/StatusPage.html b/ang/crmStatusPage/StatusPage.html
index 327cc625b4c0ead43072f7d2cbdd528b5311e9cc..60d6172656a2a3942148691a370eb31dd40f44aa 100644 (file)
--- a/ang/crmStatusPage/StatusPage.html
+++ b/ang/crmStatusPage/StatusPage.html
@@ -1,37 +1,36 @@
-<div class="crm-container">
-  <div crm-ui-debug="statuses"></div>
-  <div crm-ui-debug="preferences"></div>
+<div crm-ui-debug="statuses"></div>
 
-  <form name="myForm" crm-ui-id-scope>
+<h1 crm-page-title crm-document-title="ts('CiviCRM System Status') + ' (' + countVisible(1) + ')'">
+  {{ts('CiviCRM System Status')}}
+</h1>
 
-    <div class="help">
-      <p>{{ts('Help messages will be displayed here')}}</p>
-    </div>
-
-    <div>
-      <h1>Status Page</h1><br />
-      <button ng-if="(path === '/status/hushed')" ng-click="navigator.redirect('#/status')">Return home</button>
-      <button ng-if="(path === '/status')" ng-click="navigator.redirect('#/status/hushed')">Show snoozed and hushed</button>
-    </div>
-    <div id="crm-status-list" ng-repeat="status in statuses.values track by status.name" >
-      <h3 class="crm-severity-{{status.severity}}">{{status.title}}
-        <span class="status-snooze-options" ng-show="status.snoozeOptions.show" style="display: inline-block">
-          <div crm-snooze-options style="display: inline"></div>
-        </span>
-          <a  ng-if="(path === '/status')"  ng-click="showSnoozeOptions(status)" ng-show="!status.snoozeOptions.show" class="crm-hover-button" crm-icon="fa-clock-o" title="{{ts('Snooze')}}"></a>
-          <a ng-click="showSnoozeOptions(status)" ng-show="status.snoozeOptions.show" class="crm-hover-button" crm-icon="fa-times" style="display: inline" title="{{ts('Close')}}"></a>
-          <a ng-if="(path === '/status')" ng-click="hush(status.name, status.severity)" class="crm-hover-button" crm-icon="fa-bell-slash-o" title="{{ts('Hush')}}"></a>
-          <a ng-if="(path === '/status/hushed')" ng-click="unhush(status.name)" class="crm-hover-button" crm-icon="fa-bell-o" title="{{ts('Unhush And Unsnooze')}}"></a>
-      </h3>
-      <h4>
-        <div class="crm-block">
-          <div class="crm-group">
-            <div class="crm-status-message-body" ng-bind-html="status.message | trusted"></div>
-          </div>
+<div id="crm-status-list" crm-ui-tab-set>
+  <div crm-ui-tab
+    ng-repeat="tab in [{is_visible: 1, icon: 'fa-bell'}, {is_visible: 0, icon: 'fa-bell-slash-o'}]"
+    id="tab-status-visible-{{tab.is_visible}}"
+    count="{{countVisible(tab.is_visible)}}"
+    crm-title="tab.is_visible ? ts('Active') : ts('Hidden')"
+    crm-icon="{{tab.icon}}"
+    >
+    <div class="crm-status-item" ng-repeat="status in statuses | filter:{is_visible: tab.is_visible}" >
+      <h3 class="crm-severity-{{status.severity}}">
+        <i ng-if="status.icon" class="crm-i {{status.icon}}"></i>
+        {{status.title}}
+        <div statuspage-popup-menu class="hush-menu css_right"></div>
+        <div ng-if="!status.is_visible" class="hidden-until css_right">
+          ({{status.hidden_until ? ts('Hidden until %1', {1: formatDate(status.hidden_until)}) : ts('Hidden permanently')}})
         </div>
-      </h4><br/>
+      </h3>
+      <div class="crm-block crm-status-message-body">
+        <span ng-bind-html="status.message | trusted"></span>
+        <a
+          ng-if="status.help"
+          class="helpicon"
+          ng-click="help(status.title, status.help);"
+          href="javascript:void(0)"
+          >
+        </a>
+      </div>
     </div>
-
-  </form>
-
+  </div>
 </div>