Merge pull request #48 from abinoam/thmail-5

Comment Notifications by Email - Threading Them

diff --git a/js/main.js b/js/main.js
index 36ef946ca09f50bdd186a9e28256dde98d510301..a5d1214cb1c5c84de6e9f0538298b978f5ca31bf 100755 (executable)
--- a/js/main.js
+++ b/js/main.js
@@ -114,7 +114,7 @@
 
                        var eNotif = $(data).find('notif')
                        notif = eNotif.attr('count');
-                       if (notif>0){
+                       if (notif>=0){
                                $("#nav-notifications-linkmenu").addClass("on");
                                nnm = $("#nav-notifications-menu");
                                
@@ -129,8 +129,8 @@
                                });
                                
                        } else {
-                               $("#nav-notifications-linkmenu").removeClass("on");
-                               $("#nav-notifications-menu").html(notifications_empty);
+                               //                              $("#nav-notifications-linkmenu").removeClass("on");
+                               //              $("#nav-notifications-menu").html(notifications_empty);
                        }
                        if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
                        $('#notify-update').html(notif);

diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index fa0ecf7b6047cfd2eeb97e778a5bcd8a2c120c7a..4675c3e5c22571f95a3e2935b2e6c14339b58331 100755 (executable)
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -48,8 +48,8 @@
                        <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
                                <span id="notify-update" class="nav-ajax-left"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
-                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
                                        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
                                        <li class="empty">$emptynotifications</li>
                                </ul>
                {{ endif }}