Merge 5.25

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

diff --git a/ang/crmStatusPage/StatusPage.html b/ang/crmStatusPage/StatusPage.html
index 95fb62daaf7dd004d1cbdb9ace5c39e0518a240d..bf252cbeb1bf9e0cfca82352c580b75104080c81 100644 (file)
--- a/ang/crmStatusPage/StatusPage.html
+++ b/ang/crmStatusPage/StatusPage.html
@@ -1,7 +1,7 @@
 <div crm-ui-debug="statuses"></div>
 
 <h1 crm-page-title crm-document-title="ts('CiviCRM System Status') + ' (' + countVisible(1) + ')'">
-  {{ts('CiviCRM System Status')}}
+  {{:: ts('CiviCRM System Status') }}
 </h1>
 
 <div id="crm-status-list" crm-ui-tab-set>
@@ -17,16 +17,22 @@
         <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="alert(status.help, status.title, 'info');"
+          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>
   </div>