poller.php: Test for moving to archive, vier-style: notifications fixed

diff --git a/include/poller.php b/include/poller.php
index 9cf12ed9cdfc2993c7acb3b250251800a54dc3d1..d79079fcda1d2d886e205303d030e6ba529df6a1 100755 (executable)
--- a/include/poller.php
+++ b/include/poller.php
@@ -454,6 +454,11 @@ function poller_run($argv, $argc){
                                                                                intval($r[0]['id'])
                                                                        );
                                                                }
+                                                               //logger("Mail: Deleting ".$msg_uid);
+                                                               //imap_delete($mbox, $msg_uid, FT_UID);
+                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                               logger("Mail: Moving ".$msg_uid);
+                                                               imap_mail_move($mbox, $msg_uid, "Archiv", FT_UID);
                                                                continue;
                                                        }
 
@@ -515,6 +520,11 @@ function poller_run($argv, $argc){
                                                        q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
                                                                intval($stored_item)
                                                        );
+                                                       //logger("Mail: Deleting ".$msg_uid);
+                                                       //imap_delete($mbox, $msg_uid, FT_UID);
+                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                       logger("Mail: Moving ".$msg_uid);
+                                                       imap_mail_move($mbox, $msg_uid, "Archiv", FT_UID);
                                                }
                                        }
 
@@ -523,7 +533,7 @@ function poller_run($argv, $argc){
                        }
                        elseif($contact['network'] === NETWORK_FACEBOOK) {
                                // This is picked up by the Facebook plugin on a cron hook.
-                               // Ignored here.                        
+                               // Ignored here.
                        }
 
                        if($xml) {

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 0268c64d8856c79846900ad4ce63be6153d1b023..61a3b06ab46a70832ea9f913d2ed866a62a2e080 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -496,7 +496,7 @@ nav ul {
 nav ul li {
   list-style: none;
   margin: 0px;
-  padding: 0px;
+  padding: 1px 1px 3px 1px;
   float: left;
 }
 nav ul li .menu-popup {
@@ -571,6 +571,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 nav #nav-apps-link.selected {
   background-color: #364e59;
 }
+
+#nav-notifications-mark-all {
+       padding: 1px 1px 2px 1px;
+       border-bottom: 1px solid #364E59;
+       margin: 0px 0px 2px 26px;
+}
+
+#nav-notifications-see-all {
+       padding: 1px;
+       margin: 0px 0px 2px 26px;
+}
+
 ul.menu-popup {
   position: absolute;
   display: none;
@@ -587,9 +599,9 @@ ul.menu-popup {
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 ul.menu-popup a {
-  display: block;
+  /* display: block; */
   color: #2d2d2d;
-  padding: 5px 10px;
+  /* padding: 5px 10px; */
   text-decoration: none;
 }
 ul.menu-popup a:hover {
@@ -656,6 +668,13 @@ ul.menu-popup .empty {
   color: #9eabb0;
   display: block;
 }
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
 /* aside */
 aside {
   display: table-cell;