Sfoglia il codice sorgente

delete old notifications

Serghey Rodin 9 anni fa
parent
commit
2788426567

+ 1 - 1
web/css/styles.min.css

@@ -813,7 +813,7 @@ input[type="checkbox"] {
   background-color: #c4da5e;
 }
 .l-profile__notifications.updates {
-  background-position: -202px -157px;
+  background-position: -202px -135px;
 }
 
 .notification-container {

+ 0 - 1
web/delete/notification/index.php

@@ -21,7 +21,6 @@ if($_GET['delete'] == 1){
 } else {
     $v_username = escapeshellarg($user);
     $v_id = escapeshellarg((int)$_GET['notification_id']);
-    echo VESTA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id;
     exec (VESTA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);

+ 15 - 0
web/inc/main.php

@@ -105,6 +105,21 @@ function top_panel($user, $TAB) {
     }
     $panel = json_decode(implode('', $output), true);
     unset($output);
+
+
+    // getting notifications 
+    $command = VESTA_CMD."v-list-user-notifications '".$user."' 'json'";
+    exec ($command, $output, $return_var);
+    $notifications = json_decode(implode('', $output), true);
+    foreach($notifications as $message){
+        if($message['ACK'] == 'no'){
+            $panel[$user]['NOTIFICATIONS'] = 'yes';
+            break;
+        }
+    }
+    unset($output);
+    
+
     if ( $user == 'admin' ) {
         include(dirname(__FILE__).'/../templates/admin/panel.html');
     } else {

+ 1 - 1
web/templates/admin/panel.html

@@ -23,7 +23,7 @@
       </div>
       <!-- /.l-menu -->
       <div class="l-profile noselect">
-        <a class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo "updates"; ?>">&nbsp;</a>
+        <a class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>">&nbsp;</a>
         <a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
         <a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> </a>
       </div>