Changeset - f8742e1acf08
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 13 years ago 2012-06-30 23:32:52
marcin@python-works.com
add highlight of current filter in notifications
3 files changed with 19 insertions and 1 deletions:
rhodecode/controllers/admin/notifications.py
8
rhodecode/public/css/style.css
4
rhodecode/templates/admin/notifications/notifications.html
7
1
0 comments (0 inline, 0 general)
rhodecode/controllers/admin/notifications.py
➞
Show inline comments
 
@@ -22,96 +22,104 @@
 
#
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request

			




	
	
	
		
 
from pylons import tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 

			




	
	
	
		
 
from webhelpers.paginate import Page

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.base import BaseController, render

			




	
	
	
		
 
from rhodecode.model.db import Notification

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.model.notification import NotificationModel

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, NotAnonymous

			




	
	
	
		
 
from rhodecode.lib import helpers as h

			




	
	
	
		
 
from rhodecode.model.meta import Session

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class NotificationsController(BaseController):

			




	
	
	
		
 
    """REST Controller styled on the Atom Publishing Protocol"""

			




	
	
	
		
 
    # To properly map this controller, ensure your config/routing.py

			




	
	
	
		
 
    # file has a resource setup:

			




	
	
	
		
 
    #     map.resource('notification', 'notifications', controller='_admin/notifications',

			




	
	
	
		
 
    #         path_prefix='/_admin', name_prefix='_admin_')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(NotificationsController, self).__before__()

			




	
	
	
		
 

			




	
	
	
		
 
    def index(self, format='html'):

			




	
	
	
		
 
        """GET /_admin/notifications: All items in the collection"""

			




	
	
	
		
 
        # url('notifications')

			




	
	
	
		
 
        c.user = self.rhodecode_user

			




	
	
	
		
 
        notif = NotificationModel().get_for_user(self.rhodecode_user.user_id,

			




	
	
	
		
 
                                            filter_=request.GET.getall('type'))

			




	
	
	
		
 
        p = int(request.params.get('page', 1))

			




	
	
	
		
 
        c.notifications = Page(notif, page=p, items_per_page=10)

			




	
	
	
		
 
        c.pull_request_type = Notification.TYPE_PULL_REQUEST

			




	
	
	
		
 
        c.comment_type = [Notification.TYPE_CHANGESET_COMMENT,

			




	
	
	
		
 
                          Notification.TYPE_PULL_REQUEST_COMMENT]

			




	
	
	
		
 

			




	
	
	
		
 
        _current_filter = request.GET.getall('type')

			




	
	
	
		
 
        c.current_filter = 'all'

			




	
	
	
		
 
        if _current_filter == [c.pull_request_type]:

			




	
	
	
		
 
            c.current_filter = 'pull_request'

			




	
	
	
		
 
        elif _current_filter == c.comment_type:

			




	
	
	
		
 
            c.current_filter = 'comment'

			




	
	
	
		
 

			




	
	
	
		
 
        return render('admin/notifications/notifications.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def mark_all_read(self):

			




	
	
	
		
 
        if request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            nm = NotificationModel()

			




	
	
	
		
 
            # mark all read

			




	
	
	
		
 
            nm.mark_all_read_for_user(self.rhodecode_user.user_id,

			




	
	
	
		
 
                                      filter_=request.GET.getall('type'))

			




	
	
	
		
 
            Session.commit()

			




	
	
	
		
 
            c.user = self.rhodecode_user

			




	
	
	
		
 
            notif = nm.get_for_user(self.rhodecode_user.user_id,

			




	
	
	
		
 
                                    filter_=request.GET.getall('type'))

			




	
	
	
		
 
            c.notifications = Page(notif, page=1, items_per_page=10)

			




	
	
	
		
 
            return render('admin/notifications/notifications_data.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def create(self):

			




	
	
	
		
 
        """POST /_admin/notifications: Create a new item"""

			




	
	
	
		
 
        # url('notifications')

			




	
	
	
		
 

			




	
	
	
		
 
    def new(self, format='html'):

			




	
	
	
		
 
        """GET /_admin/notifications/new: Form to create a new item"""

			




	
	
	
		
 
        # url('new_notification')

			




	
	
	
		
 

			




	
	
	
		
 
    def update(self, notification_id):

			




	
	
	
		
 
        """PUT /_admin/notifications/id: Update an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="PUT" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('notification', notification_id=ID),

			




	
	
	
		
 
        #           method='put')

			




	
	
	
		
 
        # url('notification', notification_id=ID)

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, notification_id):

			




	
	
	
		
 
        """DELETE /_admin/notifications/id: Delete an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="DELETE" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('notification', notification_id=ID),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('notification', notification_id=ID)

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            no = Notification.get(notification_id)

			




	
	
	
		
 
            owner = lambda: (no.notifications_to_users.user.user_id

			




	
	
	
		
 
                             == c.rhodecode_user.user_id)

			




	
	
	
		
 
            if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:

			




	
	
	
		
 
                    NotificationModel().delete(c.rhodecode_user.user_id, no)

			




	
	
	
		
 
                    Session.commit()

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3303,96 +3303,100 @@ div.gravatar img {

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.red{

			




	
	
	
		
 
  color:#fff;

			




	
	
	
		
 
  background-color: #c43c35;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);

			




	
	
	
		
 
  border-color: #c43c35 #c43c35 #882a25;

			




	
	
	
		
 
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.blue{

			




	
	
	
		
 
  background-color: #339bb9;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);

			




	
	
	
		
 
  border-color: #339bb9 #339bb9 #22697d;

			




	
	
	
		
 
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);    

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.green{

			




	
	
	
		
 
  background-color: #57a957;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);

			




	
	
	
		
 
  border-color: #57a957 #57a957 #3d773d;

			




	
	
	
		
 
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.active{

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
ins,div.options a:hover {

			




	
	
	
		
 
	text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
img,

			




	
	
	
		
 
#header #header-inner #quick li a:hover span.normal,

			




	
	
	
		
 
#header #header-inner #quick li ul li.last,

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table td table td a,

			




	
	
	
		
 
#clone_url,

			




	
	
	
		
 
#clone_url_id

			




	
	
	
		
 
{

			




	
	
	
		
 
	border: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
img.icon,.right .merge img {

			




	
	
	
		
 
	vertical-align: bottom;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header ul#logged-user,#content div.box div.title ul.links,

			




	
	
	
		
 
#content div.box div.message div.dismiss,

			




	
	
	
		
 
#content div.box div.traffic div.legend ul

			




	
	
	
		
 
	{

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	margin: 0;

			




	
	
	
		
 
	padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #home,#header #header-inner #logo,

			




	
	
	
		
 
#content div.box ul.left,#content div.box ol.left,

			




	
	
	
		
 
#content div.box div.pagination-left,div#commit_history,

			




	
	
	
		
 
div#legend_data,div#legend_container,div#legend_choices

			




	
	
	
		
 
	{

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li:hover ul ul,

			




	
	
	
		
 
#header #header-inner #quick li:hover ul ul ul,

			




	
	
	
		
 
#header #header-inner #quick li:hover ul ul ul ul,

			




	
	
	
		
 
#content #left #menu ul.closed,#content #left #menu li ul.collapsed,.yui-tt-shadow

			




	
	
	
		
 
	{

			




	
	
	
		
 
	display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul,#content #left #menu ul.opened,#content #left #menu li ul.expanded

			




	
	
	
		
 
	{

			




	
	
	
		
 
	display: block;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/notifications/notifications.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- 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>

			




	
	
	
		
 
    

			




	
	
	
		
 
      <div style="padding:14px 18px;text-align: right;float:left">

			




	
	
	
		
 
      <span id='all' class="ui-btn"><a href="${h.url.current()}">${_('All')}</a></span>

			




	
	
	
		
 
      <span id='pull_request' class="ui-btn"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>

			




	
	
	
		
 
      <span id='comment' class="ui-btn"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>

			




	
	
	
		
 
      <span id='pull_request' class="ui-btn"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull requests')}</a></span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %if c.notifications:

			




	
	
	
		
 
      <div style="padding:14px 18px;text-align: right;float:right">

			




	
	
	
		
 
      <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
  <div id='notification_data'>

			




	
	
	
		
 
    <%include file='notifications_data.html'/>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
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_del,notification_id)

			




	
	
	
		
 
})

			




	
	
	
		
 
YUE.on('mark_all_read','click',function(e){

			




	
	
	
		
 
    var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";

			




	
	
	
		
 
    ypjax(url,'notification_data',function(){

			




	
	
	
		
 
    	YUE.on(YUQ('.delete-notification'),'click',function(e){

			




	
	
	
		
 
    		 var notification_id = e.currentTarget.id;

			




	
	
	
		
 
    		 deleteNotification(url_del,notification_id)

			




	
	
	
		
 
    	})

			




	
	
	
		
 
    });

			




	
	
	
		
 
})

			




	
	
	
		
 

			




	
	
	
		
 
var current_filter = "${c.current_filter}";

			




	
	
	
		
 
if (YUD.get(current_filter)){

			




	
	
	
		
 
	YUD.addClass(current_filter, 'active');

			




	
	
	
		
 
}

			




	
	
	
		
 
console.log(current_filter);

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.