- fixed issue with mark all read button for notifications and listeners on delete buttons

- hide mark all read if notification inbox is empty

rhodecode/templates/admin/notifications/notifications.html

@@ -1,45 +1,53 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('My Notifications')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('My Notifications')}
 </%def>
 
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}       
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
             </li>          
         </ul>            
     </div>
+    %if c.notifications:
       <div style="padding:10px 15px;text-align: right">
       <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
-  </div>
+      </div>
+    %endif
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
-var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
+var url_del = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 YUE.on(YUQ('.delete-notification'),'click',function(e){
  var notification_id = e.currentTarget.id;
- deleteNotification(url,notification_id)
+ deleteNotification(url_del,notification_id)
 })
  YUE.on('mark_all_read','click',function(e){
 	    var url = "${h.url('notifications_mark_all_read')}";
-	    ypjax(url,'notification_data',function(){YUD.get('notification_counter').innerHTML=0});
+	    ypjax(url,'notification_data',function(){
+	    	YUD.get('notification_counter').innerHTML=0;
+	    	YUE.on(YUQ('.delete-notification'),'click',function(e){
+	    		 var notification_id = e.currentTarget.id;
+	    		 deleteNotification(url_del,notification_id)
+	    	})	    	
+	    });
  })
 </script>
 </%def>  

rhodecode/templates/admin/notifications/notifications_data.html

@@ -1,28 +1,28 b''
 
-% if c.notifications:
+%if c.notifications:
 <%
 unread = lambda n:{False:'unread'}.get(n)
 %>
 <div class="table">
   <div class="notification-list">
   %for notification in c.notifications:
     <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">
       <div class="notification-header">
         <div class="gravatar">
             <img alt="gravatar" src="${h.gravatar_url(h.email(notification.notification.created_by_user.email),24)}"/>
         </div>
         <div class="desc ${unread(notification.read)}">
         <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a>
         </div>
         <div class="delete-notifications">
           <span id="${notification.notification.notification_id}" class="delete-notification delete_icon action"></span>
         </div>
       </div>
       <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
     </div>
   %endfor
   </div>
 </div>
 %else:
     <div class="table">${_('No notifications here yet')}</div>
 %endif
  No newline at end of file