Merge 5.25

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

diff --git a/ang/crmStatusPage/StatusPage.html b/ang/crmStatusPage/StatusPage.html
index 9e5de8d4da6bbe604c16041ac6de5815a734d7a1..bf252cbeb1bf9e0cfca82352c580b75104080c81 100644 (file)
--- a/ang/crmStatusPage/StatusPage.html
+++ b/ang/crmStatusPage/StatusPage.html
@@ -1,42 +1,39 @@
-<div class="crm-container">
-  <div crm-ui-debug="statuses"></div>
+<div crm-ui-debug="statuses"></div>
 
-  <form name="crm-system-status" crm-ui-id-scope>
+<h1 crm-page-title crm-document-title="ts('CiviCRM System Status') + ' (' + countVisible(1) + ')'">
+  {{:: ts('CiviCRM System Status') }}
+</h1>
 
-    <div>
-      <h1>{{ts('Status Messages')}}</h1>
-    </div>
-
-    <div id="crm-status-list" crm-ui-tab-set>
-      <div
-        ng-repeat="tab in [{is_visible: 1, icon: 'fa-bell'}, {is_visible: 0, icon: 'fa-bell-slash-o'}]"
-        crm-ui-tab
-        id="tab-status-visible-{{tab.is_visible}}"
-        count="{{_.where(statuses, {is_visible: tab.is_visible}).length}}"
-        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>
-          </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="alert(status.help, status.title, 'info');"
-              href="javascript:void(0)"
-              >
-            </a>
-          </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>
+      </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 ng-if="status.actions" class="crm-status-item-actions">
+          <button ng-repeat="action in status.actions" ng-click="doAction(action)">{{ action.title }}</button>
         </div>
-
       </div>
     </div>
-
-  </form>
-
+  </div>
 </div>