瀏覽代碼

[Web] Merge same notification types

andryyy 5 年之前
父節點
當前提交
ccc56c54a9
共有 3 個文件被更改,包括 10 次插入2 次删除
  1. 5 0
      data/web/css/build/008-mailcow.css
  2. 4 1
      data/web/inc/footer.inc.php
  3. 1 1
      data/web/inc/functions.inc.php

+ 5 - 0
data/web/css/build/008-mailcow.css

@@ -182,3 +182,8 @@ nav .glyphicon {
   padding: 15px 0px 15px 15px;
   padding: 15px 0px 15px 15px;
   font-weight: bold;
   font-weight: bold;
 }
 }
+.alert-hr {
+  margin:3px 0px;
+  border-bottom:1px solid #f5f5f5!important;
+  opacity: 0.3;
+}

+ 4 - 1
data/web/inc/footer.inc.php

@@ -42,8 +42,11 @@ $(document).ready(function() {
   $alertbox_log_parser = alertbox_log_parser($_SESSION);
   $alertbox_log_parser = alertbox_log_parser($_SESSION);
   if (is_array($alertbox_log_parser)) {
   if (is_array($alertbox_log_parser)) {
     foreach($alertbox_log_parser as $log) {
     foreach($alertbox_log_parser as $log) {
+      $alerts[$log['type']][] = $log['msg'];
+    }
+    foreach($alerts as $alert_type => $alert_msg) {
   ?>
   ?>
-  mailcow_alert_box(<?=$log['msg'];?>, <?=$log['type'];?>);
+  mailcow_alert_box(<?=json_encode(implode('<hr class="alert-hr">', $alert_msg));?>, <?=$alert_type;?>);
   <?php
   <?php
     }
     }
   unset($_SESSION['return']);
   unset($_SESSION['return']);

+ 1 - 1
data/web/inc/functions.inc.php

@@ -436,7 +436,7 @@ function alertbox_log_parser($_data){
       else {
       else {
         $msg = $return['msg'];
         $msg = $return['msg'];
       }
       }
-      $log_array[] = array('msg' => json_encode($msg), 'type' => json_encode($type));
+      $log_array[] = array('msg' => $msg, 'type' => json_encode($type));
     }
     }
     if (!empty($log_array)) { 
     if (!empty($log_array)) { 
       return $log_array;
       return $log_array;