Notification system improvements

- deleting
- tests
- ui
- moved to separate controller

rhodecode/controllers/admin/notifications.py

@@ -0,0 +1,84 b''
+import logging
+
+from pylons import tmpl_context as c
+
+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
+from rhodecode.lib import helpers as h
+
+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()
+    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
+        c.notifications = NotificationModel()\
+                            .get_for_user(self.rhodecode_user.user_id)
+        return render('admin/notifications/notifications.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)
+
+        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(notification_id)
+                return 'ok'
+        return 'fail'
+
+    def show(self, notification_id, format='html'):
+        """GET /_admin/notifications/id: Show a specific item"""
+        # url('notification', notification_id=ID)
+        c.user = self.rhodecode_user
+        c.notification = Notification.get(notification_id)
+
+        unotification = NotificationModel()\
+                            .get_user_notification(c.user.user_id,
+                                                   c.notification)
+
+        if unotification.read is False:
+            unotification.mark_as_read()
+
+        return render('admin/notifications/show_notification.html')
+
+    def edit(self, notification_id, format='html'):
+        """GET /_admin/notifications/id/edit: Form to edit an existing item"""
+        # url('edit_notification', notification_id=ID)

rhodecode/templates/admin/notifications/show_notification.html

@@ -0,0 +1,51 b''
+## -*- coding: utf-8 -*-
+<%inherit file="/base/base.html"/>
+
+<%def name="title()">
+    ${_('Show notification')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
+</%def>
+
+<%def name="breadcrumbs_links()">
+    ${h.link_to(_('Notifications'),h.url('notifications'))}
+    &raquo; 
+    ${_('Show notification')}
+</%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 class="table">
+      <div class="notification-header">
+        <div class="gravatar">
+            <img alt="gravatar" src="${h.gravatar_url(h.email(c.notification.created_by_user.email),24)}"/>
+        </div>
+        <div class="desc">
+            ${c.notification.description}
+        </div>
+        <div class="delete-notifications">
+          <span id="${c.notification.notification_id}" class="delete_icon action"></span>
+        </div>
+      </div>
+      <div>${h.rst(c.notification.body)}</div>
+    </div>
+</div>
+<script type="text/javascript">
+var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
+   YUE.on(YUQ('.delete-notification'),'click',function(e){
+       var notification_id = e.currentTarget.id;
+       deleteNotification(url,notification_id)
+   })
+</script>
+</%def>  

rhodecode/tests/functional/test_admin_notifications.py

@@ -0,0 +1,117 b''
+from rhodecode.tests import *
+from rhodecode.model.db import Notification, User, UserNotification
+
+from rhodecode.model.user import UserModel
+from rhodecode.model.notification import NotificationModel
+
+class TestNotificationsController(TestController):
+
+    def test_index(self):
+        self.log_user()
+
+
+        u1 = UserModel().create_or_update(username='u1', password='qweqwe',
+                                               email='[e-mail]',
+                                               name='u1', lastname='u1').user_id
+        u2 = UserModel().create_or_update(username='u2', password='qweqwe',
+                                               email='[e-mail]',
+                                               name='u2', lastname='u2').user_id
+
+        response = self.app.get(url('notifications'))
+        self.assertTrue('''<div class="table">No notifications here yet</div>'''
+                        in response.body)
+
+        cur_user = self._get_logged_user()
+
+        NotificationModel().create(created_by=u1, subject=u'test',
+                                   body=u'notification_1',
+                                   recipients=[cur_user])
+        response = self.app.get(url('notifications'))
+
+        self.assertTrue(u'notification_1' in response.body)
+
+        User.delete(u1)
+        User.delete(u2)
+
+#    def test_index_as_xml(self):
+#        response = self.app.get(url('formatted_notifications', format='xml'))
+#
+#    def test_create(self):
+#        response = self.app.post(url('notifications'))
+#
+#    def test_new(self):
+#        response = self.app.get(url('new_notification'))
+#
+#    def test_new_as_xml(self):
+#        response = self.app.get(url('formatted_new_notification', format='xml'))
+#
+#    def test_update(self):
+#        response = self.app.put(url('notification', notification_id=1))
+#
+#    def test_update_browser_fakeout(self):
+#        response = self.app.post(url('notification', notification_id=1), params=dict(_method='put'))
+
+    def test_delete(self):
+        self.log_user()
+        cur_user = self._get_logged_user()
+
+        u1 = UserModel().create_or_update(username='u1', password='qweqwe',
+                                               email='[e-mail]',
+                                               name='u1', lastname='u1')
+        u2 = UserModel().create_or_update(username='u2', password='qweqwe',
+                                               email='[e-mail]',
+                                               name='u2', lastname='u2')
+
+        # make two notifications 
+        notification = NotificationModel().create(created_by=cur_user,
+                                                  subject=u'test',
+                                                  body=u'hi there',
+                                                  recipients=[cur_user, u1, u2])
+
+        u1 = User.get(u1.user_id)
+        u2 = User.get(u2.user_id)
+
+        # check DB
+        self.assertEqual(u1.notifications, [notification])
+        self.assertEqual(u2.notifications, [notification])
+        cur_usr_id = cur_user.user_id
+        response = self.app.delete(url('notification',
+                                       notification_id=cur_usr_id))
+
+        cur_user = self._get_logged_user()
+        self.assertEqual(cur_user.notifications, [])
+
+        User.delete(u1.user_id)
+        User.delete(u2.user_id)
+
+
+#    def test_delete_browser_fakeout(self):
+#        response = self.app.post(url('notification', notification_id=1), params=dict(_method='delete'))
+
+    def test_show(self):
+        self.log_user()
+        cur_user = self._get_logged_user()
+        u1 = UserModel().create_or_update(username='u1', password='qweqwe',
+                                               email='[e-mail]',
+                                               name='u1', lastname='u1')
+        u2 = UserModel().create_or_update(username='u2', password='qweqwe',
+                                               email='[e-mail]',
+                                               name='u2', lastname='u2')
+
+        notification = NotificationModel().create(created_by=cur_user,
+                                                  subject='test',
+                                                  body='hi there',
+                                                  recipients=[cur_user, u1, u2])
+
+        response = self.app.get(url('notification',
+                                    notification_id=notification.notification_id))
+
+#    def test_show_as_xml(self):
+#        response = self.app.get(url('formatted_notification', notification_id=1, format='xml'))
+#
+#    def test_edit(self):
+#        response = self.app.get(url('edit_notification', notification_id=1))
+#
+#    def test_edit_as_xml(self):
+#        response = self.app.get(url('formatted_edit_notification', notification_id=1, format='xml'))
+

rhodecode/config/routing.py

@@ -1,456 +1,483 b''
 """
 Routes configuration
 
 The more specific and detailed routes should be defined first so they
 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 """
 from __future__ import with_statement
 from routes import Mapper
 
 
 # prefix for non repository related links needs to be prefixed with `/`
 ADMIN_PREFIX = '/_admin'
 
 
 def make_map(config):
     """Create, configure and return the routes Mapper"""
     rmap = Mapper(directory=config['pylons.paths']['controllers'],
                  always_scan=config['debug'])
     rmap.minimization = False
     rmap.explicit = False
 
     from rhodecode.lib.utils import is_valid_repo
     from rhodecode.lib.utils import is_valid_repos_group
 
     def check_repo(environ, match_dict):
         """
         check for valid repository for proper 404 handling
         
         :param environ:
         :param match_dict:
         """
 
         repo_name = match_dict.get('repo_name')
         return is_valid_repo(repo_name, config['base_path'])
 
     def check_group(environ, match_dict):
         """
         check for valid repositories group for proper 404 handling
         
         :param environ:
         :param match_dict:
         """
         repos_group_name = match_dict.get('group_name')
 
         return is_valid_repos_group(repos_group_name, config['base_path'])
 
 
     def check_int(environ, match_dict):
         return match_dict.get('id').isdigit()
 
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
     rmap.connect('/error/{action}', controller='error')
     rmap.connect('/error/{action}/{id}', controller='error')
 
     #==========================================================================
     # CUSTOM ROUTES HERE
     #==========================================================================
 
     #MAIN PAGE
     rmap.connect('home', '/', controller='home', action='index')
     rmap.connect('repo_switcher', '/repos', controller='home',
                  action='repo_switcher')
-    rmap.connect('branch_tag_switcher', '/branches-tags/{repo_name:.*}', 
-                 controller='home',action='branch_tag_switcher')    
+    rmap.connect('branch_tag_switcher', '/branches-tags/{repo_name:.*}',
+                 controller='home', action='branch_tag_switcher')
     rmap.connect('bugtracker',
                  "http://bitbucket.org/marcinkuzminski/rhodecode/issues",
                  _static=True)
     rmap.connect('rst_help',
                  "http://docutils.sourceforge.net/docs/user/rst/quickref.html",
                  _static=True)
     rmap.connect('rhodecode_official', "http://rhodecode.org", _static=True)
 
     #ADMIN REPOSITORY REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/repos') as m:
         m.connect("repos", "/repos",
              action="create", conditions=dict(method=["POST"]))
         m.connect("repos", "/repos",
              action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_repos", "/repos.{format}",
              action="index",
             conditions=dict(method=["GET"]))
         m.connect("new_repo", "/repos/new",
              action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_repo", "/repos/new.{format}",
              action="new", conditions=dict(method=["GET"]))
         m.connect("/repos/{repo_name:.*}",
              action="update", conditions=dict(method=["PUT"],
                                               function=check_repo))
         m.connect("/repos/{repo_name:.*}",
              action="delete", conditions=dict(method=["DELETE"],
                                               function=check_repo))
         m.connect("edit_repo", "/repos/{repo_name:.*}/edit",
              action="edit", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("formatted_edit_repo", "/repos/{repo_name:.*}.{format}/edit",
              action="edit", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("repo", "/repos/{repo_name:.*}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("formatted_repo", "/repos/{repo_name:.*}.{format}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         #ajax delete repo perm user
         m.connect('delete_repo_user', "/repos_delete_user/{repo_name:.*}",
              action="delete_perm_user", conditions=dict(method=["DELETE"],
                                                         function=check_repo))
         #ajax delete repo perm users_group
         m.connect('delete_repo_users_group',
                   "/repos_delete_users_group/{repo_name:.*}",
                   action="delete_perm_users_group",
                   conditions=dict(method=["DELETE"], function=check_repo))
 
         #settings actions
         m.connect('repo_stats', "/repos_stats/{repo_name:.*}",
              action="repo_stats", conditions=dict(method=["DELETE"],
                                                         function=check_repo))
         m.connect('repo_cache', "/repos_cache/{repo_name:.*}",
              action="repo_cache", conditions=dict(method=["DELETE"],
                                                         function=check_repo))
         m.connect('repo_public_journal',
                   "/repos_public_journal/{repo_name:.*}",
                   action="repo_public_journal", conditions=dict(method=["PUT"],
                   function=check_repo))
         m.connect('repo_pull', "/repo_pull/{repo_name:.*}",
              action="repo_pull", conditions=dict(method=["PUT"],
                                                         function=check_repo))
 
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/repos_groups') as m:
         m.connect("repos_groups", "/repos_groups",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("repos_groups", "/repos_groups",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_repos_groups", "/repos_groups.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_repos_group", "/repos_groups/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_repos_group", "/repos_groups/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("update_repos_group", "/repos_groups/{id}",
                   action="update", conditions=dict(method=["PUT"],
                                                    function=check_int))
         m.connect("delete_repos_group", "/repos_groups/{id}",
                   action="delete", conditions=dict(method=["DELETE"],
                                                    function=check_int))
         m.connect("edit_repos_group", "/repos_groups/{id}/edit",
                   action="edit", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("formatted_edit_repos_group",
                   "/repos_groups/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("repos_group", "/repos_groups/{id}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("formatted_repos_group", "/repos_groups/{id}.{format}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_int))
 
     #ADMIN USER REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users') as m:
         m.connect("users", "/users",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("users", "/users",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_users", "/users.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_user", "/users/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_user", "/users/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("update_user", "/users/{id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("delete_user", "/users/{id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("edit_user", "/users/{id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_edit_user",
                   "/users/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("user", "/users/{id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_user", "/users/{id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
 
         #EXTRAS USER ROUTES
         m.connect("user_perm", "/users_perm/{id}",
                   action="update_perm", conditions=dict(method=["PUT"]))
 
     #ADMIN USERS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users_groups') as m:
         m.connect("users_groups", "/users_groups",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("users_groups", "/users_groups",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_users_groups", "/users_groups.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_users_group", "/users_groups/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_users_group", "/users_groups/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("update_users_group", "/users_groups/{id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("delete_users_group", "/users_groups/{id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("edit_users_group", "/users_groups/{id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_edit_users_group",
                   "/users_groups/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("users_group", "/users_groups/{id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_users_group", "/users_groups/{id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
 
         #EXTRAS USER ROUTES
         m.connect("users_group_perm", "/users_groups_perm/{id}",
                   action="update_perm", conditions=dict(method=["PUT"]))
 
     #ADMIN GROUP REST ROUTES
     rmap.resource('group', 'groups',
                   controller='admin/groups', path_prefix=ADMIN_PREFIX)
 
     #ADMIN PERMISSIONS REST ROUTES
     rmap.resource('permission', 'permissions',
                   controller='admin/permissions', path_prefix=ADMIN_PREFIX)
 
     ##ADMIN LDAP SETTINGS
     rmap.connect('ldap_settings', '%s/ldap' % ADMIN_PREFIX,
                  controller='admin/ldap_settings', action='ldap_settings',
                  conditions=dict(method=["POST"]))
 
     rmap.connect('ldap_home', '%s/ldap' % ADMIN_PREFIX,
                  controller='admin/ldap_settings')
 
     #ADMIN SETTINGS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/settings') as m:
         m.connect("admin_settings", "/settings",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("admin_settings", "/settings",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_settings", "/settings.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("admin_new_setting", "/settings/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_new_setting", "/settings/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("/settings/{setting_id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("/settings/{setting_id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("admin_edit_setting", "/settings/{setting_id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_edit_setting",
                   "/settings/{setting_id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("admin_setting", "/settings/{setting_id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_setting", "/settings/{setting_id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account", "/my_account",
                   action="my_account", conditions=dict(method=["GET"]))
-        m.connect("admin_settings_notifications", "/notifications",
-                  action="notifications", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account_update", "/my_account_update",
                   action="my_account_update", conditions=dict(method=["PUT"]))
         m.connect("admin_settings_create_repository", "/create_repository",
                   action="create_repository", conditions=dict(method=["GET"]))
 
 
+    #NOTIFICATION REST ROUTES
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/notifications') as m:
+        m.connect("notifications", "/notifications",
+                  action="create", conditions=dict(method=["POST"]))
+        m.connect("notifications", "/notifications",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("formatted_notifications", "/notifications.{format}",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("new_notification", "/notifications/new",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("formatted_new_notification", "/notifications/new.{format}",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("/notification/{notification_id}",
+                  action="update", conditions=dict(method=["PUT"]))
+        m.connect("/notification/{notification_id}",
+                  action="delete", conditions=dict(method=["DELETE"]))
+        m.connect("edit_notification", "/notification/{notification_id}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("formatted_edit_notification",
+                  "/notification/{notification_id}.{format}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("notification", "/notification/{notification_id}",
+                  action="show", conditions=dict(method=["GET"]))
+        m.connect("formatted_notification", "/notifications/{notification_id}.{format}",
+                  action="show", conditions=dict(method=["GET"]))
+
+
+
     #ADMIN MAIN PAGES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/admin') as m:
         m.connect('admin_home', '', action='index')
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
                   action='add_repo')
 
     #==========================================================================
     # API V1
     #==========================================================================
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='api/api') as m:
         m.connect('api', '/api')
 
 
     #USER JOURNAL
     rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, controller='journal')
 
     rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX,
                  controller='journal', action="public_journal")
 
     rmap.connect('public_journal_rss', '%s/public_journal_rss' % ADMIN_PREFIX,
                  controller='journal', action="public_journal_rss")
 
     rmap.connect('public_journal_atom',
                  '%s/public_journal_atom' % ADMIN_PREFIX, controller='journal',
                  action="public_journal_atom")
 
     rmap.connect('toggle_following', '%s/toggle_following' % ADMIN_PREFIX,
                  controller='journal', action='toggle_following',
                  conditions=dict(method=["POST"]))
 
     #SEARCH
     rmap.connect('search', '%s/search' % ADMIN_PREFIX, controller='search',)
     rmap.connect('search_repo', '%s/search/{search_repo:.*}' % ADMIN_PREFIX,
                   controller='search')
 
     #LOGIN/LOGOUT/REGISTER/SIGN IN
     rmap.connect('login_home', '%s/login' % ADMIN_PREFIX, controller='login')
     rmap.connect('logout_home', '%s/logout' % ADMIN_PREFIX, controller='login',
                  action='logout')
 
     rmap.connect('register', '%s/register' % ADMIN_PREFIX, controller='login',
                  action='register')
 
     rmap.connect('reset_password', '%s/password_reset' % ADMIN_PREFIX,
                  controller='login', action='password_reset')
 
     rmap.connect('reset_password_confirmation',
                  '%s/password_reset_confirmation' % ADMIN_PREFIX,
                  controller='login', action='password_reset_confirmation')
 
     #FEEDS
     rmap.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
                 controller='feed', action='rss',
                 conditions=dict(function=check_repo))
 
     rmap.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
                 controller='feed', action='atom',
                 conditions=dict(function=check_repo))
 
     #==========================================================================
     # REPOSITORY ROUTES
     #==========================================================================
     rmap.connect('summary_home', '/{repo_name:.*}',
                 controller='summary',
                 conditions=dict(function=check_repo))
 
     rmap.connect('repos_group_home', '/{group_name:.*}',
                 controller='admin/repos_groups', action="show_by_name",
                 conditions=dict(function=check_group))
 
     rmap.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
                 controller='changeset', revision='tip',
                 conditions=dict(function=check_repo))
 
     rmap.connect('changeset_comment', '/{repo_name:.*}/changeset/{revision}/comment',
                 controller='changeset', revision='tip', action='comment',
                 conditions=dict(function=check_repo))
 
     rmap.connect('changeset_comment_delete', '/{repo_name:.*}/changeset/comment/{comment_id}/delete',
                 controller='changeset', action='delete_comment',
-                conditions = dict(function=check_repo, method=["DELETE"]))
+                conditions=dict(function=check_repo, method=["DELETE"]))
 
     rmap.connect('raw_changeset_home',
                  '/{repo_name:.*}/raw-changeset/{revision}',
                  controller='changeset', action='raw_changeset',
                  revision='tip', conditions=dict(function=check_repo))
 
     rmap.connect('summary_home', '/{repo_name:.*}/summary',
                 controller='summary', conditions=dict(function=check_repo))
 
     rmap.connect('shortlog_home', '/{repo_name:.*}/shortlog',
                 controller='shortlog', conditions=dict(function=check_repo))
 
     rmap.connect('branches_home', '/{repo_name:.*}/branches',
                 controller='branches', conditions=dict(function=check_repo))
 
     rmap.connect('tags_home', '/{repo_name:.*}/tags',
                 controller='tags', conditions=dict(function=check_repo))
 
     rmap.connect('changelog_home', '/{repo_name:.*}/changelog',
                 controller='changelog', conditions=dict(function=check_repo))
 
     rmap.connect('changelog_details', '/{repo_name:.*}/changelog_details/{cs}',
                 controller='changelog', action='changelog_details',
                 conditions=dict(function=check_repo))
 
     rmap.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}',
                 controller='files', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
 
     rmap.connect('files_diff_home', '/{repo_name:.*}/diff/{f_path:.*}',
                 controller='files', action='diff', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
 
     rmap.connect('files_rawfile_home',
                  '/{repo_name:.*}/rawfile/{revision}/{f_path:.*}',
                  controller='files', action='rawfile', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
 
     rmap.connect('files_raw_home',
                  '/{repo_name:.*}/raw/{revision}/{f_path:.*}',
                  controller='files', action='raw', revision='tip', f_path='',
                  conditions=dict(function=check_repo))
 
     rmap.connect('files_annotate_home',
                  '/{repo_name:.*}/annotate/{revision}/{f_path:.*}',
                  controller='files', action='annotate', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
 
     rmap.connect('files_edit_home',
                  '/{repo_name:.*}/edit/{revision}/{f_path:.*}',
                  controller='files', action='edit', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
 
     rmap.connect('files_add_home',
                  '/{repo_name:.*}/add/{revision}/{f_path:.*}',
                  controller='files', action='add', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
 
     rmap.connect('files_archive_home', '/{repo_name:.*}/archive/{fname}',
                 controller='files', action='archivefile',
                 conditions=dict(function=check_repo))
 
     rmap.connect('files_nodelist_home',
                  '/{repo_name:.*}/nodelist/{revision}/{f_path:.*}',
                 controller='files', action='nodelist',
                 conditions=dict(function=check_repo))
 
     rmap.connect('repo_settings_delete', '/{repo_name:.*}/settings',
                 controller='settings', action="delete",
                 conditions=dict(method=["DELETE"], function=check_repo))
 
     rmap.connect('repo_settings_update', '/{repo_name:.*}/settings',
                 controller='settings', action="update",
                 conditions=dict(method=["PUT"], function=check_repo))
 
     rmap.connect('repo_settings_home', '/{repo_name:.*}/settings',
                 controller='settings', action='index',
                 conditions=dict(function=check_repo))
 
     rmap.connect('repo_fork_create_home', '/{repo_name:.*}/fork',
                 controller='settings', action='fork_create',
                 conditions=dict(function=check_repo, method=["POST"]))
 
     rmap.connect('repo_fork_home', '/{repo_name:.*}/fork',
                 controller='settings', action='fork',
                 conditions=dict(function=check_repo))
 
     rmap.connect('repo_followers_home', '/{repo_name:.*}/followers',
                  controller='followers', action='followers',
                  conditions=dict(function=check_repo))
 
     rmap.connect('repo_forks_home', '/{repo_name:.*}/forks',
                  controller='forks', action='forks',
                  conditions=dict(function=check_repo))
 
     return rmap

rhodecode/controllers/admin/settings.py

@@ -1,416 +1,408 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     settings controller for rhodecode admin
 
     :created_on: Jul 14, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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
 import formencode
 
 from sqlalchemy import func
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url, config
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
     set_rhodecode_config, repo_name_slug
 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \
     RhodeCodeSetting
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import User
 from rhodecode.model.notification import NotificationModel
 
 log = logging.getLogger(__name__)
 
 
 class SettingsController(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('setting', 'settings', controller='admin/settings',
     #         path_prefix='/admin', name_prefix='admin_')
 
     @LoginRequired()
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(SettingsController, self).__before__()
 
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /admin/settings: All items in the collection"""
         # url('admin_settings')
 
         defaults = RhodeCodeSetting.get_app_settings()
         defaults.update(self.get_hg_ui_settings())
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @HasPermissionAllDecorator('hg.admin')
     def create(self):
         """POST /admin/settings: Create a new item"""
         # url('admin_settings')
 
     @HasPermissionAllDecorator('hg.admin')
     def new(self, format='html'):
         """GET /admin/settings/new: Form to create a new item"""
         # url('admin_new_setting')
 
     @HasPermissionAllDecorator('hg.admin')
     def update(self, setting_id):
         """PUT /admin/settings/setting_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('admin_setting', setting_id=ID),
         #           method='put')
         # url('admin_setting', setting_id=ID)
         if setting_id == 'mapping':
             rm_obsolete = request.POST.get('destroy', False)
             log.debug('Rescanning directories with destroy=%s', rm_obsolete)
             initial = ScmModel().repo_scan()
             log.debug('invalidating all repositories')
             for repo_name in initial.keys():
                 invalidate_cache('get_repo_cached_%s' % repo_name)
 
             added, removed = repo2db_mapper(initial, rm_obsolete)
 
             h.flash(_('Repositories successfully'
                       ' rescanned added: %s,removed: %s') % (added, removed),
                     category='success')
 
         if setting_id == 'whoosh':
             repo_location = self.get_hg_ui_settings()['paths_root_path']
             full_index = request.POST.get('full_index', False)
             run_task(tasks.whoosh_index, repo_location, full_index)
 
             h.flash(_('Whoosh reindex task scheduled'), category='success')
         if setting_id == 'global':
 
             application_form = ApplicationSettingsForm()()
             try:
                 form_result = application_form.to_python(dict(request.POST))
 
                 try:
                     hgsettings1 = RhodeCodeSetting.get_by_name('title')
                     hgsettings1.app_settings_value = \
                         form_result['rhodecode_title']
 
                     hgsettings2 = RhodeCodeSetting.get_by_name('realm')
                     hgsettings2.app_settings_value = \
                         form_result['rhodecode_realm']
 
                     hgsettings3 = RhodeCodeSetting.get_by_name('ga_code')
                     hgsettings3.app_settings_value = \
                         form_result['rhodecode_ga_code']
 
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
                     self.sa.add(hgsettings3)
                     self.sa.commit()
                     set_rhodecode_config(config)
                     h.flash(_('Updated application settings'),
                             category='success')
 
                 except Exception:
                     log.error(traceback.format_exc())
                     h.flash(_('error occurred during updating '
                               'application settings'),
                             category='error')
 
                     self.sa.rollback()
 
             except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
                      defaults=errors.value,
                      errors=errors.error_dict or {},
                      prefix_error=False,
                      encoding="UTF-8")
 
         if setting_id == 'mercurial':
             application_form = ApplicationUiSettingsForm()()
             try:
                 form_result = application_form.to_python(dict(request.POST))
 
                 try:
 
                     hgsettings1 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == 'push_ssl').one()
                     hgsettings1.ui_value = form_result['web_push_ssl']
 
                     hgsettings2 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == '/').one()
                     hgsettings2.ui_value = form_result['paths_root_path']
 
                     #HOOKS
                     hgsettings3 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == 'changegroup.update').one()
                     hgsettings3.ui_active = \
                         bool(form_result['hooks_changegroup_update'])
 
                     hgsettings4 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'changegroup.repo_size').one()
                     hgsettings4.ui_active = \
                         bool(form_result['hooks_changegroup_repo_size'])
 
                     hgsettings5 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'pretxnchangegroup.push_logger').one()
                     hgsettings5.ui_active = \
                         bool(form_result['hooks_pretxnchangegroup'
                                          '_push_logger'])
 
                     hgsettings6 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'preoutgoing.pull_logger').one()
                     hgsettings6.ui_active = \
                         bool(form_result['hooks_preoutgoing_pull_logger'])
 
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
                     self.sa.add(hgsettings3)
                     self.sa.add(hgsettings4)
                     self.sa.add(hgsettings5)
                     self.sa.add(hgsettings6)
                     self.sa.commit()
 
                     h.flash(_('Updated mercurial settings'),
                             category='success')
 
                 except:
                     log.error(traceback.format_exc())
                     h.flash(_('error occurred during updating '
                               'application settings'), category='error')
 
                     self.sa.rollback()
 
             except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
                      defaults=errors.value,
                      errors=errors.error_dict or {},
                      prefix_error=False,
                      encoding="UTF-8")
 
 
         if setting_id == 'hooks':
             ui_key = request.POST.get('new_hook_ui_key')
             ui_value = request.POST.get('new_hook_ui_value')
             try:
 
                 if ui_value and ui_key:
                     RhodeCodeUi.create_or_update_hook(ui_key, ui_value)
                     h.flash(_('Added new hook'),
                             category='success')
 
                 # check for edits
                 update = False
                 _d = request.POST.dict_of_lists()
                 for k, v in zip(_d.get('hook_ui_key', []), _d.get('hook_ui_value_new', [])):
                     RhodeCodeUi.create_or_update_hook(k, v)
                     update = True
 
                 if update:
                     h.flash(_('Updated hooks'), category='success')
 
             except:
                 log.error(traceback.format_exc())
                 h.flash(_('error occurred during hook creation'),
                         category='error')
 
             return redirect(url('admin_edit_setting', setting_id='hooks'))
 
 
 
         if setting_id == 'email':
             test_email = request.POST.get('test_email')
             test_email_subj = 'RhodeCode TestEmail'
             test_email_body = 'RhodeCode Email test'
 
             run_task(tasks.send_email, [test_email], test_email_subj,
                      test_email_body)
             h.flash(_('Email task created'), category='success')
         return redirect(url('admin_settings'))
 
     @HasPermissionAllDecorator('hg.admin')
     def delete(self, setting_id):
         """DELETE /admin/settings/setting_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('admin_setting', setting_id=ID),
         #           method='delete')
         # url('admin_setting', setting_id=ID)
         if setting_id == 'hooks':
             hook_id = request.POST.get('hook_id')
             RhodeCodeUi.delete(hook_id)
 
 
     @HasPermissionAllDecorator('hg.admin')
     def show(self, setting_id, format='html'):
         """
         GET /admin/settings/setting_id: Show a specific item"""
         # url('admin_setting', setting_id=ID)
 
     @HasPermissionAllDecorator('hg.admin')
     def edit(self, setting_id, format='html'):
         """
         GET /admin/settings/setting_id/edit: Form to
         edit an existing item"""
         # url('admin_edit_setting', setting_id=ID)
 
         c.hooks = RhodeCodeUi.get_builtin_hooks()
         c.custom_hooks = RhodeCodeUi.get_custom_hooks()
 
         return htmlfill.render(
             render('admin/settings/hooks.html'),
             defaults={},
             encoding="UTF-8",
             force_defaults=False
         )
 
     @NotAnonymous()
     def my_account(self):
         """
         GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
 
         c.user = User.get(self.rhodecode_user.user_id)
         all_repos = self.sa.query(Repository)\
                      .filter(Repository.user_id == c.user.user_id)\
                      .order_by(func.lower(Repository.repo_name)).all()
 
         c.user_repos = ScmModel().get_repos(all_repos)
 
         if c.user.username == 'default':
             h.flash(_("You can't edit this user since it's"
               " crucial for entire application"), category='warning')
             return redirect(url('users'))
 
         defaults = c.user.get_dict()
         return htmlfill.render(
             render('admin/users/user_edit_my_account.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     def my_account_update(self):
         """PUT /_admin/my_account_update: 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('admin_settings_my_account_update'),
         #           method='put')
         # url('admin_settings_my_account_update', id=ID)
         user_model = UserModel()
         uid = self.rhodecode_user.user_id
         _form = UserForm(edit=True,
                          old_data={'user_id': uid,
                                    'email': self.rhodecode_user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update_my_account(uid, form_result)
             h.flash(_('Your account was updated successfully'),
                     category='success')
 
         except formencode.Invalid, errors:
             c.user = User.get(self.rhodecode_user.user_id)
             all_repos = self.sa.query(Repository)\
                 .filter(Repository.user_id == c.user.user_id)\
                 .order_by(func.lower(Repository.repo_name))\
                 .all()
             c.user_repos = ScmModel().get_repos(all_repos)
 
             return htmlfill.render(
                 render('admin/users/user_edit_my_account.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
 
         return redirect(url('my_account'))
 
-
-    @NotAnonymous()
-    def notifications(self):
-        c.user = User.get(self.rhodecode_user.user_id)
-        c.notifications = NotificationModel().get_for_user(c.user.user_id)
-        return render('admin/users/notifications.html'),
-
-
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
 
         c.repo_groups = RepoGroup.groups_choices()
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
 
         new_repo = request.GET.get('repo', '')
         c.new_repo = repo_name_slug(new_repo)
 
         return render('admin/repos/repo_add_create_repository.html')
 
     def get_hg_ui_settings(self):
         ret = self.sa.query(RhodeCodeUi).all()
 
         if not ret:
             raise Exception('Could not get application ui settings !')
         settings = {}
         for each in ret:
             k = each.ui_key
             v = each.ui_value
             if k == '/':
                 k = 'root_path'
 
             if k.find('.') != -1:
                 k = k.replace('.', '_')
 
             if each.ui_section == 'hooks':
                 v = each.ui_active
 
             settings[each.ui_section + '_' + k] = v
 
         return settings

rhodecode/controllers/changeset.py

@@ -1,298 +1,296 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.changeset
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     changeset controller for pylons showoing changes beetween
     revisions
 
     :created_on: Apr 25, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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 tmpl_context as c, url, request, response
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
 from pylons.decorators import jsonify
 
 import rhodecode.lib.helpers as h
-from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \
-    NotAnonymous
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.model.db import ChangesetComment
 from rhodecode.model.comment import ChangesetCommentsModel
 
 from vcs.exceptions import RepositoryError, ChangesetError, \
     ChangesetDoesNotExistError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 from webob.exc import HTTPForbidden
 
 log = logging.getLogger(__name__)
 
 
 class ChangesetController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ChangesetController, self).__before__()
         c.affected_files_cut_off = 60
 
     def index(self, revision):
 
         def wrap_to_table(str):
 
             return '''<table class="code-difftable">
                         <tr class="line">
                         <td class="lineno new"></td>
                         <td class="code"><pre>%s</pre></td>
                         </tr>
                       </table>''' % str
 
         #get ranges of revisions if preset
         rev_range = revision.split('...')[:2]
 
         try:
             if len(rev_range) == 2:
                 rev_start = rev_range[0]
                 rev_end = rev_range[1]
                 rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,
                                                             end=rev_end)
             else:
                 rev_ranges = [c.rhodecode_repo.get_changeset(revision)]
 
             c.cs_ranges = list(rev_ranges)
             if not c.cs_ranges:
                 raise RepositoryError('Changeset range returned empty result')
 
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='warning')
             return redirect(url('home'))
 
         c.changes = OrderedDict()
         c.sum_added = 0
         c.sum_removed = 0
         c.lines_added = 0
         c.lines_deleted = 0
         c.cut_off = False  # defines if cut off limit is reached
 
         c.comments = []
         c.inline_comments = []
         c.inline_cnt = 0
         # Iterate over ranges (default changeset view is always one changeset)
         for changeset in c.cs_ranges:
             c.comments.extend(ChangesetCommentsModel()\
                               .get_comments(c.rhodecode_db_repo.repo_id,
                                             changeset.raw_id))
             inlines = ChangesetCommentsModel()\
                         .get_inline_comments(c.rhodecode_db_repo.repo_id,
                                              changeset.raw_id)
             c.inline_comments.extend(inlines)
             c.changes[changeset.raw_id] = []
             try:
                 changeset_parent = changeset.parents[0]
             except IndexError:
                 changeset_parent = None
 
             #==================================================================
             # ADDED FILES
             #==================================================================
             for node in changeset.added:
 
                 filenode_old = FileNode(node.path, '', EmptyChangeset())
                 if filenode_old.is_binary or node.is_binary:
                     diff = wrap_to_table(_('binary file'))
                     st = (0, 0)
                 else:
                     # in this case node.size is good parameter since those are
                     # added nodes and their size defines how many changes were
                     # made
                     c.sum_added += node.size
                     if c.sum_added < self.cut_off_limit:
                         f_gitdiff = differ.get_gitdiff(filenode_old, node)
                         d = differ.DiffProcessor(f_gitdiff, format='gitdiff')
 
                         st = d.stat()
                         diff = d.as_html()
 
                     else:
                         diff = wrap_to_table(_('Changeset is to big and '
                                                'was cut off, see raw '
                                                'changeset instead'))
                         c.cut_off = True
                         break
 
                 cs1 = None
                 cs2 = node.last_changeset.raw_id
                 c.lines_added += st[0]
                 c.lines_deleted += st[1]
                 c.changes[changeset.raw_id].append(('added', node, diff,
                                                     cs1, cs2, st))
 
             #==================================================================
             # CHANGED FILES
             #==================================================================
             if not c.cut_off:
                 for node in changeset.changed:
                     try:
                         filenode_old = changeset_parent.get_node(node.path)
                     except ChangesetError:
                         log.warning('Unable to fetch parent node for diff')
                         filenode_old = FileNode(node.path, '',
                                                 EmptyChangeset())
 
                     if filenode_old.is_binary or node.is_binary:
                         diff = wrap_to_table(_('binary file'))
                         st = (0, 0)
                     else:
 
                         if c.sum_removed < self.cut_off_limit:
                             f_gitdiff = differ.get_gitdiff(filenode_old, node)
                             d = differ.DiffProcessor(f_gitdiff,
                                                      format='gitdiff')
                             st = d.stat()
                             if (st[0] + st[1]) * 256 > self.cut_off_limit:
                                 diff = wrap_to_table(_('Diff is to big '
                                                        'and was cut off, see '
                                                        'raw diff instead'))
                             else:
                                 diff = d.as_html()
 
                             if diff:
                                 c.sum_removed += len(diff)
                         else:
                             diff = wrap_to_table(_('Changeset is to big and '
                                                    'was cut off, see raw '
                                                    'changeset instead'))
                             c.cut_off = True
                             break
 
                     cs1 = filenode_old.last_changeset.raw_id
                     cs2 = node.last_changeset.raw_id
                     c.lines_added += st[0]
                     c.lines_deleted += st[1]
                     c.changes[changeset.raw_id].append(('changed', node, diff,
                                                         cs1, cs2, st))
 
             #==================================================================
             # REMOVED FILES
             #==================================================================
             if not c.cut_off:
                 for node in changeset.removed:
                     c.changes[changeset.raw_id].append(('removed', node, None,
                                                         None, None, (0, 0)))
 
         # count inline comments
         for path, lines in c.inline_comments:
             for comments in lines.values():
                 c.inline_cnt += len(comments)
 
         if len(c.cs_ranges) == 1:
             c.changeset = c.cs_ranges[0]
             c.changes = c.changes[c.changeset.raw_id]
 
             return render('changeset/changeset.html')
         else:
             return render('changeset/changeset_range.html')
 
     def raw_changeset(self, revision):
 
         method = request.GET.get('diff', 'show')
         try:
             c.scm_type = c.rhodecode_repo.alias
             c.changeset = c.rhodecode_repo.get_changeset(revision)
         except RepositoryError:
             log.error(traceback.format_exc())
             return redirect(url('home'))
         else:
             try:
                 c.changeset_parent = c.changeset.parents[0]
             except IndexError:
                 c.changeset_parent = None
             c.changes = []
 
             for node in c.changeset.added:
                 filenode_old = FileNode(node.path, '')
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file') + '\n'
                 else:
                     f_gitdiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_gitdiff,
                                                 format='gitdiff').raw_diff()
 
                 cs1 = None
                 cs2 = node.last_changeset.raw_id
                 c.changes.append(('added', node, diff, cs1, cs2))
 
             for node in c.changeset.changed:
                 filenode_old = c.changeset_parent.get_node(node.path)
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file')
                 else:
                     f_gitdiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_gitdiff,
                                                 format='gitdiff').raw_diff()
 
                 cs1 = filenode_old.last_changeset.raw_id
                 cs2 = node.last_changeset.raw_id
                 c.changes.append(('changed', node, diff, cs1, cs2))
 
         response.content_type = 'text/plain'
 
         if method == 'download':
             response.content_disposition = 'attachment; filename=%s.patch' \
                                             % revision
 
         c.parent_tmpl = ''.join(['# Parent  %s\n' % x.raw_id for x in
                                                  c.changeset.parents])
 
         c.diffs = ''
         for x in c.changes:
             c.diffs += x[2]
 
         return render('changeset/raw_changeset.html')
 
     def comment(self, repo_name, revision):
-        ccmodel = ChangesetCommentsModel()
-
-        ccmodel.create(text=request.POST.get('text'),
-                       repo_id=c.rhodecode_db_repo.repo_id,
-                       user_id=c.rhodecode_user.user_id,
-                       revision=revision, f_path=request.POST.get('f_path'),
-                       line_no=request.POST.get('line'))
+        ChangesetCommentsModel().create(text=request.POST.get('text'),
+                                        repo_id=c.rhodecode_db_repo.repo_id,
+                                        user_id=c.rhodecode_user.user_id,
+                                        revision=revision,
+                                        f_path=request.POST.get('f_path'),
+                                        line_no=request.POST.get('line'))
 
         return redirect(h.url('changeset_home', repo_name=repo_name,
                               revision=revision))
 
     @jsonify
     def delete_comment(self, comment_id):
         co = ChangesetComment.get(comment_id)
-        if (h.HasPermissionAny('hg.admin', 'repository.admin')() or
-            co.author.user_id == c.rhodecode_user.user_id):
+        owner = lambda : co.author.user_id == c.rhodecode_user.user_id
+        if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
             ccmodel = ChangesetCommentsModel()
             ccmodel.delete(comment_id=comment_id)
             return True
         else:
             raise HTTPForbidden()
 

rhodecode/model/comment.py

@@ -1,107 +1,129 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.model.comment
     ~~~~~~~~~~~~~~~~~~~~~~~
 
     comments model for RhodeCode
     
     :created_on: Nov 11, 2011
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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 re
 import logging
 import traceback
 
+from pylons.i18n.translation import _
+from sqlalchemy.util.compat import defaultdict
+
+from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
-from rhodecode.model.db import ChangesetComment, User, Notification
-from sqlalchemy.util.compat import defaultdict
+from rhodecode.model.db import ChangesetComment, User, Repository, Notification
 from rhodecode.model.notification import NotificationModel
 
 log = logging.getLogger(__name__)
 
 
 class ChangesetCommentsModel(BaseModel):
 
 
+    def _extract_mentions(self, s):
+        usrs = []
+        for username in re.findall(r'(?:^@|\s@)(\w+)', s):
+            user_obj = User.get_by_username(username, case_insensitive=True)
+            if user_obj:
+                usrs.append(user_obj)
+
+        return usrs
+
     def create(self, text, repo_id, user_id, revision, f_path=None,
                line_no=None):
         """
         Creates new comment for changeset
         
         :param text:
         :param repo_id:
         :param user_id:
         :param revision:
         :param f_path:
         :param line_no:
         """
         if text:
+            repo = Repository.get(repo_id)
+            desc = repo.scm_instance.get_changeset(revision).message
             comment = ChangesetComment()
-            comment.repo_id = repo_id
+            comment.repo = repo
             comment.user_id = user_id
             comment.revision = revision
             comment.text = text
             comment.f_path = f_path
             comment.line_no = line_no
 
             self.sa.add(comment)
-            self.sa.commit()
+            self.sa.flush()
 
             # make notification
-            usr = User.get(user_id)
-            subj = 'User %s commented on %s' % (usr.username, revision)
+            line = ''
+            if line_no:
+                line = _('on line %s') % line_no
+            subj = h.link_to('Re commit: %(commit_desc)s %(line)s' % \
+                                    {'commit_desc':desc,'line':line},
+                             h.url('changeset_home', repo_name=repo.repo_name,
+                                   revision = revision,
+                                   anchor = 'comment-%s' % comment.comment_id
+                                   )
+                             )
             body = text
             recipients = ChangesetComment.get_users(revision=revision)
+            recipients += self._extract_mentions(body)
             NotificationModel().create(created_by=user_id, subject=subj,
                                    body = body, recipients = recipients,
                                    type_ = Notification.TYPE_CHANGESET_COMMENT)
 
-
             return comment
 
     def delete(self, comment_id):
         """
         Deletes given comment
         
         :param comment_id:
         """
         comment = ChangesetComment.get(comment_id)
         self.sa.delete(comment)
         self.sa.commit()
         return comment
 
 
     def get_comments(self, repo_id, revision):
         return ChangesetComment.query()\
                 .filter(ChangesetComment.repo_id == repo_id)\
                 .filter(ChangesetComment.revision == revision)\
                 .filter(ChangesetComment.line_no == None)\
                 .filter(ChangesetComment.f_path == None).all()
 
     def get_inline_comments(self, repo_id, revision):
         comments = self.sa.query(ChangesetComment)\
             .filter(ChangesetComment.repo_id == repo_id)\
             .filter(ChangesetComment.revision == revision)\
             .filter(ChangesetComment.line_no != None)\
             .filter(ChangesetComment.f_path != None).all()
 
         paths = defaultdict(lambda:defaultdict(list))
 
         for co in comments:
             paths[co.f_path][co.line_no].append(co)
         return paths.items()

rhodecode/model/db.py

@@ -1,1192 +1,1200 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.model.db
     ~~~~~~~~~~~~~~~~~~
 
     Database Models for RhodeCode
 
     :created_on: Apr 08, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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 os
 import logging
 import datetime
 import traceback
 from datetime import date
 
 from sqlalchemy import *
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
 from beaker.cache import cache_region, region_invalidate
 
 from vcs import get_backend
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import VCSError
 from vcs.utils.lazy import LazyProperty
 
 from rhodecode.lib import str2bool, safe_str, get_changeset_safe, \
     generate_api_key, safe_unicode
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
 from rhodecode.lib.compat import json
 from rhodecode.lib.caching_query import FromCache
 
 from rhodecode.model.meta import Base, Session
 
 
-
 log = logging.getLogger(__name__)
 
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 
 class ModelSerializer(json.JSONEncoder):
     """
     Simple Serializer for JSON,
 
     usage::
 
         to make object customized for serialization implement a __json__
         method that will return a dict for serialization into json
 
     example::
 
         class Task(object):
 
             def __init__(self, name, value):
                 self.name = name
                 self.value = value
 
             def __json__(self):
                 return dict(name=self.name,
                             value=self.value)
 
     """
 
     def default(self, obj):
 
         if hasattr(obj, '__json__'):
             return obj.__json__()
         else:
             return json.JSONEncoder.default(self, obj)
 
 class BaseModel(object):
     """Base Model for all classess
 
     """
 
     @classmethod
     def _get_keys(cls):
         """return column names for this model """
         return class_mapper(cls).c.keys()
 
     def get_dict(self):
         """return dict with keys and values corresponding
         to this model data """
 
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
         return d
 
     def get_appstruct(self):
         """return list with keys and values tupples corresponding
         to this model data """
 
         l = []
         for k in self._get_keys():
             l.append((k, getattr(self, k),))
         return l
 
     def populate_obj(self, populate_dict):
         """populate model with data from given populate_dict"""
 
         for k in self._get_keys():
             if k in populate_dict:
                 setattr(self, k, populate_dict[k])
 
     @classmethod
     def query(cls):
         return Session.query(cls)
 
     @classmethod
     def get(cls, id_):
         if id_:
             return cls.query().get(id_)
 
     @classmethod
     def getAll(cls):
         return cls.query().all()
 
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)
         Session.delete(obj)
         Session.commit()
 
 
 class RhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (UniqueConstraint('app_settings_name'), {'extend_existing':True})
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     app_settings_name = Column("app_settings_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     _app_settings_value = Column("app_settings_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
 
     def __init__(self, k='', v=''):
         self.app_settings_name = k
         self.app_settings_value = v
 
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         if v == 'ldap_active':
             v = str2bool(v)
         return v
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         self._app_settings_value = safe_unicode(val)
 
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.app_settings_name, self.app_settings_value)
 
 
     @classmethod
     def get_by_name(cls, ldap_key):
         return cls.query()\
             .filter(cls.app_settings_name == ldap_key).scalar()
 
     @classmethod
     def get_app_settings(cls, cache=False):
 
         ret = cls.query()
 
         if cache:
             ret = ret.options(FromCache("sql_cache_short", "get_hg_settings"))
 
         if not ret:
             raise Exception('Could not get application settings !')
         settings = {}
         for each in ret:
             settings['rhodecode_' + each.app_settings_name] = \
                 each.app_settings_value
 
         return settings
 
     @classmethod
     def get_ldap_settings(cls, cache=False):
         ret = cls.query()\
                 .filter(cls.app_settings_name.startswith('ldap_')).all()
         fd = {}
         for row in ret:
             fd.update({row.app_settings_name:row.app_settings_value})
 
         return fd
 
 
 class RhodeCodeUi(Base, BaseModel):
     __tablename__ = 'rhodecode_ui'
     __table_args__ = (UniqueConstraint('ui_key'), {'extend_existing':True})
 
     HOOK_UPDATE = 'changegroup.update'
     HOOK_REPO_SIZE = 'changegroup.repo_size'
     HOOK_PUSH = 'pretxnchangegroup.push_logger'
     HOOK_PULL = 'preoutgoing.pull_logger'
 
     ui_id = Column("ui_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ui_section = Column("ui_section", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     ui_key = Column("ui_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     ui_value = Column("ui_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     ui_active = Column("ui_active", Boolean(), nullable=True, unique=None, default=True)
 
 
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.ui_key == key)
 
 
     @classmethod
     def get_builtin_hooks(cls):
         q = cls.query()
         q = q.filter(cls.ui_key.in_([cls.HOOK_UPDATE,
                                     cls.HOOK_REPO_SIZE,
                                     cls.HOOK_PUSH, cls.HOOK_PULL]))
         return q.all()
 
     @classmethod
     def get_custom_hooks(cls):
         q = cls.query()
         q = q.filter(~cls.ui_key.in_([cls.HOOK_UPDATE,
                                     cls.HOOK_REPO_SIZE,
                                     cls.HOOK_PUSH, cls.HOOK_PULL]))
         q = q.filter(cls.ui_section == 'hooks')
         return q.all()
 
     @classmethod
     def create_or_update_hook(cls, key, val):
         new_ui = cls.get_by_key(key).scalar() or cls()
         new_ui.ui_section = 'hooks'
         new_ui.ui_active = True
         new_ui.ui_key = key
         new_ui.ui_value = val
 
         Session.add(new_ui)
         Session.commit()
 
 
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (UniqueConstraint('username'), UniqueConstraint('email'), {'extend_existing':True})
     user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     password = Column("password", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=None)
     admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
     name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     lastname = Column("lastname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     email = Column("email", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
     ldap_dn = Column("ldap_dn", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     api_key = Column("api_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
 
     user_log = relationship('UserLog', cascade='all')
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
 
     repositories = relationship('Repository')
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
 
     group_member = relationship('UsersGroupMember', cascade='all')
 
-    notifications = relationship('Notification', secondary='user_to_notification')
+    notifications = relationship('Notification',
+                            secondary='user_to_notification',
+                            order_by=lambda :Notification.created_on.desc())
 
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.name, self.lastname, self.email)
 
     @property
     def short_contact(self):
         return '%s %s' % (self.name, self.lastname)
 
     @property
     def is_admin(self):
         return self.admin
 
     def __repr__(self):
-        try:
-            return "<%s('id:%s:%s')>" % (self.__class__.__name__,
-                                             self.user_id, self.username)
-        except:
-            return self.__class__.__name__
+        return "<%s('id:%s:%s')>" % (self.__class__.__name__,
+                                     self.user_id, self.username)
+
 
     @classmethod
     def get_by_username(cls, username, case_insensitive=False, cache=False):
         if case_insensitive:
             q = cls.query().filter(cls.username.ilike(username))
         else:
             q = cls.query().filter(cls.username == username)
 
         if cache:
             q = q.options(FromCache("sql_cache_short",
                                     "get_user_%s" % username))
         return q.scalar()
 
     @classmethod
     def get_by_api_key(cls, api_key, cache=False):
         q = cls.query().filter(cls.api_key == api_key)
 
         if cache:
             q = q.options(FromCache("sql_cache_short",
                                     "get_api_key_%s" % api_key))
         return q.scalar()
 
     def update_lastlogin(self):
         """Update user lastlogin"""
 
         self.last_login = datetime.datetime.now()
         Session.add(self)
         Session.commit()
         log.debug('updated user %s lastlogin', self.username)
 
+
 class UserLog(Base, BaseModel):
     __tablename__ = 'user_logs'
     __table_args__ = {'extend_existing':True}
     user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     repository_name = Column("repository_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action = Column("action", UnicodeText(length=1200000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     @property
     def action_as_day(self):
         return date(*self.action_date.timetuple()[:3])
 
     user = relationship('User')
     repository = relationship('Repository')
 
 
 class UsersGroup(Base, BaseModel):
     __tablename__ = 'users_groups'
     __table_args__ = {'extend_existing':True}
 
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_name = Column("users_group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
 
     members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
 
     def __repr__(self):
         return '<userGroup(%s)>' % (self.users_group_name)
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query()\
                 .filter(cls.users_group_name.ilike(group_name))
         else:
             gr = cls.query()\
                 .filter(cls.users_group_name == group_name)
         if cache:
             gr = gr.options(FromCache("sql_cache_short",
                                           "get_user_%s" % group_name))
         return gr.scalar()
 
 
     @classmethod
     def get(cls, users_group_id, cache=False):
         users_group = cls.query()
         if cache:
             users_group = users_group.options(FromCache("sql_cache_short",
                                     "get_users_group_%s" % users_group_id))
         return users_group.get(users_group_id)
 
     @classmethod
     def create(cls, form_data):
         try:
             new_users_group = cls()
             for k, v in form_data.items():
                 setattr(new_users_group, k, v)
 
             Session.add(new_users_group)
             Session.commit()
             return new_users_group
         except:
             log.error(traceback.format_exc())
             Session.rollback()
             raise
 
     @classmethod
     def update(cls, users_group_id, form_data):
 
         try:
             users_group = cls.get(users_group_id, cache=False)
 
             for k, v in form_data.items():
                 if k == 'users_group_members':
                     users_group.members = []
                     Session.flush()
                     members_list = []
                     if v:
                         v = [v] if isinstance(v, basestring) else v
                         for u_id in set(v):
                             member = UsersGroupMember(users_group_id, u_id)
                             members_list.append(member)
                     setattr(users_group, 'members', members_list)
                 setattr(users_group, k, v)
 
             Session.add(users_group)
             Session.commit()
         except:
             log.error(traceback.format_exc())
             Session.rollback()
             raise
 
     @classmethod
     def delete(cls, users_group_id):
         try:
 
             # check if this group is not assigned to repo
             assigned_groups = UsersGroupRepoToPerm.query()\
                 .filter(UsersGroupRepoToPerm.users_group_id ==
                         users_group_id).all()
 
             if assigned_groups:
                 raise UsersGroupsAssignedException('RepoGroup assigned to %s' %
                                                    assigned_groups)
 
             users_group = cls.get(users_group_id, cache=False)
             Session.delete(users_group)
             Session.commit()
         except:
             log.error(traceback.format_exc())
             Session.rollback()
             raise
 
 class UsersGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = {'extend_existing':True}
 
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User', lazy='joined')
     users_group = relationship('UsersGroup')
 
     def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id
 
     @staticmethod
     def add_user_to_group(group, user):
         ugm = UsersGroupMember()
         ugm.users_group = group
         ugm.user = user
         Session.add(ugm)
         Session.commit()
         return ugm
 
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (UniqueConstraint('repo_name'), {'extend_existing':True},)
 
     repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repo_name = Column("repo_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)
     repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg')
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     private = Column("private", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
 
     fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None)
 
 
     user = relationship('User')
     fork = relationship('Repository', remote_side=repo_id)
     group = relationship('RepoGroup')
     repo_to_perm = relationship('UserRepoToPerm', cascade='all', order_by='UserRepoToPerm.repo_to_perm_id')
     users_group_to_perm = relationship('UsersGroupRepoToPerm', cascade='all')
     stats = relationship('Statistics', cascade='all', uselist=False)
 
     followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
 
     logs = relationship('UserLog', cascade='all')
 
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.repo_id, self.repo_name)
 
     @classmethod
     def url_sep(cls):
         return '/'
 
     @classmethod
     def get_by_repo_name(cls, repo_name):
         q = Session.query(cls).filter(cls.repo_name == repo_name)
         q = q.options(joinedload(Repository.fork))\
                 .options(joinedload(Repository.user))\
                 .options(joinedload(Repository.group))
         return q.one()
 
     @classmethod
     def get_repo_forks(cls, repo_id):
         return cls.query().filter(Repository.fork_id == repo_id)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all repos are stored
 
         :param cls:
         """
         q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key ==
                                               cls.url_sep())
         q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @property
     def just_name(self):
         return self.repo_name.split(Repository.url_sep())[-1]
 
     @property
     def groups_with_parents(self):
         groups = []
         if self.group is None:
             return groups
 
         cur_gr = self.group
         groups.insert(0, cur_gr)
         while 1:
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             groups.insert(0, gr)
 
         return groups
 
     @property
     def groups_and_repo(self):
         return self.groups_with_parents, self.just_name
 
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
         q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key ==
                                               Repository.url_sep())
         q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @property
     def repo_full_path(self):
         p = [self.repo_path]
         # we need to split the name by / since this is how we store the
         # names in the database, but that eventually needs to be converted
         # into a valid system path
         p += self.repo_name.split(Repository.url_sep())
         return os.path.join(*p)
 
     def get_new_name(self, repo_name):
         """
         returns new full repository name based on assigned group and new new
 
         :param group_name:
         """
         path_prefix = self.group.full_path_splitted if self.group else []
         return Repository.url_sep().join(path_prefix + [repo_name])
 
     @property
     def _ui(self):
         """
         Creates an db based ui object for this repository
         """
         from mercurial import ui
         from mercurial import config
         baseui = ui.ui()
 
         #clean the baseui object
         baseui._ocfg = config.config()
         baseui._ucfg = config.config()
         baseui._tcfg = config.config()
 
 
         ret = RhodeCodeUi.query()\
             .options(FromCache("sql_cache_short", "repository_repo_ui")).all()
 
         hg_ui = ret
         for ui_ in hg_ui:
             if ui_.ui_active:
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section,
                           ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
 
         return baseui
 
     @classmethod
     def is_valid(cls, repo_name):
         """
         returns True if given repo name is a valid filesystem repository
 
         @param cls:
         @param repo_name:
         """
         from rhodecode.lib.utils import is_valid_repo
 
         return is_valid_repo(repo_name, cls.base_path())
 
 
     #==========================================================================
     # SCM PROPERTIES
     #==========================================================================
 
     def get_changeset(self, rev):
         return get_changeset_safe(self.scm_instance, rev)
 
     @property
     def tip(self):
         return self.get_changeset('tip')
 
     @property
     def author(self):
         return self.tip.author
 
     @property
     def last_change(self):
         return self.scm_instance.last_change
 
     #==========================================================================
     # SCM CACHE INSTANCE
     #==========================================================================
 
     @property
     def invalidate(self):
         return CacheInvalidation.invalidate(self.repo_name)
 
     def set_invalidate(self):
         """
         set a cache for invalidation for this instance
         """
         CacheInvalidation.set_invalidate(self.repo_name)
 
     @LazyProperty
     def scm_instance(self):
         return self.__get_instance()
 
     @property
     def scm_instance_cached(self):
         @cache_region('long_term')
         def _c(repo_name):
             return self.__get_instance()
         rn = self.repo_name
 
         inv = self.invalidate
         if inv is not None:
             region_invalidate(_c, None, rn)
             # update our cache
             CacheInvalidation.set_valid(inv.cache_key)
         return _c(rn)
 
     def __get_instance(self):
 
         repo_full_path = self.repo_full_path
 
         try:
             alias = get_scm(repo_full_path)[0]
             log.debug('Creating instance of %s repository', alias)
             backend = get_backend(alias)
         except VCSError:
             log.error(traceback.format_exc())
             log.error('Perhaps this repository is in db and not in '
                       'filesystem run rescan repositories with '
                       '"destroy old data " option from admin panel')
             return
 
         if alias == 'hg':
 
             repo = backend(safe_str(repo_full_path), create=False,
                            baseui=self._ui)
             # skip hidden web repository
             if repo._get_hidden():
                 return
         else:
             repo = backend(repo_full_path, create=False)
 
         return repo
 
 
 class RepoGroup(Base, BaseModel):
     __tablename__ = 'groups'
     __table_args__ = (UniqueConstraint('group_name', 'group_parent_id'),
                       CheckConstraint('group_id != group_parent_id'), {'extend_existing':True},)
     __mapper_args__ = {'order_by':'group_name'}
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
 
     parent_group = relationship('RepoGroup', remote_side=group_id)
 
 
     def __init__(self, group_name='', parent_group=None):
         self.group_name = group_name
         self.parent_group = parent_group
 
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__, self.group_id,
                                   self.group_name)
 
     @classmethod
     def groups_choices(cls):
         from webhelpers.html import literal as _literal
         repo_groups = [('', '')]
         sep = ' &raquo; '
         _name = lambda k: _literal(sep.join(k))
 
         repo_groups.extend([(x.group_id, _name(x.full_path_splitted))
                               for x in cls.query().all()])
 
         repo_groups = sorted(repo_groups, key=lambda t: t[1].split(sep)[0])
         return repo_groups
 
     @classmethod
     def url_sep(cls):
         return '/'
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query()\
                 .filter(cls.group_name.ilike(group_name))
         else:
             gr = cls.query()\
                 .filter(cls.group_name == group_name)
         if cache:
             gr = gr.options(FromCache("sql_cache_short",
                                           "get_group_%s" % group_name))
         return gr.scalar()
 
     @property
     def parents(self):
         parents_recursion_limit = 5
         groups = []
         if self.parent_group is None:
             return groups
         cur_gr = self.parent_group
         groups.insert(0, cur_gr)
         cnt = 0
         while 1:
             cnt += 1
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             if cnt == parents_recursion_limit:
                 # this will prevent accidental infinit loops
                 log.error('group nested more than %s' %
                           parents_recursion_limit)
                 break
 
             groups.insert(0, gr)
         return groups
 
     @property
     def children(self):
         return RepoGroup.query().filter(RepoGroup.parent_group == self)
 
     @property
     def name(self):
         return self.group_name.split(RepoGroup.url_sep())[-1]
 
     @property
     def full_path(self):
         return self.group_name
 
     @property
     def full_path_splitted(self):
         return self.group_name.split(RepoGroup.url_sep())
 
     @property
     def repositories(self):
         return Repository.query().filter(Repository.group == self)
 
     @property
     def repositories_recursive_count(self):
         cnt = self.repositories.count()
 
         def children_count(group):
             cnt = 0
             for child in group.children:
                 cnt += child.repositories.count()
                 cnt += children_count(child)
             return cnt
 
         return cnt + children_count(self)
 
 
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
 
         :param group_name:
         """
         path_prefix = (self.parent_group.full_path_splitted if
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
 
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = {'extend_existing':True}
     permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     permission_name = Column("permission_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
 
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.permission_id, self.permission_name)
 
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.permission_name == key).scalar()
 
 class UserRepoToPerm(Base, BaseModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (UniqueConstraint('user_id', 'repository_id'), {'extend_existing':True})
     repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     permission = relationship('Permission')
     repository = relationship('Repository')
 
 class UserToPerm(Base, BaseModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'extend_existing':True})
     user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     permission = relationship('Permission')
 
     @classmethod
     def has_perm(cls, user_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
 
         return cls.query().filter(cls.user_id == user_id)\
             .filter(cls.permission == perm).scalar() is not None
 
     @classmethod
     def grant_perm(cls, user_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
 
         new = cls()
         new.user_id = user_id
         new.permission = perm
         try:
             Session.add(new)
             Session.commit()
         except:
             Session.rollback()
 
 
     @classmethod
     def revoke_perm(cls, user_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
 
         try:
             cls.query().filter(cls.user_id == user_id)\
                 .filter(cls.permission == perm).delete()
             Session.commit()
         except:
             Session.rollback()
 
 class UsersGroupRepoToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (UniqueConstraint('repository_id', 'users_group_id', 'permission_id'), {'extend_existing':True})
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UsersGroup')
     permission = relationship('Permission')
     repository = relationship('Repository')
 
     def __repr__(self):
         return '<userGroup:%s => %s >' % (self.users_group, self.repository)
 
 class UsersGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UsersGroup')
     permission = relationship('Permission')
 
 
     @classmethod
     def has_perm(cls, users_group_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
 
         return cls.query().filter(cls.users_group_id ==
                                          users_group_id)\
                                          .filter(cls.permission == perm)\
                                          .scalar() is not None
 
     @classmethod
     def grant_perm(cls, users_group_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
 
         new = cls()
         new.users_group_id = users_group_id
         new.permission = perm
         try:
             Session.add(new)
             Session.commit()
         except:
             Session.rollback()
 
 
     @classmethod
     def revoke_perm(cls, users_group_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
 
         try:
             cls.query().filter(cls.users_group_id == users_group_id)\
                 .filter(cls.permission == perm).delete()
             Session.commit()
         except:
             Session.rollback()
 
 
 class UserRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'group_to_perm'
     __table_args__ = (UniqueConstraint('group_id', 'permission_id'), {'extend_existing':True})
 
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     permission = relationship('Permission')
     group = relationship('RepoGroup')
 
 class UsersGroupRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_group_to_perm'
     __table_args__ = (UniqueConstraint('group_id', 'permission_id'), {'extend_existing':True})
 
     users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UsersGroup')
     permission = relationship('Permission')
     group = relationship('RepoGroup')
 
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (UniqueConstraint('repository_id'), {'extend_existing':True})
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
     commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
     commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
     languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
 
     repository = relationship('Repository', single_parent=True)
 
 class UserFollowing(Base, BaseModel):
     __tablename__ = 'user_followings'
     __table_args__ = (UniqueConstraint('user_id', 'follows_repository_id'),
                       UniqueConstraint('user_id', 'follows_user_id')
                       , {'extend_existing':True})
 
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
     follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
 
     user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
 
     follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
     follows_repository = relationship('Repository', order_by='Repository.repo_name')
 
 
     @classmethod
     def get_repo_followers(cls, repo_id):
         return cls.query().filter(cls.follows_repo_id == repo_id)
 
 class CacheInvalidation(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (UniqueConstraint('cache_key'), {'extend_existing':True})
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     cache_args = Column("cache_args", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
 
 
     def __init__(self, cache_key, cache_args=''):
         self.cache_key = cache_key
         self.cache_args = cache_args
         self.cache_active = False
 
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.cache_id, self.cache_key)
 
     @classmethod
     def invalidate(cls, key):
         """
         Returns Invalidation object if this given key should be invalidated
         None otherwise. `cache_active = False` means that this cache
         state is not valid and needs to be invalidated
         
         :param key:
         """
         return cls.query()\
                 .filter(CacheInvalidation.cache_key == key)\
                 .filter(CacheInvalidation.cache_active == False)\
                 .scalar()
 
     @classmethod
     def set_invalidate(cls, key):
         """
         Mark this Cache key for invalidation
         
         :param key:
         """
 
         log.debug('marking %s for invalidation' % key)
         inv_obj = Session().query(cls)\
             .filter(cls.cache_key == key).scalar()
         if inv_obj:
             inv_obj.cache_active = False
         else:
             log.debug('cache key not found in invalidation db -> creating one')
             inv_obj = CacheInvalidation(key)
 
         try:
             Session.add(inv_obj)
             Session.commit()
         except Exception:
             log.error(traceback.format_exc())
             Session.rollback()
 
     @classmethod
     def set_valid(cls, key):
         """
         Mark this cache key as active and currently cached
         
         :param key:
         """
         inv_obj = Session().query(CacheInvalidation)\
             .filter(CacheInvalidation.cache_key == key).scalar()
         inv_obj.cache_active = True
         Session.add(inv_obj)
         Session.commit()
 
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = ({'extend_existing':True},)
     comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     revision = Column('revision', String(40), nullable=False)
     line_no = Column('line_no', Unicode(10), nullable=True)
     f_path = Column('f_path', Unicode(1000), nullable=True)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', Unicode(25000), nullable=False)
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
 
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
 
 
     @classmethod
     def get_users(cls, revision):
         """
         Returns user associated with this changesetComment. ie those
         who actually commented
         
         :param cls:
         :param revision:
         """
         return Session.query(User)\
                 .filter(cls.revision == revision)\
                 .join(ChangesetComment.author).all()
 
 
 class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = ({'extend_existing':True})
 
-    TYPE_CHANGESET_COMMENT = 'cs_comment'
-    TYPE_MESSAGE = 'message'
-    TYPE_MENTION = 'mention'
+    TYPE_CHANGESET_COMMENT = u'cs_comment'
+    TYPE_MESSAGE = u'message'
+    TYPE_MENTION = u'mention'
 
     notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
     subject = Column('subject', Unicode(512), nullable=True)
     body = Column('body', Unicode(50000), nullable=True)
     created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     type_ = Column('type', Unicode(256))
 
-    create_by_user = relationship('User')
-    user_notifications = relationship('UserNotification',
-        primaryjoin = 'Notification.notification_id==UserNotification.notification_id',
+    created_by_user = relationship('User')
+    notifications_to_users = relationship('UserNotification',
+        primaryjoin='Notification.notification_id==UserNotification.notification_id',
+        lazy='joined',
         cascade = "all, delete, delete-orphan")
 
     @property
     def recipients(self):
         return [x.user for x in UserNotification.query()\
                 .filter(UserNotification.notification == self).all()]
 
     @classmethod
     def create(cls, created_by, subject, body, recipients, type_=None):
         if type_ is None:
             type_ = Notification.TYPE_MESSAGE
 
         notification = cls()
-        notification.create_by_user = created_by
+        notification.created_by_user = created_by
         notification.subject = subject
         notification.body = body
         notification.type_ = type_
         Session.add(notification)
         for u in recipients:
             u.notifications.append(notification)
-        Session.commit()
         return notification
 
+    @property
+    def description(self):
+        from rhodecode.model.notification import NotificationModel
+        return NotificationModel().make_description(self)
+
 class UserNotification(Base, BaseModel):
     __tablename__ = 'user_to_notification'
     __table_args__ = (UniqueConstraint('user_id', 'notification_id'),
                       {'extend_existing':True})
     user_to_notification_id = Column("user_to_notification_id", Integer(), nullable=False, unique=True, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), nullable=False)
     read = Column('read', Boolean, default=False)
     sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
 
     user = relationship('User', single_parent=True, lazy="joined")
-    notification = relationship('Notification',single_parent=True,
-                                cascade="all, delete, delete-orphan")
+    notification = relationship('Notification', single_parent=True,)
 
+    def mark_as_read(self):
+        self.read = True
+        Session.add(self)
+        Session.commit()
 
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = {'extend_existing':True}
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)
 

rhodecode/model/meta.py

@@ -1,26 +1,27 b''
 """SQLAlchemy Metadata and Session object"""
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker
 from beaker import cache
 
 from rhodecode.lib import caching_query
 
 
 # Beaker CacheManager.  A home base for cache configurations.
 cache_manager = cache.CacheManager()
 
 __all__ = ['Base', 'Session']
 #
 # SQLAlchemy session manager. Updated by model.init_model()
 #
 Session = scoped_session(
                 sessionmaker(
-                    query_cls=caching_query.query_callable(cache_manager)
+                    query_cls = caching_query.query_callable(cache_manager),
+                    expire_on_commit = True,
                 )
           )
 
 # The declarative Base
 Base = declarative_base()
 
 #to use cache use this in query
 #.options(FromCache("sqlalchemy_cache_type", "cachekey"))

rhodecode/model/notification.py

@@ -1,91 +1,138 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.model.notification
     ~~~~~~~~~~~~~~
 
     Model for notifications
     
     
     :created_on: Nov 20, 2011
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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.i18n.translation import _
 
-from rhodecode.lib import safe_unicode
-from rhodecode.lib.caching_query import FromCache
+from rhodecode.lib.helpers import age
 
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Notification, User, UserNotification
 
+log = logging.getLogger(__name__)
 
 class NotificationModel(BaseModel):
 
+
+    def __get_user(self, user):
+        if isinstance(user, User):
+            return user
+        elif isinstance(user, basestring):
+            return User.get_by_username(username=user)
+        elif isinstance(user, int):
+            return User.get(user)
+        else:
+            raise Exception('Unsupported user must be one of int,'
+                            'str or User object')
+
+    def __get_notification(self, notification):
+        if isinstance(notification, Notification):
+            return notification
+        elif isinstance(notification, int):
+            return Notification.get(notification)
+        else:
+            if notification:
+                raise Exception('notification must be int or Instance'
+                                ' of Notification got %s' % type(notification))
+
+
     def create(self, created_by, subject, body, recipients,
                type_=Notification.TYPE_MESSAGE):
         """
         
         Creates notification of given type
         
         :param created_by: int, str or User instance. User who created this
             notification
         :param subject:
         :param body:
         :param recipients: list of int, str or User objects
         :param type_: type of notification
         """
 
         if not getattr(recipients, '__iter__', False):
             raise Exception('recipients must be a list of iterable')
 
-        created_by_obj = created_by
-        if not isinstance(created_by, User):
-            created_by_obj = User.get(created_by)
-
+        created_by_obj = self.__get_user(created_by)
 
         recipients_objs = []
         for u in recipients:
-            if isinstance(u, User):
-                recipients_objs.append(u)
-            elif isinstance(u, basestring):
-                recipients_objs.append(User.get_by_username(username=u))
-            elif isinstance(u, int):
-                recipients_objs.append(User.get(u))
-            else:
-                raise Exception('Unsupported recipient must be one of int,'
-                                'str or User object')
-
-        Notification.create(created_by=created_by_obj, subject=subject,
-                            body = body, recipients = recipients_objs,
+            recipients_objs.append(self.__get_user(u))
+        recipients_objs = set(recipients_objs)
+        return Notification.create(created_by=created_by_obj, subject=subject,
+                            body=body, recipients=recipients_objs,
                             type_=type_)
 
+    def delete(self, notification_id):
+        # we don't want to remove actuall notification just the assignment
+        try:
+            notification_id = int(notification_id)
+            no = self.__get_notification(notification_id)
+            if no:
+                UserNotification.delete(no.notifications_to_users.user_to_notification_id)
+                return True
+        except Exception:
+            log.error(traceback.format_exc())
+            raise
 
     def get_for_user(self, user_id):
         return User.get(user_id).notifications
 
     def get_unread_cnt_for_user(self, user_id):
         return UserNotification.query()\
-                .filter(UserNotification.sent_on == None)\
+                .filter(UserNotification.read == False)\
                 .filter(UserNotification.user_id == user_id).count()
 
     def get_unread_for_user(self, user_id):
         return [x.notification for x in UserNotification.query()\
-                .filter(UserNotification.sent_on == None)\
+                .filter(UserNotification.read == False)\
                 .filter(UserNotification.user_id == user_id).all()]
+
+    def get_user_notification(self, user, notification):
+        user = self.__get_user(user)
+        notification = self.__get_notification(notification)
+
+        return UserNotification.query()\
+            .filter(UserNotification.notification == notification)\
+            .filter(UserNotification.user == user).scalar()
+
+    def make_description(self, notification):
+        """
+        Creates a human readable description based on properties
+        of notification object
+        """
+
+        _map = {notification.TYPE_CHANGESET_COMMENT:_('commented on commit'),
+                notification.TYPE_MESSAGE:_('sent message'),
+                notification.TYPE_MENTION:_('mentioned you')}
+
+        tmpl = "%(user)s %(action)s %(when)s"
+        data = dict(user=notification.created_by_user.username,
+                    action=_map[notification.type_],
+                    when=age(notification.created_on))
+        return tmpl % data

rhodecode/public/css/style.css

@@ -1,3484 +1,3510 b''
 html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td
 	{
 	border: 0;
 	outline: 0;
 	font-size: 100%;
 	vertical-align: baseline;
 	background: transparent;
 	margin: 0;
 	padding: 0;
 }
 
 body {
 	line-height: 1;
 	height: 100%;
 	background: url("../images/background.png") repeat scroll 0 0 #B0B0B0;
 	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 		Lucida Sans Unicode, Arial, sans-serif; font-size : 12px;
 	color: #000;
 	margin: 0;
 	padding: 0;
 	font-size: 12px;
 }
 
 ol,ul {
 	list-style: none;
 }
 
 blockquote,q {
 	quotes: none;
 }
 
 blockquote:before,blockquote:after,q:before,q:after {
 	content: none;
 }
 
 :focus {
 	outline: 0;
 }
 
 del {
 	text-decoration: line-through;
 }
 
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
 }
 
 html {
 	height: 100%;
 }
 
 a {
 	color: #003367;
 	text-decoration: none;
 	cursor: pointer;
 }
 
 a:hover {
 	color: #316293;
 	text-decoration: underline;
 }
 
 h1,h2,h3,h4,h5,h6 {
 	color: #292929;
 	font-weight: 700;
 }
 
 h1 {
 	font-size: 22px;
 }
 
 h2 {
 	font-size: 20px;
 }
 
 h3 {
 	font-size: 18px;
 }
 
 h4 {
 	font-size: 16px;
 }
 
 h5 {
 	font-size: 14px;
 }
 
 h6 {
 	font-size: 11px;
 }
 
 ul.circle {
 	list-style-type: circle;
 }
 
 ul.disc {
 	list-style-type: disc;
 }
 
 ul.square {
 	list-style-type: square;
 }
 
 ol.lower-roman {
 	list-style-type: lower-roman;
 }
 
 ol.upper-roman {
 	list-style-type: upper-roman;
 }
 
 ol.lower-alpha {
 	list-style-type: lower-alpha;
 }
 
 ol.upper-alpha {
 	list-style-type: upper-alpha;
 }
 
 ol.decimal {
 	list-style-type: decimal;
 }
 
 div.color {
 	clear: both;
 	overflow: hidden;
 	position: absolute;
 	background: #FFF;
 	margin: 7px 0 0 60px;
 	padding: 1px 1px 1px 0;
 }
 
 div.color a {
 	width: 15px;
 	height: 15px;
 	display: block;
 	float: left;
 	margin: 0 0 0 1px;
 	padding: 0;
 }
 
 div.options {
 	clear: both;
 	overflow: hidden;
 	position: absolute;
 	background: #FFF;
 	margin: 7px 0 0 162px;
 	padding: 0;
 }
 
 div.options a {
 	height: 1%;
 	display: block;
 	text-decoration: none;
 	margin: 0;
 	padding: 3px 8px;
 }
 
 .top-left-rounded-corner {
 	-webkit-border-top-left-radius: 8px;
 	-khtml-border-radius-topleft: 8px;
 	-moz-border-radius-topleft: 8px;
 	border-top-left-radius: 8px;
 }
 
 .top-right-rounded-corner {
 	-webkit-border-top-right-radius: 8px;
 	-khtml-border-radius-topright: 8px;
 	-moz-border-radius-topright: 8px;
 	border-top-right-radius: 8px;
 }
 
 .bottom-left-rounded-corner {
 	-webkit-border-bottom-left-radius: 8px;
 	-khtml-border-radius-bottomleft: 8px;
 	-moz-border-radius-bottomleft: 8px;
 	border-bottom-left-radius: 8px;
 }
 
 .bottom-right-rounded-corner {
 	-webkit-border-bottom-right-radius: 8px;
 	-khtml-border-radius-bottomright: 8px;
 	-moz-border-radius-bottomright: 8px;
 	border-bottom-right-radius: 8px;
 }
 
 #header {
 	margin: 0;
 	padding: 0 10px;
 }
 
 #header ul#logged-user {
 	margin-bottom: 5px !important;
 	-webkit-border-radius: 0px 0px 8px 8px;
 	-khtml-border-radius: 0px 0px 8px 8px;
 	-moz-border-radius: 0px 0px 8px 8px;
 	border-radius: 0px 0px 8px 8px;
 	height: 37px;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
         to(#eedc94) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
         color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
     background-image: -o-linear-gradient(top, #003b76, #00376e) );
     background-image: linear-gradient(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
         endColorstr='#00376e', GradientType=0 );
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 }
 
 #header ul#logged-user li {
 	list-style: none;
 	float: left;
 	margin: 8px 0 0;
 	padding: 4px 12px;
 	border-left: 1px solid #316293;
 }
 
 #header ul#logged-user li.first {
 	border-left: none;
 	margin: 4px;
 }
 
 #header ul#logged-user li.first div.gravatar {
 	margin-top: -2px;
 }
 
 #header ul#logged-user li.first div.account {
 	padding-top: 4px;
 	float: left;
 }
 
 #header ul#logged-user li.last {
 	border-right: none;
 }
 
 #header ul#logged-user li a {
 	color: #fff;
 	font-weight: 700;
 	text-decoration: none;
 }
 
 #header ul#logged-user li a:hover {
 	text-decoration: underline;
 }
 
 #header ul#logged-user li.highlight a {
 	color: #fff;
 }
 
 #header ul#logged-user li.highlight a:hover {
 	color: #FFF;
 }
 
 #header #header-inner {
 	min-height: 40px;
 	clear: both;
 	position: relative;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
         to(#eedc94) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
         color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
     background-image: -o-linear-gradient(top, #003b76, #00376e) );
     background-image: linear-gradient(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
         endColorstr='#00376e', GradientType=0 );
 	margin: 0;
 	padding: 0;
 	display: block;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 }
 #header #header-inner.hover{
 	position: fixed !important;
 	width: 100% !important;
 	margin-left: -10px !important;
 	z-index: 10000;
 	border-radius: 0px 0px 4px 4px;
 }
 #header #header-inner #home a {
 	height: 40px;
 	width: 46px;
 	display: block;
 	background: url("../images/button_home.png");
 	background-position: 0 0;
 	margin: 0;
 	padding: 0;
 }
 
 #header #header-inner #home a:hover {
 	background-position: 0 -40px;
 }
 
 #header #header-inner #logo {
 	float: left;
 	position: absolute;
 }
 
 #header #header-inner #logo h1 {
 	color: #FFF;
 	font-size: 18px;
 	margin: 10px 0 0 13px;
 	padding: 0;
 }
 
 #header #header-inner #logo a {
 	color: #fff;
 	text-decoration: none;
 }
 
 #header #header-inner #logo a:hover {
 	color: #bfe3ff;
 }
 
 #header #header-inner #quick,#header #header-inner #quick ul {
 	position: relative;
 	float: right;
 	list-style-type: none;
 	list-style-position: outside;
 	margin: 6px 5px 0 0;
 	padding: 0;
 }
 
 #header #header-inner #quick li {
 	position: relative;
 	float: left;
 	margin: 0 5px 0 0;
 	padding: 0;
 }
 
 #header #header-inner #quick li a {
 	top: 0;
 	left: 0;
 	height: 1%;
 	display: block;
 	clear: both;
 	overflow: hidden;
 	color: #FFF;
 	font-weight: 700;
 	text-decoration: none;
 	background: #369;
 	padding: 0;
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 }
 
 #header #header-inner #quick li span.short {
 	padding: 9px 6px 8px 6px;
 }
 
 #header #header-inner #quick li span {
 	top: 0;
 	right: 0;
 	height: 1%;
 	display: block;
 	float: left;
 	border-left: 1px solid #3f6f9f;
 	margin: 0;
 	padding: 10px 12px 8px 10px;
 }
 
 #header #header-inner #quick li span.normal {
 	border: none;
 	padding: 10px 12px 8px;
 }
 
 #header #header-inner #quick li span.icon {
 	top: 0;
 	left: 0;
 	border-left: none;
 	border-right: 1px solid #2e5c89;
 	padding: 8px 6px 4px;
 }
 
 #header #header-inner #quick li span.icon_short {
 	top: 0;
 	left: 0;
 	border-left: none;
 	border-right: 1px solid #2e5c89;
 	padding: 8px 6px 4px;
 }
 
 #header #header-inner #quick li span.icon img,#header #header-inner #quick li span.icon_short img
 	{
 	margin: 0px -2px 0px 0px;
 }
 
 #header #header-inner #quick li a:hover {
 	background: #4e4e4e no-repeat top left;
 }
 
 #header #header-inner #quick li a:hover span {
 	border-left: 1px solid #545454;
 }
 
 #header #header-inner #quick li a:hover span.icon,#header #header-inner #quick li a:hover span.icon_short
 	{
 	border-left: none;
 	border-right: 1px solid #464646;
 }
 
 #header #header-inner #quick ul {
 	top: 29px;
 	right: 0;
 	min-width: 200px;
 	display: none;
 	position: absolute;
 	background: #FFF;
 	border: 1px solid #666;
 	border-top: 1px solid #003367;
 	z-index: 100;
 	margin: 0;
 	padding: 0;
 }
 
 #header #header-inner #quick ul.repo_switcher {
 	max-height: 275px;
 	overflow-x: hidden;
 	overflow-y: auto;
 }
 
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs {
 	float: none;
 	margin: 0;
 	border-bottom: 2px solid #003367;
 }
 
 #header #header-inner #quick .repo_switcher_type {
 	position: absolute;
 	left: 0;
 	top: 9px;
 }
 
 #header #header-inner #quick li ul li {
 	border-bottom: 1px solid #ddd;
 }
 
 #header #header-inner #quick li ul li a {
 	width: 182px;
 	height: auto;
 	display: block;
 	float: left;
 	background: #FFF;
 	color: #003367;
 	font-weight: 400;
 	margin: 0;
 	padding: 7px 9px;
 }
 
 #header #header-inner #quick li ul li a:hover {
 	color: #000;
 	background: #FFF;
 }
 
 #header #header-inner #quick ul ul {
 	top: auto;
 }
 
 #header #header-inner #quick li ul ul {
 	right: 200px;
 	max-height: 275px;
 	overflow: auto;
 	overflow-x: hidden;
 	white-space: normal;
 }
 
 #header #header-inner #quick li ul li a.journal,#header #header-inner #quick li ul li a.journal:hover
 	{
 	background: url("../images/icons/book.png") no-repeat scroll 4px 9px
 		#FFF;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.private_repo,#header #header-inner #quick li ul li a.private_repo:hover
 	{
 	background: url("../images/icons/lock.png") no-repeat scroll 4px 9px
 		#FFF;
 	min-width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.public_repo,#header #header-inner #quick li ul li a.public_repo:hover
 	{
 	background: url("../images/icons/lock_open.png") no-repeat scroll 4px
 		9px #FFF;
 	min-width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.hg,#header #header-inner #quick li ul li a.hg:hover
 	{
 	background: url("../images/icons/hgicon.png") no-repeat scroll 4px 9px
 		#FFF;
 	min-width: 167px;
 	margin: 0 0 0 14px;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.git,#header #header-inner #quick li ul li a.git:hover
 	{
 	background: url("../images/icons/giticon.png") no-repeat scroll 4px 9px
 		#FFF;
 	min-width: 167px;
 	margin: 0 0 0 14px;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.repos,#header #header-inner #quick li ul li a.repos:hover
 	{
 	background: url("../images/icons/database_edit.png") no-repeat scroll
 		4px 9px #FFF;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.repos_groups,#header #header-inner #quick li ul li a.repos_groups:hover
 	{
 	background: url("../images/icons/database_link.png") no-repeat scroll
 		4px 9px #FFF;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.users,#header #header-inner #quick li ul li a.users:hover
 	{
 	background: #FFF url("../images/icons/user_edit.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.groups,#header #header-inner #quick li ul li a.groups:hover
 	{
 	background: #FFF url("../images/icons/group_edit.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.settings,#header #header-inner #quick li ul li a.settings:hover
 	{
 	background: #FFF url("../images/icons/cog.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.permissions,#header #header-inner #quick li ul li a.permissions:hover
 	{
 	background: #FFF url("../images/icons/key.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.ldap,#header #header-inner #quick li ul li a.ldap:hover
 	{
 	background: #FFF url("../images/icons/server_key.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.fork,#header #header-inner #quick li ul li a.fork:hover
 	{
 	background: #FFF url("../images/icons/arrow_divide.png") no-repeat 4px
 		9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.search,#header #header-inner #quick li ul li a.search:hover
 	{
 	background: #FFF url("../images/icons/search_16.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.delete,#header #header-inner #quick li ul li a.delete:hover
 	{
 	background: #FFF url("../images/icons/delete.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover
 	{
 	background: #FFF url("../images/icons/arrow_branch.png") no-repeat 4px
 		9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover
 	{
 	background: #FFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 #header #header-inner #quick li ul li a.admin,#header #header-inner #quick li ul li a.admin:hover
 	{
 	background: #FFF url("../images/icons/cog_edit.png") no-repeat 4px 9px;
 	width: 167px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 }
 
 .groups_breadcrumbs a {
 	color: #fff;
 }
 
 .groups_breadcrumbs a:hover {
 	color: #bfe3ff;
 	text-decoration: none;
 }
 
 .quick_repo_menu {
 	background: #FFF url("../images/vertical-indicator.png") 8px 50%
 		no-repeat !important;
 	cursor: pointer;
 	width: 8px;
 }
 
 .quick_repo_menu.active {
 	background: #FFF url("../images/horizontal-indicator.png") 4px 50%
 		no-repeat !important;
 	cursor: pointer;
 }
 
 .quick_repo_menu .menu_items {
 	margin-top: 6px;
 	width: 150px;
 	position: absolute;
 	background-color: #FFF;
 	background: none repeat scroll 0 0 #FFFFFF;
 	border-color: #003367 #666666 #666666;
 	border-right: 1px solid #666666;
 	border-style: solid;
 	border-width: 1px;
 	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 
 .quick_repo_menu .menu_items li {
 	padding: 0 !important;
 }
 
 .quick_repo_menu .menu_items a {
 	display: block;
 	padding: 4px 12px 4px 8px;
 }
 
 .quick_repo_menu .menu_items a:hover {
 	background-color: #EEE;
 	text-decoration: none;
 }
 
 .quick_repo_menu .menu_items .icon img {
 	margin-bottom: -2px;
 }
 
 .quick_repo_menu .menu_items.hidden {
 	display: none;
 }
 
 #content #left {
 	left: 0;
 	width: 280px;
 	position: absolute;
 }
 
 #content #right {
 	margin: 0 60px 10px 290px;
 }
 
 #content div.box {
 	clear: both;
 	overflow: hidden;
 	background: #fff;
 	margin: 0 0 10px;
 	padding: 0 0 10px;
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 }
 
 #content div.box-left {
 	width: 49%;
 	clear: none;
 	float: left;
 	margin: 0 0 10px;
 }
 
 #content div.box-right {
 	width: 49%;
 	clear: none;
 	float: right;
 	margin: 0 0 10px;
 }
 
 #content div.box div.title {
 	clear: both;
 	overflow: hidden;
 	background-color: #eedc94;
 	background-repeat: repeat-x;
 	background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
 		to(#eedc94) );
 	background-image: -moz-linear-gradient(top, #003b76, #00376e);
 	background-image: -ms-linear-gradient(top, #003b76, #00376e);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
 		color-stop(100%, #00376e) );
 	background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
 	background-image: -o-linear-gradient(top, #003b76, #00376e) );
 	background-image: linear-gradient(top, #003b76, #00376e);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
 		endColorstr='#00376e', GradientType=0 );
 	margin: 0 0 20px;
 	padding: 0;
 }
 
 #content div.box div.title h5 {
 	float: left;
 	border: none;
 	color: #fff;
 	text-transform: uppercase;
 	margin: 0;
 	padding: 11px 0 11px 10px;
 }
 
 #content div.box div.title ul.links li {
 	list-style: none;
 	float: left;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.title ul.links li a {
 	border-left: 1px solid #316293;
 	color: #FFFFFF;
 	display: block;
 	float: left;
 	font-size: 13px;
 	font-weight: 700;
 	height: 1%;
 	margin: 0;
 	padding: 11px 22px 12px;
 	text-decoration: none;
 }
 
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6
 	{
 	clear: both;
 	overflow: hidden;
 	border-bottom: 1px solid #DDD;
 	margin: 10px 20px;
 	padding: 0 0 15px;
 }
 
 #content div.box p {
 	color: #5f5f5f;
 	font-size: 12px;
 	line-height: 150%;
 	margin: 0 24px 10px;
 	padding: 0;
 }
 
 #content div.box blockquote {
 	border-left: 4px solid #DDD;
 	color: #5f5f5f;
 	font-size: 11px;
 	line-height: 150%;
 	margin: 0 34px;
 	padding: 0 0 0 14px;
 }
 
 #content div.box blockquote p {
 	margin: 10px 0;
 	padding: 0;
 }
 
 #content div.box dl {
 	margin: 10px 24px;
 }
 
 #content div.box dt {
 	font-size: 12px;
 	margin: 0;
 }
 
 #content div.box dd {
 	font-size: 12px;
 	margin: 0;
 	padding: 8px 0 8px 15px;
 }
 
 #content div.box li {
 	font-size: 12px;
 	padding: 4px 0;
 }
 
 #content div.box ul.disc,#content div.box ul.circle {
 	margin: 10px 24px 10px 38px;
 }
 
 #content div.box ul.square {
 	margin: 10px 24px 10px 40px;
 }
 
 #content div.box img.left {
 	border: none;
 	float: left;
 	margin: 10px 10px 10px 0;
 }
 
 #content div.box img.right {
 	border: none;
 	float: right;
 	margin: 10px 0 10px 10px;
 }
 
 #content div.box div.messages {
 	clear: both;
 	overflow: hidden;
 	margin: 0 20px;
 	padding: 0;
 }
 
 #content div.box div.message {
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 10px 0;
 }
 
 #content div.box div.message a {
 	font-weight: 400 !important;
 }
 
 #content div.box div.message div.image {
 	float: left;
 	margin: 9px 0 0 5px;
 	padding: 6px;
 }
 
 #content div.box div.message div.image img {
 	vertical-align: middle;
 	margin: 0;
 }
 
 #content div.box div.message div.text {
 	float: left;
 	margin: 0;
 	padding: 9px 6px;
 }
 
 #content div.box div.message div.dismiss a {
 	height: 16px;
 	width: 16px;
 	display: block;
 	background: url("../images/icons/cross.png") no-repeat;
 	margin: 15px 14px 0 0;
 	padding: 0;
 }
 
 #content div.box div.message div.text h1,#content div.box div.message div.text h2,#content div.box div.message div.text h3,#content div.box div.message div.text h4,#content div.box div.message div.text h5,#content div.box div.message div.text h6
 	{
 	border: none;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.message div.text span {
 	height: 1%;
 	display: block;
 	margin: 0;
 	padding: 5px 0 0;
 }
 
 #content div.box div.message-error {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #FBE3E4;
 	border: 1px solid #FBC2C4;
 	color: #860006;
 }
 
 #content div.box div.message-error h6 {
 	color: #860006;
 }
 
 #content div.box div.message-warning {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #FFF6BF;
 	border: 1px solid #FFD324;
 	color: #5f5200;
 }
 
 #content div.box div.message-warning h6 {
 	color: #5f5200;
 }
 
 #content div.box div.message-notice {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #8FBDE0;
 	border: 1px solid #6BACDE;
 	color: #003863;
 }
 
 #content div.box div.message-notice h6 {
 	color: #003863;
 }
 
 #content div.box div.message-success {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #E6EFC2;
 	border: 1px solid #C6D880;
 	color: #4e6100;
 }
 
 #content div.box div.message-success h6 {
 	color: #4e6100;
 }
 
 #content div.box div.form div.fields div.field {
 	height: 1%;
 	border-bottom: 1px solid #DDD;
 	clear: both;
 	margin: 0;
 	padding: 10px 0;
 }
 
 #content div.box div.form div.fields div.field-first {
 	padding: 0 0 10px;
 }
 
 #content div.box div.form div.fields div.field-noborder {
 	border-bottom: 0 !important;
 }
 
 #content div.box div.form div.fields div.field span.error-message {
 	height: 1%;
 	display: inline-block;
 	color: red;
 	margin: 8px 0 0 4px;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field span.success {
 	height: 1%;
 	display: block;
 	color: #316309;
 	margin: 8px 0 0;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.label {
 	left: 70px;
 	width: 155px;
 	position: absolute;
 	margin: 0;
 	padding: 8px 0 0 5px;
 }
 
 #content div.box-left div.form div.fields div.field div.label,#content div.box-right div.form div.fields div.field div.label
 	{
 	clear: both;
 	overflow: hidden;
 	left: 0;
 	width: auto;
 	position: relative;
 	margin: 0;
 	padding: 0 0 8px;
 }
 
 #content div.box div.form div.fields div.field div.label-select {
 	padding: 5px 0 0 5px;
 }
 
 #content div.box-left div.form div.fields div.field div.label-select,#content div.box-right div.form div.fields div.field div.label-select
 	{
 	padding: 0 0 8px;
 }
 
 #content div.box-left div.form div.fields div.field div.label-textarea,#content div.box-right div.form div.fields div.field div.label-textarea
 	{
 	padding: 0 0 8px !important;
 }
 
 #content div.box div.form div.fields div.field div.label label,div.label label
 	{
 	color: #393939;
 	font-weight: 700;
 }
 
 #content div.box div.form div.fields div.field div.input {
 	margin: 0 0 0 200px;
 }
 
 #content div.box div.form div.fields div.field div.file {
 	margin: 0 0 0 200px;
 }
 
 #content div.box-left div.form div.fields div.field div.input,#content div.box-right div.form div.fields div.field div.input
 	{
 	margin: 0 0 0 0px;
 }
 
 #content div.box div.form div.fields div.field div.input input {
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
 }
 
 #content div.box div.form div.fields div.field div.file input {
 	background: none repeat scroll 0 0 #FFFFFF;
 	border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;
 	border-style: solid;
 	border-width: 1px;
 	color: #000000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
 }
 
 #content div.box div.form div.fields div.field div.input input.small {
 	width: 30%;
 }
 
 #content div.box div.form div.fields div.field div.input input.medium {
 	width: 55%;
 }
 
 #content div.box div.form div.fields div.field div.input input.large {
 	width: 85%;
 }
 
 #content div.box div.form div.fields div.field div.input input.date {
 	width: 177px;
 }
 
 #content div.box div.form div.fields div.field div.input input.button {
 	background: #D4D0C8;
 	border-top: 1px solid #FFF;
 	border-left: 1px solid #FFF;
 	border-right: 1px solid #404040;
 	border-bottom: 1px solid #404040;
 	color: #000;
 	margin: 0;
 	padding: 4px 8px;
 }
 
 #content div.box div.form div.fields div.field div.textarea {
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	margin: 0 0 0 200px;
 	padding: 10px;
 }
 
 #content div.box div.form div.fields div.field div.textarea-editor {
 	border: 1px solid #ddd;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.textarea textarea {
 	width: 100%;
 	height: 220px;
 	overflow: hidden;
 	background: #FFF;
 	color: #000;
 	font-size: 11px;
 	outline: none;
 	border-width: 0;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box-left div.form div.fields div.field div.textarea textarea,#content div.box-right div.form div.fields div.field div.textarea textarea
 	{
 	width: 100%;
 	height: 100px;
 }
 
 #content div.box div.form div.fields div.field div.textarea table {
 	width: 100%;
 	border: none;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.textarea table td {
 	background: #DDD;
 	border: none;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.textarea table td table
 	{
 	width: auto;
 	border: none;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.textarea table td table td
 	{
 	font-size: 11px;
 	padding: 5px 5px 5px 0;
 }
 
 #content div.box div.form div.fields div.field input[type=text]:focus,#content div.box div.form div.fields div.field input[type=password]:focus,#content div.box div.form div.fields div.field input[type=file]:focus,#content div.box div.form div.fields div.field textarea:focus,#content div.box div.form div.fields div.field select:focus
 	{
 	background: #f6f6f6;
 	border-color: #666;
 }
 
 div.form div.fields div.field div.button {
 	margin: 0;
 	padding: 0 0 0 8px;
 }
 #content div.box table.noborder {
 	border: 1px solid transparent;
 }
 
 #content div.box table {
 	width: 100%;
 	border-collapse: separate;
 	margin: 0;
 	padding: 0;
 	border: 1px solid #eee;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;	
 }
 
 #content div.box table th {
 	background: #eee;
 	border-bottom: 1px solid #ddd;
 	padding: 5px 0px 5px 5px;
 }
 
 #content div.box table th.left {
 	text-align: left;
 }
 
 #content div.box table th.right {
 	text-align: right;
 }
 
 #content div.box table th.center {
 	text-align: center;
 }
 
 #content div.box table th.selected {
 	vertical-align: middle;
 	padding: 0;
 }
 
 #content div.box table td {
 	background: #fff;
 	border-bottom: 1px solid #cdcdcd;
 	vertical-align: middle;
 	padding: 5px;
 }
 
 #content div.box table tr.selected td {
 	background: #FFC;
 }
 
 #content div.box table td.selected {
 	width: 3%;
 	text-align: center;
 	vertical-align: middle;
 	padding: 0;
 }
 
 #content div.box table td.action {
 	width: 45%;
 	text-align: left;
 }
 
 #content div.box table td.date {
 	width: 33%;
 	text-align: center;
 }
 
 #content div.box div.action {
 	float: right;
 	background: #FFF;
 	text-align: right;
 	margin: 10px 0 0;
 	padding: 0;
 }
 
 #content div.box div.action select {
 	font-size: 11px;
 	margin: 0;
 }
 
 #content div.box div.action .ui-selectmenu {
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.pagination {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	margin: 10px 0 0;
 	padding: 0;
 }
 
 #content div.box div.pagination ul.pager {
 	float: right;
 	text-align: right;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.pagination ul.pager li {
 	height: 1%;
 	float: left;
 	list-style: none;
 	background: #ebebeb url("../images/pager.png") repeat-x;
 	border-top: 1px solid #dedede;
 	border-left: 1px solid #cfcfcf;
 	border-right: 1px solid #c4c4c4;
 	border-bottom: 1px solid #c4c4c4;
 	color: #4A4A4A;
 	font-weight: 700;
 	margin: 0 0 0 4px;
 	padding: 0;
 }
 
 #content div.box div.pagination ul.pager li.separator {
 	padding: 6px;
 }
 
 #content div.box div.pagination ul.pager li.current {
 	background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #bebebe;
 	border-right: 1px solid #b1b1b1;
 	border-bottom: 1px solid #afafaf;
 	color: #515151;
 	padding: 6px;
 }
 
 #content div.box div.pagination ul.pager li a {
 	height: 1%;
 	display: block;
 	float: left;
 	color: #515151;
 	text-decoration: none;
 	margin: 0;
 	padding: 6px;
 }
 
 #content div.box div.pagination ul.pager li a:hover,#content div.box div.pagination ul.pager li a:active
 	{
 	background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #bebebe;
 	border-right: 1px solid #b1b1b1;
 	border-bottom: 1px solid #afafaf;
 	margin: -1px;
 }
 
 #content div.box div.pagination-wh {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	text-align: right;
 	margin: 10px 0 0;
 	padding: 0;
 }
 
 #content div.box div.pagination-right {
 	float: right;
 }
 
 #content div.box div.pagination-wh a,#content div.box div.pagination-wh span.pager_dotdot
 	{
 	height: 1%;
 	float: left;
 	background: #ebebeb url("../images/pager.png") repeat-x;
 	border-top: 1px solid #dedede;
 	border-left: 1px solid #cfcfcf;
 	border-right: 1px solid #c4c4c4;
 	border-bottom: 1px solid #c4c4c4;
 	color: #4A4A4A;
 	font-weight: 700;
 	margin: 0 0 0 4px;
 	padding: 6px;
 }
 
 #content div.box div.pagination-wh span.pager_curpage {
 	height: 1%;
 	float: left;
 	background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #bebebe;
 	border-right: 1px solid #b1b1b1;
 	border-bottom: 1px solid #afafaf;
 	color: #515151;
 	font-weight: 700;
 	margin: 0 0 0 4px;
 	padding: 6px;
 }
 
 #content div.box div.pagination-wh a:hover,#content div.box div.pagination-wh a:active
 	{
 	background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #bebebe;
 	border-right: 1px solid #b1b1b1;
 	border-bottom: 1px solid #afafaf;
 	text-decoration: none;
 }
 
 #content div.box div.traffic div.legend {
 	clear: both;
 	overflow: hidden;
 	border-bottom: 1px solid #ddd;
 	margin: 0 0 10px;
 	padding: 0 0 10px;
 }
 
 #content div.box div.traffic div.legend h6 {
 	float: left;
 	border: none;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.traffic div.legend li {
 	list-style: none;
 	float: left;
 	font-size: 11px;
 	margin: 0;
 	padding: 0 8px 0 4px;
 }
 
 #content div.box div.traffic div.legend li.visits {
 	border-left: 12px solid #edc240;
 }
 
 #content div.box div.traffic div.legend li.pageviews {
 	border-left: 12px solid #afd8f8;
 }
 
 #content div.box div.traffic table {
 	width: auto;
 }
 
 #content div.box div.traffic table td {
 	background: transparent;
 	border: none;
 	padding: 2px 3px 3px;
 }
 
 #content div.box div.traffic table td.legendLabel {
 	padding: 0 3px 2px;
 }
 
 #summary {
 	
 }
 
 #summary .desc {
 	white-space: pre;
 	width: 100%;
 }
 
 #summary .repo_name {
 	font-size: 1.6em;
 	font-weight: bold;
 	vertical-align: baseline;
 	clear: right
 }
 
 #footer {
 	clear: both;
 	overflow: hidden;
 	text-align: right;
 	margin: 0;
 	padding: 0 10px 4px;
 	margin: -10px 0 0;
 }
 
 #footer div#footer-inner {
 	background-color: #eedc94; background-repeat : repeat-x;
 	background-image : -khtml-gradient( linear, left top, left bottom,
 	from( #fceec1), to( #eedc94)); background-image : -moz-linear-gradient(
 	top, #003b76, #00376e); background-image : -ms-linear-gradient( top,
 	#003b76, #00376e); background-image : -webkit-gradient( linear, left
 	top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e));
 	background-image : -webkit-linear-gradient( top, #003b76, #00376e));
 	background-image : -o-linear-gradient( top, #003b76, #00376e));
 	background-image : linear-gradient( top, #003b76, #00376e); filter :
 	progid : DXImageTransform.Microsoft.gradient ( startColorstr =
 	'#003b76', endColorstr = '#00376e', GradientType = 0);
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 	background-repeat: repeat-x;
 	background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
 		to(#eedc94) );
 	background-image: -moz-linear-gradient(top, #003b76, #00376e);
 	background-image: -ms-linear-gradient(top, #003b76, #00376e);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
 		color-stop(100%, #00376e) );
 	background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
 	background-image: -o-linear-gradient(top, #003b76, #00376e) );
 	background-image: linear-gradient(top, #003b76, #00376e);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
 		endColorstr='#00376e', GradientType=0 );
 }
 
 #footer div#footer-inner p {
 	padding: 15px 25px 15px 0;
 	color: #FFF;
 	font-weight: 700;
 }
 
 #footer div#footer-inner .footer-link {
 	float: left;
 	padding-left: 10px;
 }
 
 #footer div#footer-inner .footer-link a,#footer div#footer-inner .footer-link-right a
 	{
 	color: #FFF;
 }
 
 #login div.title {
 	width: 420px;
 	clear: both;
 	overflow: hidden;
 	position: relative;
 	background-color: #eedc94; background-repeat : repeat-x;
 	background-image : -khtml-gradient( linear, left top, left bottom,
 	from( #fceec1), to( #eedc94)); background-image : -moz-linear-gradient(
 	top, #003b76, #00376e); background-image : -ms-linear-gradient( top,
 	#003b76, #00376e); background-image : -webkit-gradient( linear, left
 	top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e));
 	background-image : -webkit-linear-gradient( top, #003b76, #00376e));
 	background-image : -o-linear-gradient( top, #003b76, #00376e));
 	background-image : linear-gradient( top, #003b76, #00376e); filter :
 	progid : DXImageTransform.Microsoft.gradient ( startColorstr =
 	'#003b76', endColorstr = '#00376e', GradientType = 0);
 	margin: 0 auto;
 	padding: 0;
 	background-repeat: repeat-x;
 	background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
 		to(#eedc94) );
 	background-image: -moz-linear-gradient(top, #003b76, #00376e);
 	background-image: -ms-linear-gradient(top, #003b76, #00376e);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
 		color-stop(100%, #00376e) );
 	background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
 	background-image: -o-linear-gradient(top, #003b76, #00376e) );
 	background-image: linear-gradient(top, #003b76, #00376e);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
 		endColorstr='#00376e', GradientType=0 );
 }
 
 #login div.inner {
 	width: 380px;
 	background: #FFF url("../images/login.png") no-repeat top left;
 	border-top: none;
 	border-bottom: none;
 	margin: 0 auto;
 	padding: 20px;
 }
 
 #login div.form div.fields div.field div.label {
 	width: 173px;
 	float: left;
 	text-align: right;
 	margin: 2px 10px 0 0;
 	padding: 5px 0 0 5px;
 }
 
 #login div.form div.fields div.field div.input input {
 	width: 176px;
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
 }
 
 #login div.form div.fields div.buttons {
 	clear: both;
 	overflow: hidden;
 	border-top: 1px solid #DDD;
 	text-align: right;
 	margin: 0;
 	padding: 10px 0 0;
 }
 
 #login div.form div.links {
 	clear: both;
 	overflow: hidden;
 	margin: 10px 0 0;
 	padding: 0 0 2px;
 }
 
 #quick_login {
 	top: 31px;
 	background-color: rgb(0, 51, 103);
 	z-index: 999;
 	height: 150px;
 	position: absolute;
 	margin-left: -16px;
 	width: 281px;
 	-webkit-border-radius: 0px 0px 4px 4px;
 	-khtml-border-radius: 0px 0px 4px 4px;
 	-moz-border-radius: 0px 0px 4px 4px;
 	border-radius: 0px 0px 4px 4px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 }
 
 #quick_login .password_forgoten {
 	padding-right: 10px;
 	padding-top: 0px;
 	float: left;
 }
 
 #quick_login .password_forgoten a {
 	font-size: 10px
 }
 
 #quick_login .register {
 	padding-right: 10px;
 	padding-top: 5px;
 	float: left;
 }
 
 #quick_login .register a {
 	font-size: 10px
 }
 
 #quick_login div.form div.fields {
 	padding-top: 2px;
 	padding-left: 10px;
 }
 
 #quick_login div.form div.fields div.field {
 	padding: 5px;
 }
 
 #quick_login div.form div.fields div.field div.label label {
 	color: #fff;
 	padding-bottom: 3px;
 }
 
 #quick_login div.form div.fields div.field div.input input {
 	width: 236px;
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 11px;
 	margin: 0;
 	padding: 5px 7px 4px;
 }
 
 #quick_login div.form div.fields div.buttons {
 	clear: both;
 	overflow: hidden;
 	text-align: right;
 	margin: 0;
 	padding: 10px 14px 0px 5px;
 }
 
 #quick_login div.form div.links {
 	clear: both;
 	overflow: hidden;
 	margin: 10px 0 0;
 	padding: 0 0 2px;
 }
 
 #register div.title {
 	clear: both;
 	overflow: hidden;
 	position: relative;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
         to(#eedc94) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
         color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
     background-image: -o-linear-gradient(top, #003b76, #00376e) );
     background-image: linear-gradient(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
         endColorstr='#00376e', GradientType=0 );
 	margin: 0 auto;
 	padding: 0;
 }
 
 #register div.inner {
 	background: #FFF;
 	border-top: none;
 	border-bottom: none;
 	margin: 0 auto;
 	padding: 20px;
 }
 
 #register div.form div.fields div.field div.label {
 	width: 135px;
 	float: left;
 	text-align: right;
 	margin: 2px 10px 0 0;
 	padding: 5px 0 0 5px;
 }
 
 #register div.form div.fields div.field div.input input {
 	width: 300px;
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
 }
 
 #register div.form div.fields div.buttons {
 	clear: both;
 	overflow: hidden;
 	border-top: 1px solid #DDD;
 	text-align: left;
 	margin: 0;
 	padding: 10px 0 0 150px;
 }
 
 #register div.form div.activation_msg {
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
 
 #journal .journal_day {
 	font-size: 20px;
 	padding: 10px 0px;
 	border-bottom: 2px solid #DDD;
 	margin-left: 10px;
 	margin-right: 10px;
 }
 
 #journal .journal_container {
 	padding: 5px;
 	clear: both;
 	margin: 0px 5px 0px 10px;
 }
 
 #journal .journal_action_container {
 	padding-left: 38px;
 }
 
 #journal .journal_user {
 	color: #747474;
 	font-size: 14px;
 	font-weight: bold;
 	height: 30px;
 }
 
 #journal .journal_icon {
 	clear: both;
 	float: left;
 	padding-right: 4px;
 	padding-top: 3px;
 }
 
 #journal .journal_action {
 	padding-top: 4px;
 	min-height: 2px;
 	float: left
 }
 
 #journal .journal_action_params {
 	clear: left;
 	padding-left: 22px;
 }
 
 #journal .journal_repo {
 	float: left;
 	margin-left: 6px;
 	padding-top: 3px;
 }
 
 #journal .date {
 	clear: both;
 	color: #777777;
 	font-size: 11px;
 	padding-left: 22px;
 }
 
 #journal .journal_repo .journal_repo_name {
 	font-weight: bold;
 	font-size: 1.1em;
 }
 
 #journal .compare_view {
 	padding: 5px 0px 5px 0px;
 	width: 95px;
 }
 
 .journal_highlight {
 	font-weight: bold;
 	padding: 0 2px;
 	vertical-align: bottom;
 }
 
 .trending_language_tbl,.trending_language_tbl td {
 	border: 0 !important;
 	margin: 0 !important;
 	padding: 0 !important;
 }
 
 .trending_language {
 	background-color: #003367;
 	color: #FFF;
 	display: block;
 	min-width: 20px;
 	text-decoration: none;
 	height: 12px;
 	margin-bottom: 4px;
 	margin-left: 5px;
 	white-space: pre;
 	padding: 3px;
 }
 
 h3.files_location {
 	font-size: 1.8em;
 	font-weight: 700;
 	border-bottom: none !important;
 	margin: 10px 0 !important;
 }
 
 #files_data dl dt {
 	float: left;
 	width: 115px;
 	margin: 0 !important;
 	padding: 5px;
 }
 
 #files_data dl dd {
 	margin: 0 !important;
 	padding: 5px !important;
 }
 
 #changeset_content {
 	border: 1px solid #CCC;
 	padding: 5px;
 }
 
 #changeset_compare_view_content {
 	border: 1px solid #CCC;
 	padding: 5px;
 }
 
 #changeset_content .container {
 	min-height: 120px;
 	font-size: 1.2em;
 	overflow: hidden;
 }
 
 #changeset_compare_view_content .compare_view_commits {
 	width: auto !important;
 }
 
 #changeset_compare_view_content .compare_view_commits td {
 	padding: 0px 0px 0px 12px !important;
 }
 
 #changeset_content .container .right {
 	float: right;
 	width: 25%;
 	text-align: right;
 }
 
 #changeset_content .container .left .message {
 	font-style: italic;
 	color: #556CB5;
 	white-space: pre-wrap;
 }
 
 .cs_files .cur_cs {
 	margin: 10px 2px;
 	font-weight: bold;
 }
 
 .cs_files .node {
 	float: left;
 }
 
 .cs_files .changes {
 	float: right;
 	color:#003367;
 	
 }
 
 .cs_files .changes .added {
 	background-color: #BBFFBB;
 	float: left;
 	text-align: center;
 	font-size: 9px;
     padding: 2px 0px 2px 0px;
 }
 
 .cs_files .changes .deleted {
 	background-color: #FF8888;
 	float: left;
 	text-align: center;
 	font-size: 9px;
     padding: 2px 0px 2px 0px;
 }
 
 .cs_files .cs_added {
 	background: url("../images/icons/page_white_add.png") no-repeat scroll
 		3px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
 }
 
 .cs_files .cs_changed {
 	background: url("../images/icons/page_white_edit.png") no-repeat scroll
 		3px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
 }
 
 .cs_files .cs_removed {
 	background: url("../images/icons/page_white_delete.png") no-repeat
 		scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
 }
 
 #graph {
 	overflow: hidden;
 }
 
 #graph_nodes {
 	float: left;
 	margin-right: -6px;
 	margin-top: 0px;
 }
 
 #graph_content {
 	width: 800px;
 	float: left;
 }
 
 #graph_content .container_header {
 	border: 1px solid #CCC;
 	padding: 10px;
 	height: 45px;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;	
 }
 
 #graph_content #rev_range_container {
 	padding: 10px 0px;
 	clear: both;
 }
 
 #graph_content .container {
 	border-bottom: 1px solid #CCC;
 	border-left: 1px solid #CCC;
 	border-right: 1px solid #CCC;
 	min-height: 70px;
 	overflow: hidden;
 	font-size: 1.2em;
 }
 
 #graph_content .container .right {
 	float: right;
 	width: 28%;
 	text-align: right;
 	padding-bottom: 5px;
 }
 
 #graph_content .container .left .date {
 	font-weight: 700;
 	padding-bottom: 5px;
 }
 
 #graph_content .container .left .date span {
 	vertical-align: text-top;
 }
 
 #graph_content .container .left .author {
 	height: 22px;
 }
 
 #graph_content .container .left .author .user {
 	color: #444444;
 	float: left;
 	font-size: 12px;
 	margin-left: -4px;
 	margin-top: 4px;
 }
 
 #graph_content .container .left .message {
 	font-size: 100%;
 	padding-top: 3px;
 	white-space: pre-wrap;
 }
 
 #graph_content .container .left .message a:hover{
 	text-decoration: none;
 }
 
 .right div {
 	clear: both;
 }
 
 .right .changes .changed_total {
 	border: 0px solid #DDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 45px;
 	cursor: pointer;
 	background: #FD8;
 	font-weight: bold;
 	-webkit-border-radius: 0px 0px 0px 6px;
 	-moz-border-radius: 0px 0px 0px 6px;
 	border-radius: 0px 0px 0px 6px;
 	padding: 2px;	
 }
 
 .right .changes .added,.changed,.removed {
 	border: 1px solid #DDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 15px;
 	cursor: help;
 }
 
 .right .changes .large {
 	border: 1px solid #DDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 45px;
 	cursor: help;
 	background: #54A9F7;
 }
 
 .right .changes .added {
 	background: #BFB;
 }
 
 .right .changes .changed {
 	background: #FD8;
 }
 
 .right .changes .removed {
 	background: #F88;
 }
 
 .right .merge {
 	vertical-align: top;
 	font-size: 0.75em;
 	font-weight: 700;
 }
 
 .right .parent {
 	font-size: 90%;
 	font-family: monospace;
 	padding: 2px 2px 2px 2px;
 }
 .right .logtags{
 	padding: 2px 2px 2px 2px;
 }
 .right .logtags .branchtag,.logtags .branchtag {
   padding: 1px 3px 2px;
   background-color: #bfbfbf;
   font-size: 9.75px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
   padding-left:4px;
 }
 .right .logtags .branchtag a:hover,.logtags .branchtag a:hover{
 	text-decoration: none;
 }
 .right .logtags .tagtag,.logtags .tagtag {
   padding: 1px 3px 2px;
   background-color: #62cffc;
   font-size: 9.75px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
 .right .logtags .tagtag a:hover,.logtags .tagtag a:hover{
     text-decoration: none;
 }
 div.browserblock {
 	overflow: hidden;
 	border: 1px solid #ccc;
 	background: #f8f8f8;
 	font-size: 100%;
 	line-height: 125%;
 	padding: 0;
 }
 
 div.browserblock .browser-header {
 	background: #FFF;
 	padding: 10px 0px 15px 0px;
 	width: 100%;
 }
 
 div.browserblock .browser-nav {
 	float: left
 }
 
 div.browserblock .browser-branch {
 	float: left;
 }
 
 div.browserblock .browser-branch label {
 	color: #4A4A4A;
 	vertical-align: text-top;
 }
 
 div.browserblock .browser-header span {
 	margin-left: 5px;
 	font-weight: 700;
 }
 
 div.browserblock .browser-search {
 	clear: both;
 	padding: 8px 8px 0px 5px;
 	height: 20px;
 }
 
 div.browserblock #node_filter_box {
 	
 }
 
 div.browserblock .search_activate {
 	float: left
 }
 
 div.browserblock .add_node {
 	float: left;
 	padding-left: 5px;
 }
 
 div.browserblock .search_activate a:hover,div.browserblock .add_node a:hover
 	{
 	text-decoration: none !important;
 }
 
 div.browserblock .browser-body {
 	background: #EEE;
 	border-top: 1px solid #CCC;
 }
 
 table.code-browser {
 	border-collapse: collapse;
 	width: 100%;
 }
 
 table.code-browser tr {
 	margin: 3px;
 }
 
 table.code-browser thead th {
 	background-color: #EEE;
 	height: 20px;
 	font-size: 1.1em;
 	font-weight: 700;
 	text-align: left;
 	padding-left: 10px;
 }
 
 table.code-browser tbody td {
 	padding-left: 10px;
 	height: 20px;
 }
 
 table.code-browser .browser-file {
 	background: url("../images/icons/document_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
 }
 
 .diffblock .changeset_file {
 	background: url("../images/icons/file.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 22px;
 	text-align: left;
 	font-size: 14px;
 }
 
 .diffblock .changeset_header {
 	margin-left: 6px !important;
 }
 
 table.code-browser .browser-dir {
 	background: url("../images/icons/folder_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
 }
 
 .box .search {
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 0 20px 10px;
 }
 
 .box .search div.search_path {
 	background: none repeat scroll 0 0 #EEE;
 	border: 1px solid #CCC;
 	color: blue;
 	margin-bottom: 10px;
 	padding: 10px 0;
 }
 
 .box .search div.search_path div.link {
 	font-weight: 700;
 	margin-left: 25px;
 }
 
 .box .search div.search_path div.link a {
 	color: #003367;
 	cursor: pointer;
 	text-decoration: none;
 }
 
 #path_unlock {
 	color: red;
 	font-size: 1.2em;
 	padding-left: 4px;
 }
 
 .info_box span {
 	margin-left: 3px;
 	margin-right: 3px;
 }
 
 .info_box .rev {
 	color: #003367;
 	font-size: 1.6em;
 	font-weight: bold;
 	vertical-align: sub;
 }
 
 .info_box input#at_rev,.info_box input#size {
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 12px;
 	margin: 0;
 	padding: 1px 5px 1px;
 }
 
 .info_box input#view {
 	text-align: center;
 	padding: 4px 3px 2px 2px;
 }
 
 .yui-overlay,.yui-panel-container {
 	visibility: hidden;
 	position: absolute;
 	z-index: 2;
 }
 
 .yui-tt {
 	visibility: hidden;
 	position: absolute;
 	color: #666;
 	background-color: #FFF;
 	border: 2px solid #003367;
 	font: 100% sans-serif;
 	width: auto;
 	opacity: 1px;
 	padding: 8px;
 	white-space: pre-wrap;
 	-webkit-border-radius: 8px 8px 8px 8px;
 	-khtml-border-radius: 8px 8px 8px 8px;
 	-moz-border-radius: 8px 8px 8px 8px;
 	border-radius: 8px 8px 8px 8px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 }
 
 .ac {
 	vertical-align: top;
 }
 
 .ac .yui-ac {
 	position: relative;
 	font-size: 100%;
 }
 
 .ac .perm_ac {
 	width: 15em;
 }
 
 .ac .yui-ac-input {
 	width: 100%;
 }
 
 .ac .yui-ac-container {
 	position: absolute;
 	top: 1.6em;
 	width: 100%;
 }
 
 .ac .yui-ac-content {
 	position: absolute;
 	width: 100%;
 	border: 1px solid gray;
 	background: #fff;
 	overflow: hidden;
 	z-index: 9050;
 }
 
 .ac .yui-ac-shadow {
 	position: absolute;
 	width: 100%;
 	background: #000;
 	-moz-opacity: 0.1px;
 	opacity: .10;
 	filter: alpha(opacity =     10);
 	z-index: 9049;
 	margin: .3em;
 }
 
 .ac .yui-ac-content ul {
 	width: 100%;
 	margin: 0;
 	padding: 0;
 }
 
 .ac .yui-ac-content li {
 	cursor: default;
 	white-space: nowrap;
 	margin: 0;
 	padding: 2px 5px;
 }
 
 .ac .yui-ac-content li.yui-ac-prehighlight {
 	background: #B3D4FF;
 }
 
 .ac .yui-ac-content li.yui-ac-highlight {
 	background: #556CB5;
 	color: #FFF;
 }
 
 .follow {
 	background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
 }
 
 .following {
 	background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
 }
 
 .currently_following {
 	padding-left: 10px;
 	padding-bottom: 5px;
 }
 
 .add_icon {
 	background: url("../images/icons/add.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .edit_icon {
 	background: url("../images/icons/folder_edit.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .delete_icon {
 	background: url("../images/icons/delete.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .refresh_icon {
 	background: url("../images/icons/arrow_refresh.png") no-repeat scroll
 		3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .pull_icon {
 	background: url("../images/icons/connect.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .rss_icon {
 	background: url("../images/icons/rss_16.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .atom_icon {
 	background: url("../images/icons/atom.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
 }
 
 .archive_icon {
 	background: url("../images/icons/compress.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	text-align: left;
 	padding-top: 1px;
 }
 
 .start_following_icon {
 	background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	text-align: left;
 	padding-top: 0px;
 }
 
 .stop_following_icon {
 	background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	text-align: left;
 	padding-top: 0px;
 }
 
 .action_button {
 	border: 0;
 	display: inline;
 }
 
 .action_button:hover {
 	border: 0;
 	text-decoration: underline;
 	cursor: pointer;
 }
 
 #switch_repos {
 	position: absolute;
 	height: 25px;
 	z-index: 1;
 }
 
 #switch_repos select {
 	min-width: 150px;
 	max-height: 250px;
 	z-index: 1;
 }
 
 .breadcrumbs {
 	border: medium none;
 	color: #FFF;
 	float: left;
 	text-transform: uppercase;
 	font-weight: 700;
 	font-size: 14px;
 	margin: 0;
 	padding: 11px 0 11px 10px;
 }
 
 .breadcrumbs a {
 	color: #FFF;
 }
 
 .flash_msg {
 	
 }
 
 .flash_msg ul {
 	
 }
 
 .error_msg {
 	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;
 }
 
 .warning_msg {
 	color: #404040 !important;
 	background-color: #eedc94;
 	background-repeat: repeat-x;
 	background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
 		to(#eedc94) );
 	background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
 	background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1),
 		color-stop(100%, #eedc94) );
 	background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
 	background-image: -o-linear-gradient(top, #fceec1, #eedc94);
 	background-image: linear-gradient(top, #fceec1, #eedc94);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1',
 		endColorstr='#eedc94', GradientType=0 );
 	border-color: #eedc94 #eedc94 #e4c652;
 }
 
 .success_msg {
 	background-color: #57a957;
 	background-repeat: repeat-x !important;
 	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;
 }
 
 .notice_msg {
 	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;
 }
 
 .success_msg,.error_msg,.notice_msg,.warning_msg {
 	font-size: 12px;
 	font-weight: 700;
 	min-height: 14px;
 	line-height: 14px;
 	margin-bottom: 10px;
 	margin-top: 0;
 	display: block;
 	overflow: auto;
 	padding: 6px 10px 6px 10px;
 	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 	position: relative;
 	color: #FFF;
 	border-width: 1px;
 	border-style: solid;
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
 	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
 }
 
 #msg_close {
 	background: transparent url("../icons/cross_grey_small.png") no-repeat
 		scroll 0 0;
 	cursor: pointer;
 	height: 16px;
 	position: absolute;
 	right: 5px;
 	top: 5px;
 	width: 16px;
 }
 
 div#legend_container table,div#legend_choices table {
 	width: auto !important;
 }
 
 table#permissions_manage {
 	width: 0 !important;
 }
 
 table#permissions_manage span.private_repo_msg {
 	font-size: 0.8em;
 	opacity: 0.6px;
 }
 
 table#permissions_manage td.private_repo_msg {
 	font-size: 0.8em;
 }
 
 table#permissions_manage tr#add_perm_input td {
 	vertical-align: middle;
 }
 
 div.gravatar {
 	background-color: #FFF;
 	border: 0px solid #D0D0D0;
 	float: left;
 	margin-right: 0.7em;
-	padding: 2px 2px 0;
+	padding: 2px 2px 2px 2px;
+    line-height:0;
 	-webkit-border-radius: 6px;
 	-khtml-border-radius: 6px;
 	-moz-border-radius: 6px;
 	border-radius: 6px;
 }
 
 div.gravatar img {
 	-webkit-border-radius: 4px;
 	-khtml-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 }
 
 #header,#content,#footer {
 	min-width: 978px;
 }
 
 #content {
 	clear: both;
 	overflow: hidden;
 	padding: 14px 10px;
 }
 
 #content div.box div.title div.search {
 	
 	border-left: 1px solid #316293;
 }
 
 #content div.box div.title div.search div.input input {
 	border: 1px solid #316293;
 }
 
 .ui-button-small a:hover {
 	
 }
 
 input.ui-button-small,.ui-button-small {
 	background: #e5e3e3 url("../images/button.png") repeat-x !important;
 	border-top: 1px solid #DDD !important;
 	border-left: 1px solid #c6c6c6 !important;
 	border-right: 1px solid #DDD !important;
 	border-bottom: 1px solid #c6c6c6 !important;
 	color: #515151 !important;
 	outline: none !important;
 	margin: 0 !important;
 	-webkit-border-radius: 4px 4px 4px 4px !important;
 	-khtml-border-radius: 4px 4px 4px 4px !important;
 	-moz-border-radius: 4px 4px 4px 4px !important;
 	border-radius: 4px 4px 4px 4px !important;
 	box-shadow: 0 1px 0 #ececec !important;
 	cursor: pointer !important;
 	padding: 3px 3px 3px 3px;
 }
 
 input.ui-button-small.xsmall,.ui-button-small.xsmall{
     padding: 1px 2px 1px 1px;
 }
 
 input.ui-button-small:hover,.ui-button-small:hover {
 	background: #b4b4b4 url("../images/button_selected.png") repeat-x
 		!important;
 	border-top: 1px solid #ccc !important;
 	border-left: 1px solid #bebebe !important;
 	border-right: 1px solid #b1b1b1 !important;
 	border-bottom: 1px solid #afafaf !important;
 	text-decoration: none;
 }
 
 input.ui-button-small-blue,.ui-button-small-blue {
 	background: #4e85bb url("../images/button_highlight.png") repeat-x;
 	border-top: 1px solid #5c91a4;
 	border-left: 1px solid #2a6f89;
 	border-right: 1px solid #2b7089;
 	border-bottom: 1px solid #1a6480;
 	color: #fff;
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 	box-shadow: 0 1px 0 #ececec;
 	cursor: pointer;
 	padding: 0px 2px 1px 2px;
 }
 
 input.ui-button-small-blue:hover {
 	
 }
 
 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
 	{
 	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;
 }
 
 #content div.graph {
 	padding: 0 10px 10px;
 }
 
 #content div.box div.title ul.links li a:hover,#content div.box div.title ul.links li.ui-tabs-selected a
 	{
 	color: #bfe3ff;
 }
 
 #content div.box ol.lower-roman,#content div.box ol.upper-roman,#content div.box ol.lower-alpha,#content div.box ol.upper-alpha,#content div.box ol.decimal
 	{
 	margin: 10px 24px 10px 44px;
 }
 
 #content div.box div.form,#content div.box div.table,#content div.box div.traffic
 	{
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 0 20px 10px;
 }
 
 #content div.box div.form div.fields,#login div.form,#login div.form div.fields,#register div.form,#register div.form div.fields
 	{
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.label span,#login div.form div.fields div.field div.label span,#register div.form div.fields div.field div.label span
 	{
 	height: 1%;
 	display: block;
 	color: #363636;
 	margin: 0;
 	padding: 2px 0 0;
 }
 
 #content div.box div.form div.fields div.field div.input input.error,#login div.form div.fields div.field div.input input.error,#register div.form div.fields div.field div.input input.error
 	{
 	background: #FBE3E4;
 	border-top: 1px solid #e1b2b3;
 	border-left: 1px solid #e1b2b3;
 	border-right: 1px solid #FBC2C4;
 	border-bottom: 1px solid #FBC2C4;
 }
 
 #content div.box div.form div.fields div.field div.input input.success,#login div.form div.fields div.field div.input input.success,#register div.form div.fields div.field div.input input.success
 	{
 	background: #E6EFC2;
 	border-top: 1px solid #cebb98;
 	border-left: 1px solid #cebb98;
 	border-right: 1px solid #c6d880;
 	border-bottom: 1px solid #c6d880;
 }
 
 #content div.box-left div.form div.fields div.field div.textarea,#content div.box-right div.form div.fields div.field div.textarea,#content div.box div.form div.fields div.field div.select select,#content div.box table th.selected input,#content div.box table td.selected input
 	{
 	margin: 0;
 }
 
 #content div.box-left div.form div.fields div.field div.select,#content div.box-left div.form div.fields div.field div.checkboxes,#content div.box-left div.form div.fields div.field div.radios,#content div.box-right div.form div.fields div.field div.select,#content div.box-right div.form div.fields div.field div.checkboxes,#content div.box-right div.form div.fields div.field div.radios
 	{
 	margin: 0 0 0 0px !important;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.select,#content div.box div.form div.fields div.field div.checkboxes,#content div.box div.form div.fields div.field div.radios
 	{
 	margin: 0 0 0 200px;
 	padding: 0;
 }
 
 #content div.box div.form div.fields div.field div.select a:hover,#content div.box div.form div.fields div.field div.select a.ui-selectmenu:hover,#content div.box div.action a:hover
 	{
 	color: #000;
 	text-decoration: none;
 }
 
 #content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus,#content div.box div.action a.ui-selectmenu-focus
 	{
 	border: 1px solid #666;
 }
 
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox,#content div.box div.form div.fields div.field div.radios div.radio
 	{
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 8px 0 2px;
 }
 
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox input,#content div.box div.form div.fields div.field div.radios div.radio input
 	{
 	float: left;
 	margin: 0;
 }
 
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox label,#content div.box div.form div.fields div.field div.radios div.radio label
 	{
 	height: 1%;
 	display: block;
 	float: left;
 	margin: 2px 0 0 4px;
 }
 
 div.form div.fields div.field div.button input,#content div.box div.form div.fields div.buttons input,div.form div.fields div.buttons input,#content div.box div.action div.button input
 	{
 	color: #000;
 	font-size: 11px;
 	font-weight: 700;
 	margin: 0;
 }
 
 input.ui-button {
 	background: #e5e3e3 url("../images/button.png") repeat-x;
 	border-top: 1px solid #DDD;
 	border-left: 1px solid #c6c6c6;
 	border-right: 1px solid #DDD;
 	border-bottom: 1px solid #c6c6c6;
 	color: #515151 !important;
 	outline: none;
 	margin: 0;
 	padding: 6px 12px;
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 	box-shadow: 0 1px 0 #ececec;
 	cursor: pointer;
 }
 
 input.ui-button:hover {
 	background: #b4b4b4 url("../images/button_selected.png") repeat-x;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #bebebe;
 	border-right: 1px solid #b1b1b1;
 	border-bottom: 1px solid #afafaf;
 }
 
 div.form div.fields div.field div.highlight,#content div.box div.form div.fields div.buttons div.highlight
 	{
 	display: inline;
 }
 
 #content div.box div.form div.fields div.buttons,div.form div.fields div.buttons
 	{
 	margin: 10px 0 0 200px;
 	padding: 0;
 }
 
 #content div.box-left div.form div.fields div.buttons,#content div.box-right div.form div.fields div.buttons,div.box-left div.form div.fields div.buttons,div.box-right div.form div.fields div.buttons
 	{
 	margin: 10px 0 0;
 }
 
 #content div.box table td.user,#content div.box table td.address {
 	width: 10%;
 	text-align: center;
 }
 
 #content div.box div.action div.button,#login div.form div.fields div.field div.input div.link,#register div.form div.fields div.field div.input div.link
 	{
 	text-align: right;
 	margin: 6px 0 0;
 	padding: 0;
 }
 
 #content div.box div.action div.button input.ui-state-hover,#login div.form div.fields div.buttons input.ui-state-hover,#register div.form div.fields div.buttons input.ui-state-hover
 	{
 	background: #b4b4b4 url("../images/button_selected.png") repeat-x;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #bebebe;
 	border-right: 1px solid #b1b1b1;
 	border-bottom: 1px solid #afafaf;
 	color: #515151;
 	margin: 0;
 	padding: 6px 12px;
 }
 
 #content div.box div.pagination div.results,#content div.box div.pagination-wh div.results
 	{
 	text-align: left;
 	float: left;
 	margin: 0;
 	padding: 0;
 }
 
 #content div.box div.pagination div.results span,#content div.box div.pagination-wh div.results span
 	{
 	height: 1%;
 	display: block;
 	float: left;
 	background: #ebebeb url("../images/pager.png") repeat-x;
 	border-top: 1px solid #dedede;
 	border-left: 1px solid #cfcfcf;
 	border-right: 1px solid #c4c4c4;
 	border-bottom: 1px solid #c4c4c4;
 	color: #4A4A4A;
 	font-weight: 700;
 	margin: 0;
 	padding: 6px 8px;
 }
 
 #content div.box div.pagination ul.pager li.disabled,#content div.box div.pagination-wh a.disabled
 	{
 	color: #B4B4B4;
 	padding: 6px;
 }
 
 #login,#register {
 	width: 520px;
 	margin: 10% auto 0;
 	padding: 0;
 }
 
 #login div.color,#register div.color {
 	clear: both;
 	overflow: hidden;
 	background: #FFF;
 	margin: 10px auto 0;
 	padding: 3px 3px 3px 0;
 }
 
 #login div.color a,#register div.color a {
 	width: 20px;
 	height: 20px;
 	display: block;
 	float: left;
 	margin: 0 0 0 3px;
 	padding: 0;
 }
 
 #login div.title h5,#register div.title h5 {
 	color: #fff;
 	margin: 10px;
 	padding: 0;
 }
 
 #login div.form div.fields div.field,#register div.form div.fields div.field
 	{
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 0 0 10px;
 }
 
 #login div.form div.fields div.field span.error-message,#register div.form div.fields div.field span.error-message
 	{
 	height: 1%;
 	display: block;
 	color: red;
 	margin: 8px 0 0;
 	padding: 0;
 	max-width: 320px;
 }
 
 #login div.form div.fields div.field div.label label,#register div.form div.fields div.field div.label label
 	{
 	color: #000;
 	font-weight: 700;
 }
 
 #login div.form div.fields div.field div.input,#register div.form div.fields div.field div.input
 	{
 	float: left;
 	margin: 0;
 	padding: 0;
 }
 
 #login div.form div.fields div.field div.checkbox,#register div.form div.fields div.field div.checkbox
 	{
 	margin: 0 0 0 184px;
 	padding: 0;
 }
 
 #login div.form div.fields div.field div.checkbox label,#register div.form div.fields div.field div.checkbox label
 	{
 	color: #565656;
 	font-weight: 700;
 }
 
 #login div.form div.fields div.buttons input,#register div.form div.fields div.buttons input
 	{
 	color: #000;
 	font-size: 1em;
 	font-weight: 700;
 	margin: 0;
 }
 
 #changeset_content .container .wrapper,#graph_content .container .wrapper
 	{
 	width: 600px;
 }
 
 #changeset_content .container .left,#graph_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
 }
 
 #changeset_content .container .left .date,.ac .match {
 	font-weight: 700;
 	padding-top: 5px;
 	padding-bottom: 5px;
 }
 
 div#legend_container table td,div#legend_choices table td {
 	border: none !important;
 	height: 20px !important;
 	padding: 0 !important;
 }
 
 .q_filter_box {
 	-webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
     border: 0 none;
     color: #AAAAAA;
     margin-bottom: -4px;
     margin-top: -4px;
     padding-left: 3px;		
 }
 
 #node_filter {
 	border: 0px solid #545454;
 	color: #AAAAAA;
 	padding-left: 3px;
 }
 
 /*README STYLE*/
 
 div.readme {
 	padding:0px;
 }
 
 div.readme h2 {
     font-weight: normal;
 }
 
 div.readme .readme_box {
     background-color: #fafafa;
 }
 
 div.readme .readme_box {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:0 20px 10px;
 }
 
 div.readme .readme_box h1, div.readme .readme_box h2, div.readme .readme_box h3, div.readme .readme_box h4, div.readme .readme_box h5, div.readme .readme_box h6 {
 border-bottom: 0 !important;
 margin: 0 !important;
 padding: 0 !important;
 line-height: 1.5em !important;
 }
 
 
 div.readme .readme_box h1:first-child {
 padding-top: .25em !important;
 }
 
 div.readme .readme_box h2, div.readme .readme_box h3 {
 margin: 1em 0 !important;
 }
 
 div.readme .readme_box h2 {
 margin-top: 1.5em !important;
 border-top: 4px solid #e0e0e0 !important;
 padding-top: .5em !important;
 }
 
 div.readme .readme_box p {
 color: black !important;
 margin: 1em 0 !important;
 line-height: 1.5em !important;
 }
 
 div.readme .readme_box ul {
 list-style: disc !important;
 margin: 1em 0 1em 2em !important;
 }
 
 div.readme .readme_box ol {
 list-style: decimal;
 margin: 1em 0 1em 2em !important;
 }
 
 div.readme .readme_box pre, code {
 font: 12px "Bitstream Vera Sans Mono","Courier",monospace;
 }
 
 div.readme .readme_box code {
     font-size: 12px !important;
     background-color: ghostWhite !important;
     color: #444 !important;
     padding: 0 .2em !important;
     border: 1px solid #dedede !important;
 }
 
 div.readme .readme_box pre code {
 	padding: 0 !important;
 	font-size: 12px !important;
 	background-color: #eee !important;
 	border: none !important;
 }
 
 div.readme .readme_box pre {
 	margin: 1em 0;
 	font-size: 12px;
 	background-color: #eee;
 	border: 1px solid #ddd;
 	padding: 5px;
 	color: #444;
 	overflow: auto;
 	-webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 }
 
 
 /** RST STYLE **/
 
 
 div.rst-block {
     padding:0px;
 }
 
 div.rst-block h2 {
     font-weight: normal;
 }
 
 div.rst-block  {
     background-color: #fafafa;
 }
 
 div.rst-block  {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:0 20px 10px;
 }
 
 div.rst-block  h1, div.rst-block  h2, div.rst-block  h3, div.rst-block  h4, div.rst-block  h5, div.rst-block  h6 {
 border-bottom: 0 !important;
 margin: 0 !important;
 padding: 0 !important;
 line-height: 1.5em !important;
 }
 
 
 div.rst-block  h1:first-child {
 padding-top: .25em !important;
 }
 
 div.rst-block  h2, div.rst-block  h3 {
 margin: 1em 0 !important;
 }
 
 div.rst-block  h2 {
 margin-top: 1.5em !important;
 border-top: 4px solid #e0e0e0 !important;
 padding-top: .5em !important;
 }
 
 div.rst-block  p {
 color: black !important;
 margin: 1em 0 !important;
 line-height: 1.5em !important;
 }
 
 div.rst-block  ul {
 list-style: disc !important;
 margin: 1em 0 1em 2em !important;
 }
 
 div.rst-block  ol {
 list-style: decimal;
 margin: 1em 0 1em 2em !important;
 }
 
 div.rst-block  pre, code {
 font: 12px "Bitstream Vera Sans Mono","Courier",monospace;
 }
 
 div.rst-block  code {
     font-size: 12px !important;
     background-color: ghostWhite !important;
     color: #444 !important;
     padding: 0 .2em !important;
     border: 1px solid #dedede !important;
 }
 
 div.rst-block  pre code {
     padding: 0 !important;
     font-size: 12px !important;
     background-color: #eee !important;
     border: none !important;
 }
 
 div.rst-block  pre {
     margin: 1em 0;
     font-size: 12px;
     background-color: #eee;
     border: 1px solid #ddd;
     padding: 5px;
     color: #444;
     overflow: auto;
     -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
 }
 
 
 /** comment main **/
 .comments {
     padding:10px 20px;
 }
 
 .comments .comment {
     border: 1px solid #ddd;
     margin-top: 10px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;    
 }
 
 .comments .comment .meta {
     background: #f8f8f8;
     padding: 6px;
     border-bottom: 1px solid #ddd;
 }
 
 .comments .comment .meta img {
     vertical-align: middle;
 }
 
 .comments .comment .meta .user {
     font-weight: bold;
 }
 
 .comments .comment .meta .date {
     float: right;
 }
 
 .comments .comment .text {
     padding: 8px 6px 6px 14px;
     background-color: #FAFAFA;
 }
 
 .comments .comments-number{
 	padding:0px 0px 10px 0px;
 	font-weight: bold;
 	color: #666;
 	font-size: 16px;
 }
 
 /** comment form **/
 
 .comment-form .clearfix{
 	background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 10px;
 }
 
 div.comment-form {
     margin-top: 20px;
 }
 
 .comment-form strong {
     display: block;
     margin-bottom: 15px;
 }
 
 .comment-form textarea {
     width: 100%;
     height: 100px;
     font-family: 'Monaco', 'Courier', 'Courier New', monospace;
 }
 
 form.comment-form {
     margin-top: 10px;
     margin-left: 10px;
 }
 
 .comment-form-submit {
     margin-top: 5px;
     margin-left: 525px;
 }
 
 .file-comments {
     display: none;
 }
 
 .comment-form .comment {
     margin-left: 10px;
 }
 
 .comment-form .comment-help{
     padding: 0px 0px 5px 0px;
     color: #666;
 }
 
 .comment-form .comment-button{
 	padding-top:5px;
 }
 
 .add-another-button {
     margin-left: 10px;
     margin-top: 10px;
     margin-bottom: 10px;
 }
 
 .comment .buttons {
     position: absolute;
     right:40px;
 }
 
 
 .show-inline-comments{
 	position: relative;
 	top:1px
 }
 
 /** comment inline form **/
 
 .comment-inline-form .clearfix{
     background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 5px;
 }
 
 div.comment-inline-form {
     margin-top: 5px;
     padding:2px 6px 8px 6px;
 }
 
 .comment-inline-form strong {
     display: block;
     margin-bottom: 15px;
 }
 
 .comment-inline-form textarea {
     width: 100%;
     height: 100px;
     font-family: 'Monaco', 'Courier', 'Courier New', monospace;
 }
 
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
 }
 
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
 }
 
 .file-comments {
     display: none;
 }
 
 .comment-inline-form .comment {
     margin-left: 10px;
 }
 
 .comment-inline-form .comment-help{
     padding: 0px 0px 2px 0px;
     color: #666666;
     font-size: 10px;
 }
 
 .comment-inline-form .comment-button{
     padding-top:5px;
 }
 
 /** comment inline **/
 .inline-comments {
     padding:10px 20px;
 }
 
 .inline-comments div.rst-block  {
 	clear:both;
 	overflow:hidden;
 	margin:0;
 	padding:0 20px 0px;
 }
 .inline-comments .comment {
     border: 1px solid #ddd;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
 }
 
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 6px;
     border-bottom: 1px solid #ddd;
 }
 
 .inline-comments .comment .meta img {
     vertical-align: middle;
 }
 
 .inline-comments .comment .meta .user {
     font-weight: bold;
 }
 
 .inline-comments .comment .meta .date {
     float: right;
 }
 
 .inline-comments .comment .text {
     padding: 8px 6px 6px 14px;
     background-color: #FAFAFA;
 }
 
 .inline-comments .comments-number{
     padding:0px 0px 10px 0px;
     font-weight: bold;
     color: #666;
     font-size: 16px;
 }
 .inline-comments-button .add-comment{
 	margin:10px 5px !important;
 }
 .notifications{
 	width:22px;
     padding:2px;
 	float:right;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     text-align: center;
     margin: 0px -10px 0px 5px;
     background-color: #DEDEDE;
 }
 .notifications a{
 	color:#888 !important;
 	display: block;
 	font-size: 10px
 }
 .notifications a:hover{
 	text-decoration: none !important;
+}
+.notification-header{
+	
+}
+.notification-header .desc{
+	font-size: 16px;
+    height: 24px;
+    padding-top: 6px;
+    float: left
+}
+
+.notification-header .desc.unread{
+    font-weight: bold;
+    font-size: 17px;
+}
+
+.notification-header .delete-notifications{
+    float: right;
+    padding-top: 8px;
+    cursor: pointer;
+}
+.notification-subject{
+    clear:both;
+    border-bottom: 1px solid #eee;
+    padding:5px 0px 5px 38px;
 }
  No newline at end of file

rhodecode/public/js/rhodecode.js

@@ -1,565 +1,581 b''
 /**
 RhodeCode JS Files
 **/
 
 if (typeof console == "undefined" || typeof console.log == "undefined"){
 	console = { log: function() {} }
 }
 
 
 var str_repeat = function(i, m) {
 	for (var o = []; m > 0; o[--m] = i);
 	return o.join('');
 };
 
 /**
  * INJECT .format function into String
  * Usage: "My name is {0} {1}".format("Johny","Bravo")
  * Return "My name is Johny Bravo"
  * Inspired by https://gist.github.com/1049426
  */
 String.prototype.format = function() {
 	  
 	  function format() {
 	    var str = this;
 	    var len = arguments.length+1;
 	    var safe = undefined;
 	    var arg = undefined;
 	    
 	    // For each {0} {1} {n...} replace with the argument in that position.  If 
 	    // the argument is an object or an array it will be stringified to JSON.
 	    for (var i=0; i < len; arg = arguments[i++]) {
 	      safe = typeof arg === 'object' ? JSON.stringify(arg) : arg;
 	      str = str.replace(RegExp('\\{'+(i-1)+'\\}', 'g'), safe);
 	    }
 	    return str;
 	  }
 
 	  // Save a reference of what may already exist under the property native.  
 	  // Allows for doing something like: if("".format.native) { /* use native */ }
 	  format.native = String.prototype.format;
 
 	  // Replace the prototype property
 	  return format;
 
 }();
 
 
 /**
  * SmartColorGenerator
  *
  *usage::
  *	var CG = new ColorGenerator();
  *  var col = CG.getColor(key); //returns array of RGB
  *  'rgb({0})'.format(col.join(',')
  * 
  * @returns {ColorGenerator}
  */
 var ColorGenerator = function(){
 	this.GOLDEN_RATIO = 0.618033988749895;
 	this.CURRENT_RATIO = 0.22717784590367374 // this can be random
 	this.HSV_1 = 0.75;//saturation
 	this.HSV_2 = 0.95;
 	this.color;
 	this.cacheColorMap = {};
 };
 
 ColorGenerator.prototype = {
     getColor:function(key){
     	if(this.cacheColorMap[key] !== undefined){
     		return this.cacheColorMap[key];
     	}
     	else{
     		this.cacheColorMap[key] = this.generateColor();
     		return this.cacheColorMap[key];
     	}
     },
     _hsvToRgb:function(h,s,v){
         if (s == 0.0)
             return [v, v, v];
         i = parseInt(h * 6.0)
         f = (h * 6.0) - i
         p = v * (1.0 - s)
         q = v * (1.0 - s * f)
         t = v * (1.0 - s * (1.0 - f))
         i = i % 6
         if (i == 0) 
             return [v, t, p]
         if (i == 1) 
             return [q, v, p]
         if (i == 2) 
             return [p, v, t]
         if (i == 3)
             return [p, q, v]
         if (i == 4) 
             return [t, p, v]
         if (i == 5)
             return [v, p, q]            	
     },
     generateColor:function(){
         this.CURRENT_RATIO = this.CURRENT_RATIO+this.GOLDEN_RATIO;
         this.CURRENT_RATIO = this.CURRENT_RATIO %= 1;
         HSV_tuple = [this.CURRENT_RATIO, this.HSV_1, this.HSV_2]
         RGB_tuple = this._hsvToRgb(HSV_tuple[0],HSV_tuple[1],HSV_tuple[2]);
         function toRgb(v){
         	return ""+parseInt(v*256)
         }
         return [toRgb(RGB_tuple[0]),toRgb(RGB_tuple[1]),toRgb(RGB_tuple[2])];
         
     }
 }
 
 
 
 
 
 /**
  * GLOBAL YUI Shortcuts
  */
 var YUC = YAHOO.util.Connect;
 var YUD = YAHOO.util.Dom;
 var YUE = YAHOO.util.Event;
 var YUQ = YAHOO.util.Selector.query;
 
 // defines if push state is enabled for this browser ?
 var push_state_enabled = Boolean(
 		window.history && window.history.pushState && window.history.replaceState
 		&& !(   /* disable for versions of iOS before version 4.3 (8F190) */
 				(/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i).test(navigator.userAgent)
 				/* disable for the mercury iOS browser, or at least older versions of the webkit engine */
 				|| (/AppleWebKit\/5([0-2]|3[0-2])/i).test(navigator.userAgent)
 		)
 );
 
 /**
  * Partial Ajax Implementation
  * 
  * @param url: defines url to make partial request
  * @param container: defines id of container to input partial result
  * @param s_call: success callback function that takes o as arg
  *  o.tId
  *  o.status
  *  o.statusText
  *  o.getResponseHeader[ ]
  *  o.getAllResponseHeaders
  *  o.responseText
  *  o.responseXML
  *  o.argument
  * @param f_call: failure callback
  * @param args arguments 
  */
 function ypjax(url,container,s_call,f_call,args){
 	var method='GET';
 	if(args===undefined){
 		args=null;
 	}
 	
 	// Set special header for partial ajax == HTTP_X_PARTIAL_XHR
 	YUC.initHeader('X-PARTIAL-XHR',true);
 	
 	// wrapper of passed callback
 	var s_wrapper = (function(o){
 		return function(o){
 			YUD.get(container).innerHTML=o.responseText;
 			YUD.setStyle(container,'opacity','1.0');
     		//execute the given original callback
     		if (s_call !== undefined){
     			s_call(o);
     		}
 		}
 	})()	
 	YUD.setStyle(container,'opacity','0.3');
 	YUC.asyncRequest(method,url,{
 		success:s_wrapper,
 		failure:function(o){
 			console.log(o);
 			YUD.get(container).innerHTML='ERROR';
 			YUD.setStyle(container,'opacity','1.0');
 			YUD.setStyle(container,'color','red');
 		}
 	},args);
 	
 };
 
 /**
  * tooltip activate
  */
 var tooltip_activate = function(){
     function toolTipsId(){
         var ids = [];
         var tts = YUQ('.tooltip');
         for (var i = 0; i < tts.length; i++) {
             // if element doesn't not have and id 
         	//  autogenerate one for tooltip 
             if (!tts[i].id){
                 tts[i].id='tt'+((i*100)+tts.length);
             }
             ids.push(tts[i].id);
         }
         return ids
     };
     var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
         context: [[toolTipsId()],"tl","bl",null,[0,5]],
         monitorresize:false,
         xyoffset :[0,0],
         autodismissdelay:300000,
         hidedelay:5,
         showdelay:20,
     });
 };
 
 /**
  * show more
  */
 var show_more_event = function(){
     YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
         var el = e.target;
         YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
         YUD.setStyle(el.parentNode,'display','none');
     });
 };
 
 
 /**
  * Quick filter widget
  * 
  * @param target: filter input target
  * @param nodes: list of nodes in html we want to filter.
  * @param display_element function that takes current node from nodes and
  *    does hide or show based on the node
  * 
  */
 var q_filter = function(target,nodes,display_element){
 	
 	var nodes = nodes;
 	var q_filter_field = YUD.get(target);
 	var F = YAHOO.namespace(target);
 
 	YUE.on(q_filter_field,'click',function(){
 	   q_filter_field.value = '';
 	});
 
 	YUE.on(q_filter_field,'keyup',function(e){
 	    clearTimeout(F.filterTimeout); 
 	    F.filterTimeout = setTimeout(F.updateFilter,600); 
 	});
 
 	F.filterTimeout = null;
 
 	var show_node = function(node){
 		YUD.setStyle(node,'display','')
 	}
 	var hide_node = function(node){
 		YUD.setStyle(node,'display','none');
 	}
 	
 	F.updateFilter  = function() { 
 	   // Reset timeout 
 	   F.filterTimeout = null;
 	   
 	   var obsolete = [];
 	   
 	   var req = q_filter_field.value.toLowerCase();
 	   
 	   var l = nodes.length;
 	   var i;
 	   var showing = 0;
 	   
        for (i=0;i<l;i++ ){
     	   var n = nodes[i];
     	   var target_element = display_element(n)
     	   if(req && n.innerHTML.toLowerCase().indexOf(req) == -1){
     		   hide_node(target_element);
     	   }
     	   else{
     		   show_node(target_element);
     		   showing+=1;
     	   }
        }	  	   
 
 	   // if repo_count is set update the number
 	   var cnt = YUD.get('repo_count');
 	   if(cnt){
 		   YUD.get('repo_count').innerHTML = showing;
 	   }       
        
 	}	
 };
 
 var ajaxPOST = function(url,postData,success) {
     var sUrl = url;
     var callback = {
         success: success,
         failure: function (o) {
             alert("error");
         },
     };
     var postData = postData;
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
 };
 
 
 /** comments **/
 var removeInlineForm = function(form) {
 	form.parentNode.removeChild(form);
 };
 
 var tableTr = function(cls,body){
 	var form = document.createElement('tr');
 	YUD.addClass(form, cls);
 	form.innerHTML = '<td class="lineno-inline new-inline"></td>'+
     				 '<td class="lineno-inline old-inline"></td>'+ 
                      '<td>{0}</td>'.format(body);
 	return form;
 };
 
 var createInlineForm = function(parent_tr, f_path, line) {
 	var tmpl = YUD.get('comment-inline-form-template').innerHTML;
 	tmpl = tmpl.format(f_path, line);
 	var form = tableTr('comment-form-inline',tmpl)
 	
 	// create event for hide button
 	form = new YAHOO.util.Element(form);
 	var form_hide_button = new YAHOO.util.Element(form.getElementsByClassName('hide-inline-form')[0]);
 	form_hide_button.on('click', function(e) {
 		var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode;
 		removeInlineForm(newtr);
 		YUD.removeClass(parent_tr, 'form-open');
 	});
 	return form
 };
 var injectInlineForm = function(tr){
 	  if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context')){
 		  return
 	  }	
 	  YUD.addClass(tr,'form-open');
 	  var node = tr.parentNode.parentNode.parentNode.getElementsByClassName('full_f_path')[0];
 	  var f_path = YUD.getAttribute(node,'path');
 	  var lineno = getLineNo(tr);
 	  var form = createInlineForm(tr, f_path, lineno);
 	  var target_tr = tr;
 	  if(YUD.hasClass(YUD.getNextSibling(tr),'inline-comments')){
 		  target_tr = YUD.getNextSibling(tr);
 	  }
 	  YUD.insertAfter(form,target_tr);
 	  YUD.get('text_'+lineno).focus();	
 };
 
 var createInlineAddButton = function(tr,label){
 	var html = '<div class="add-comment"><span class="ui-button-small">{0}</span></div>'.format(label);
         
 	var add = new YAHOO.util.Element(tableTr('inline-comments-button',html));
 	add.on('click', function(e) {
 		injectInlineForm(tr);
 	});
 	return add;
 };
 
 var getLineNo = function(tr) {
 	var line;
 	var o = tr.children[0].id.split('_');
 	var n = tr.children[1].id.split('_');
 
 	if (n.length >= 2) {
 		line = n[n.length-1];
 	} else if (o.length >= 2) {
 		line = o[o.length-1];
 	}
 
 	return line
 };
 
 
 var fileBrowserListeners = function(current_url, node_list_url, url_base,
 									truncated_lbl, nomatch_lbl){
 	var current_url_branch = +"?branch=__BRANCH__";
 	var url = url_base;
 	var node_url = node_list_url;	
 
 	YUE.on('stay_at_branch','click',function(e){
 	    if(e.target.checked){
 	        var uri = current_url_branch;
 	        uri = uri.replace('__BRANCH__',e.target.value);
 	        window.location = uri;
 	    }
 	    else{
 	        window.location = current_url;
 	    }
 	})            
 
 	var n_filter = YUD.get('node_filter');
 	var F = YAHOO.namespace('node_filter');
 	
 	F.filterTimeout = null;
 	var nodes = null;
 
 	F.initFilter = function(){
 	  YUD.setStyle('node_filter_box_loading','display','');
 	  YUD.setStyle('search_activate_id','display','none');
 	  YUD.setStyle('add_node_id','display','none');
 	  YUC.initHeader('X-PARTIAL-XHR',true);
 	  YUC.asyncRequest('GET',url,{
 	      success:function(o){
 	        nodes = JSON.parse(o.responseText);
 	        YUD.setStyle('node_filter_box_loading','display','none');
 	        YUD.setStyle('node_filter_box','display','');
 	      },
 	      failure:function(o){
 	          console.log('failed to load');
 	      }
 	  },null);            
 	}
 
 	F.updateFilter  = function(e) {
 	    
 	    return function(){
 	        // Reset timeout 
 	        F.filterTimeout = null;
 	        var query = e.target.value;
 	        var match = [];
 	        var matches = 0;
 	        var matches_max = 20;
 	        if (query != ""){
 	            for(var i=0;i<nodes.length;i++){
 	                var pos = nodes[i].toLowerCase().indexOf(query)
 	                if(query && pos != -1){
 	                    
 	                    matches++
 	                    //show only certain amount to not kill browser 
 	                    if (matches > matches_max){
 	                        break;
 	                    }
 	                    
 	                    var n = nodes[i];
 	                    var n_hl = n.substring(0,pos)
 	                      +"<b>{0}</b>".format(n.substring(pos,pos+query.length))
 	                      +n.substring(pos+query.length)                    
 	                    match.push('<tr><td><a class="browser-file" href="{0}">{1}</a></td><td colspan="5"></td></tr>'.format(node_url.replace('__FPATH__',n),n_hl));
 	                }
 	                if(match.length >= matches_max){
 	                    match.push('<tr><td>{0}</td><td colspan="5"></td></tr>'.format(truncated_lbl));
 	                }
 	                
 	            }                       
 	        }
 	        if(query != ""){
 	            YUD.setStyle('tbody','display','none');
 	            YUD.setStyle('tbody_filtered','display','');
 	            
 	            if (match.length==0){
 	              match.push('<tr><td>{0}</td><td colspan="5"></td></tr>'.format(nomatch_lbl));
 	            }                           
 	            
 	            YUD.get('tbody_filtered').innerHTML = match.join("");   
 	        }
 	        else{
 	            YUD.setStyle('tbody','display','');
 	            YUD.setStyle('tbody_filtered','display','none');
 	        }
 	        
 	    }
 	};
 
 	YUE.on(YUD.get('filter_activate'),'click',function(){
 	    F.initFilter();
 	})
 	YUE.on(n_filter,'click',function(){
 	    n_filter.value = '';
 	 });
 	YUE.on(n_filter,'keyup',function(e){
 	    clearTimeout(F.filterTimeout); 
 	    F.filterTimeout = setTimeout(F.updateFilter(e),600);
 	});
 };
 
 
 var initCodeMirror = function(textAreadId,resetUrl){  
     var myCodeMirror = CodeMirror.fromTextArea(YUD.get(textAreadId),{
            mode:  "null",
            lineNumbers:true
          });
     YUE.on('reset','click',function(e){
         window.location=resetUrl
     });
     
     YUE.on('file_enable','click',function(){
         YUD.setStyle('editor_container','display','');
         YUD.setStyle('upload_file_container','display','none');
         YUD.setStyle('filename_container','display','');
     });
     
     YUE.on('upload_file_enable','click',function(){
         YUD.setStyle('editor_container','display','none');
         YUD.setStyle('upload_file_container','display','');
         YUD.setStyle('filename_container','display','none');
     });	
 };
 
 
 
 var getIdentNode = function(n){
 	//iterate thru nodes untill matched interesting node !
 	
 	if (typeof n == 'undefined'){
 		return -1
 	}
 	
 	if(typeof n.id != "undefined" && n.id.match('L[0-9]+')){
 			return n
 		}
 	else{
 		return getIdentNode(n.parentNode);
 	}
 };
 
 var  getSelectionLink = function(selection_link_label) {
 	return function(){
 	    //get selection from start/to nodes    	
 	    if (typeof window.getSelection != "undefined") {
 	    	s = window.getSelection();
 	
 	       	from = getIdentNode(s.anchorNode);
 	       	till = getIdentNode(s.focusNode);
 	        
 	        f_int = parseInt(from.id.replace('L',''));
 	        t_int = parseInt(till.id.replace('L',''));
 	        
 	        if (f_int > t_int){
 	        	//highlight from bottom 
 	        	offset = -35;
 	        	ranges = [t_int,f_int];
 	        	
 	        }
 	        else{
 	        	//highligth from top 
 	        	offset = 35;
 	        	ranges = [f_int,t_int];
 	        }
 	        
 	        if (ranges[0] != ranges[1]){
 	            if(YUD.get('linktt') == null){
 	                hl_div = document.createElement('div');
 	                hl_div.id = 'linktt';
 	            }
 	            anchor = '#L'+ranges[0]+'-'+ranges[1];
 	            hl_div.innerHTML = '';
 	            l = document.createElement('a');
 	            l.href = location.href.substring(0,location.href.indexOf('#'))+anchor;
 	            l.innerHTML = selection_link_label;
 	            hl_div.appendChild(l);
 	            
 	            YUD.get('body').appendChild(hl_div);
 	            
 	            xy = YUD.getXY(till.id);
 	            
 	            YUD.addClass('linktt','yui-tt');
 	            YUD.setStyle('linktt','top',xy[1]+offset+'px');
 	            YUD.setStyle('linktt','left',xy[0]+'px');
 	            YUD.setStyle('linktt','visibility','visible');
 	        }
 	        else{
 	        	YUD.setStyle('linktt','visibility','hidden');
 	        }
 	    }
 	}
 };
+
+var deleteNotification = function(url, notification_id){
+    var callback = { 
+		success:function(o){
+		    var obj = YUD.get(String("notification_"+notification_id));
+			obj.parentNode.removeChild(obj);
+		},
+	    failure:function(o){
+	        alert("error");
+	    },
+	};
+    var postData = '_method=delete';
+    var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
+    var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, 
+    											  callback, postData);
+};	

rhodecode/templates/admin/notifications/notifications.html

@@ -1,38 +1,60 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:
+    <%
+    unread = lambda n:{False:'unread'}.get(n)
+    %>
+    <div class="table">
       %for notification in c.notifications:
-          <div class="table">
-            <h4>${notification.subject}</h4>
-            <div>${h.rst(notification.body)}</div>
+        <div id="notification_${notification.notification_id}">
+          <div class="notification-header">
+            <div class="gravatar">
+                <img alt="gravatar" src="${h.gravatar_url(h.email(notification.created_by_user.email),24)}"/>
+            </div>
+            <div class="desc">
+            <a href="${url('notification', notification_id=notification.notification_id)}">${notification.description}</a>
+            </div>
+            <div class="delete-notifications">
+              <span id="${notification.notification_id}" class="delete-notification delete_icon action"></span>
+            </div>
           </div>
+          <div class="notification-subject">${h.urlify_text(notification.subject)}</div>
+        </div>
       %endfor
+    </div>
     %else:
         <div class="table">${_('No notifications here yet')}</div>
     %endif
-</div>    
+</div>
+<script type="text/javascript">
+var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
+   YUE.on(YUQ('.delete-notification'),'click',function(e){
+	   var notification_id = e.currentTarget.id;
+	   deleteNotification(url,notification_id)
+   })
+</script>
 </%def>  

rhodecode/templates/base/base.html

@@ -1,337 +1,337 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 
 <!-- HEADER -->
 <div id="header">
     <!-- user -->
     <ul id="logged-user">
          <li class="first">
 			<div id="quick_login" style="display:none">
 			${h.form(h.url('login_home',came_from=h.url.current()))}
 			<div class="form">
 			    <div class="fields">
 			        <div class="field">
 			            <div class="label">
 			                <label for="username">${_('Username')}:</label>
 			            </div>
 			            <div class="input">
 			                ${h.text('username',class_='focus',size=40)}
 			            </div>
 			            
 			        </div>                     
 			        <div class="field">
 			            <div class="label">
 			                <label for="password">${_('Password')}:</label>
 			            </div>
 			            <div class="input">
 			                ${h.password('password',class_='focus',size=40)}
 			            </div>
 			            
 			        </div>
 			        <div class="buttons">
 			            <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif                        
                         </div>
                             ${h.submit('sign_in',_('Sign In'),class_="ui-button")}
 			        </div>
 			    </div>
 			</div>
 			${h.end_form()}
 			</div>         
          
              <div class="gravatar">
                  <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
              </div>
           <div class="account">
           %if c.rhodecode_user.username == 'default':
               <a href="${h.url('public_journal')}">${_('Public journal')}</a>   
           %else:                        		            
           	<div style="float: left">
             ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
             </div>
             <div class="notifications">
-            <a href="${h.url('admin_settings_notifications')}">${c.unread_notifications}</a>
+            <a href="${h.url('notifications')}">${c.unread_notifications}</a>
             </div>
           %endif
           </div>	
          </li>
          <li>
             <a href="${h.url('home')}">${_('Home')}</a>
          </li>
          %if c.rhodecode_user.username != 'default':
             <li>
                <a href="${h.url('journal')}">${_('Journal')}</a> 
                ##(${c.unread_journal}
             </li>
             %endif
             %if c.rhodecode_user.username == 'default':
                 <li class="last highlight">${h.link_to(_(u'Login'),h.url('login_home'),id='quick_login_link')}</li>
             %else:
                 <li class="last highlight">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             %endif
     </ul>
     <!-- end user -->
     <div id="header-inner" class="title">
         <div id="logo">
             <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
         ${self.body()}
     </div>
 </div>     
 <!-- END HEADER -->
     
 <!-- CONTENT -->
 <div id="content"> 
     <div class="flash_msg">
         <% messages = h.flash.pop_messages() %>
         % if messages:
         <ul id="flash-messages">
             % for message in messages:
             <li class="${message.category}_msg">${message}</li>
             % endfor
         </ul>
         % endif
     </div>	    
     <div id="main"> 
         ${next.main()}
     </div>
 </div> 
 <!-- END CONTENT -->
 
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
 	       <p class="footer-link-right">
 	           <a href="${h.url('rhodecode_official')}">RhodeCode</a> 
 	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
 	       </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 
 ### MAKO DEFS ###
 <%def name="page_nav()">
     ${self.menu()}
 </%def>
 
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 
 
 <%def name="menu(current=None)">
 		<% 
 		def is_current(selected):
 			if selected == current:
 				return h.literal('class="current"')
 		%>
 		%if current not in ['home','admin']:           		
 		   ##REGULAR MENU            
 	        <ul id="quick">
 				<!-- repo switcher -->
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" />
                     </span>
                     <span>&darr;</span>					
 					</a>
 					<ul id="repo_switcher_list" class="repo_switcher">
                         <li>
                             <a href="#">${_('loading...')}</a>
                         </li>
 					</ul>
 				</li>
 				
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>                 
 	               </a>	            
 	            </li>
                 ##<li ${is_current('shortlog')}>
                 ##   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                 ##   <span class="icon">
                 ##       <img src="${h.url('/images/icons/application_view_list.png')}" alt="${_('Shortlog')}" />
                 ##   </span>
                 ##   <span>${_('Shortlog')}</span>                 
                 ##   </a>             
                 ##</li>	            
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>                 
                    </a>             
                 </li>   	
                 
                 <li ${is_current('switch_to')}>
                    <a id="branch_tag_switcher" title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="${h.url('/images/icons/arrow_switch.png')}" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>                 
                    </a>    
                     <ul id="switch_to_list" class="switch_to">
                         <li><a href="#">${_('loading...')}</a></li>
                     </ul>                     
                 </li>
                 <li ${is_current('files')}>
                    <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
                    </span>
                    <span>${_('Files')}</span>                 
                    </a>             
                 </li>                            
 				
                 <li ${is_current('options')}>
                    <a title="${_('Options')}" href="#">
                    <span class="icon">
                        <img src="${h.url('/images/icons/table_gear.png')}" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Options')}</span>                 
                    </a>
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                      %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                          <li>${h.link_to(_('settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                      %else:
                          <li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                      %endif
                    %endif
                    	<li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
                    	<li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
                     
                     % if h.HasPermissionAll('hg.admin')('access admin main page'):
                      <li>
                        ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}  
                         <%def name="admin_menu()">
                         <ul>
                             <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
                             <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
                             <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
                             <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
                             <li>${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}</li>
                             <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
                             <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
                             <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>        
                         </ul>
                         </%def>
                         
                         ${admin_menu()}
                      </li>
                     % endif
                    </ul>             
                 </li>
                 
                 <li>
                     <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                     <span class="icon_short">
                         <img src="${h.url('/images/icons/heart.png')}" alt="${_('Followers')}" />
                     </span>
                     <span id="current_followers_count" class="short">${c.repository_followers}</span>
                     </a>
                 </li>
                 <li>
                     <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                     <span class="icon_short">
                         <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Forks')}" />
                     </span>
                     <span class="short">${c.repository_forks}</span>
                     </a>
                 </li>                
 	        </ul>
             <script type="text/javascript">
                YUE.on('repo_switcher','mouseover',function(){
                       function qfilter(){
                           var nodes = YUQ('ul#repo_switcher_list li a.repo_name');
                           var target = 'q_filter_rs';
                           var func = function(node){
                               return node.parentNode;
                           }                          
                           q_filter(target,nodes,func);                         
                       }
                    var loaded = YUD.hasClass('repo_switcher','loaded');
                    if(!loaded){
                        YUD.addClass('repo_switcher','loaded');
                        ypjax("${h.url('repo_switcher')}",'repo_switcher_list',
                            function(o){qfilter();},
                            function(o){YUD.removeClass('repo_switcher','loaded');}
                            ,null);
                    }
                    return false;
                });
 
               YUE.on('branch_tag_switcher','mouseover',function(){
                  var loaded = YUD.hasClass('branch_tag_switcher','loaded');
                  if(!loaded){
                      YUD.addClass('branch_tag_switcher','loaded');
                      ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list',
                          function(o){},
                          function(o){YUD.removeClass('branch_tag_switcher','loaded');}
                          ,null);
                  }
                  return false;
               });
             </script>             
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
                     <a title="${_('Home')}"  href="${h.url('home')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/home_16.png')}" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>                 
                     </a>        
                 </li>
                 % if c.rhodecode_user.username != 'default':
                  <li>
                     <a title="${_('Journal')}"  href="${h.url('journal')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
                     </span>
                     <span>${_('Journal')}</span>                 
                     </a>        
                  </li>
                 % endif
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
                     </span>
                     <span>${_('Search')}</span>                 
                     </a>        
                 </li>
                 
 				%if h.HasPermissionAll('hg.admin')('access admin main page'):
                 <li ${is_current('admin')}>
                    <a title="${_('Admin')}" href="${h.url('admin_home')}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Admin')}</span>                 
                    </a>
                     ${admin_menu()}
                 </li>
 				%endif
 			</ul>
 		%endif
 </%def>

rhodecode/tests/__init__.py

@@ -1,85 +1,92 b''
 """Pylons application test package
 
 This package assumes the Pylons environment is already loaded, such as
 when this script is imported from the `nosetests --with-pylons=test.ini`
 command.
 
 This module initializes the application via ``websetup`` (`paster
 setup-app`) and provides the base testing objects.
 """
 import os
 import time
+import logging
 from os.path import join as jn
 
 from unittest import TestCase
 
 from paste.deploy import loadapp
 from paste.script.appinstall import SetupCommand
 from pylons import config, url
 from routes.util import URLGenerator
 from webtest import TestApp
 
 from rhodecode.model import meta
-import logging
+from rhodecode.model.db import User
+
 import pylons.test
 
 os.environ['TZ'] = 'UTC'
 time.tzset()
 
 log = logging.getLogger(__name__)
 
 __all__ = ['environ', 'url', 'TestController', 'TESTS_TMP_PATH', 'HG_REPO',
            'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO', 'HG_FORK', 'GIT_FORK',
            'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS' ]
 
 # Invoke websetup with the current config file
 # SetupCommand('setup-app').run([config_file])
 
 ##RUNNING DESIRED TESTS
 # nosetests -x rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account
 # nosetests --pdb --pdb-failures 
 environ = {}
 
 #SOME GLOBALS FOR TESTS
 from tempfile import _RandomNameSequence
 TESTS_TMP_PATH = jn('/', 'tmp', 'rc_test_%s' % _RandomNameSequence().next())
 TEST_USER_ADMIN_LOGIN = 'test_admin'
 TEST_USER_ADMIN_PASS = 'test12'
 HG_REPO = 'vcs_test_hg'
 GIT_REPO = 'vcs_test_git'
 
 NEW_HG_REPO = 'vcs_test_hg_new'
 NEW_GIT_REPO = 'vcs_test_git_new'
 
 HG_FORK = 'vcs_test_hg_fork'
 GIT_FORK = 'vcs_test_git_fork'
 
 class TestController(TestCase):
 
     def __init__(self, *args, **kwargs):
         wsgiapp = pylons.test.pylonsapp
         config = wsgiapp.config
 
         self.app = TestApp(wsgiapp)
         url._push_object(URLGenerator(config['routes.map'], environ))
         self.sa = meta.Session
         self.index_location = config['app_conf']['index_dir']
         TestCase.__init__(self, *args, **kwargs)
 
     def log_user(self, username=TEST_USER_ADMIN_LOGIN,
                  password=TEST_USER_ADMIN_PASS):
+        self._logged_username = username
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':username,
                                   'password':password})
-        
+
         if 'invalid user name' in response.body:
             self.fail('could not login using %s %s' % (username, password))
 
         self.assertEqual(response.status, '302 Found')
         self.assertEqual(response.session['rhodecode_user'].username, username)
         return response.follow()
 
+    def _get_logged_user(self):
+        return User.get_by_username(self._logged_username)
+
+
     def checkSessionFlash(self, response, msg):
         self.assertTrue('flash' in response.session)
         self.assertTrue(msg in response.session['flash'][0][1])
 

rhodecode/tests/test_models.py

@@ -1,221 +1,225 b''
 import os
 import unittest
 from rhodecode.tests import *
 
 from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import RepoGroup, User, Notification, UserNotification
 from sqlalchemy.exc import IntegrityError
 from rhodecode.model.user import UserModel
 
 from rhodecode.model import meta
 
 Session = meta.Session()
 
 class TestReposGroups(unittest.TestCase):
 
     def setUp(self):
         self.g1 = self.__make_group('test1', skip_if_exists=True)
         self.g2 = self.__make_group('test2', skip_if_exists=True)
         self.g3 = self.__make_group('test3', skip_if_exists=True)
 
     def tearDown(self):
         print 'out'
 
     def __check_path(self, *path):
         path = [TESTS_TMP_PATH] + list(path)
         path = os.path.join(*path)
         return os.path.isdir(path)
 
     def _check_folders(self):
         print os.listdir(TESTS_TMP_PATH)
 
     def __make_group(self, path, desc='desc', parent_id=None,
                      skip_if_exists=False):
 
         gr = RepoGroup.get_by_group_name(path)
         if gr and skip_if_exists:
             return gr
 
         form_data = dict(group_name=path,
                          group_description=desc,
                          group_parent_id=parent_id)
         gr = ReposGroupModel().create(form_data)
         return gr
 
     def __delete_group(self, id_):
         ReposGroupModel().delete(id_)
 
 
     def __update_group(self, id_, path, desc='desc', parent_id=None):
         form_data = dict(group_name=path,
                          group_description=desc,
                          group_parent_id=parent_id)
 
         gr = ReposGroupModel().update(id_, form_data)
         return gr
 
     def test_create_group(self):
         g = self.__make_group('newGroup')
         self.assertEqual(g.full_path, 'newGroup')
 
         self.assertTrue(self.__check_path('newGroup'))
 
 
     def test_create_same_name_group(self):
         self.assertRaises(IntegrityError, lambda:self.__make_group('newGroup'))
 
 
     def test_same_subgroup(self):
         sg1 = self.__make_group('sub1', parent_id=self.g1.group_id)
         self.assertEqual(sg1.parent_group, self.g1)
         self.assertEqual(sg1.full_path, 'test1/sub1')
         self.assertTrue(self.__check_path('test1', 'sub1'))
 
         ssg1 = self.__make_group('subsub1', parent_id=sg1.group_id)
         self.assertEqual(ssg1.parent_group, sg1)
         self.assertEqual(ssg1.full_path, 'test1/sub1/subsub1')
         self.assertTrue(self.__check_path('test1', 'sub1', 'subsub1'))
 
 
     def test_remove_group(self):
         sg1 = self.__make_group('deleteme')
         self.__delete_group(sg1.group_id)
 
         self.assertEqual(RepoGroup.get(sg1.group_id), None)
         self.assertFalse(self.__check_path('deteteme'))
 
         sg1 = self.__make_group('deleteme', parent_id=self.g1.group_id)
         self.__delete_group(sg1.group_id)
 
         self.assertEqual(RepoGroup.get(sg1.group_id), None)
         self.assertFalse(self.__check_path('test1', 'deteteme'))
 
 
     def test_rename_single_group(self):
         sg1 = self.__make_group('initial')
 
         new_sg1 = self.__update_group(sg1.group_id, 'after')
         self.assertTrue(self.__check_path('after'))
         self.assertEqual(RepoGroup.get_by_group_name('initial'), None)
 
 
     def test_update_group_parent(self):
 
         sg1 = self.__make_group('initial', parent_id=self.g1.group_id)
 
         new_sg1 = self.__update_group(sg1.group_id, 'after', parent_id=self.g1.group_id)
         self.assertTrue(self.__check_path('test1', 'after'))
         self.assertEqual(RepoGroup.get_by_group_name('test1/initial'), None)
 
 
         new_sg1 = self.__update_group(sg1.group_id, 'after', parent_id=self.g3.group_id)
         self.assertTrue(self.__check_path('test3', 'after'))
         self.assertEqual(RepoGroup.get_by_group_name('test3/initial'), None)
 
 
         new_sg1 = self.__update_group(sg1.group_id, 'hello')
         self.assertTrue(self.__check_path('hello'))
 
         self.assertEqual(RepoGroup.get_by_group_name('hello'), new_sg1)
 
 
 
     def test_subgrouping_with_repo(self):
 
         g1 = self.__make_group('g1')
         g2 = self.__make_group('g2')
 
         # create new repo
         form_data = dict(repo_name='john',
                          repo_name_full='john',
                          fork_name=None,
                          description=None,
                          repo_group=None,
                          private=False,
                          repo_type='hg',
                          clone_uri=None)
         cur_user = User.get_by_username(TEST_USER_ADMIN_LOGIN)
         r = RepoModel().create(form_data, cur_user)
 
         self.assertEqual(r.repo_name, 'john')
 
         # put repo into group
         form_data = form_data
         form_data['repo_group'] = g1.group_id
         form_data['perms_new'] = []
         form_data['perms_updates'] = []
         RepoModel().update(r.repo_name, form_data)
         self.assertEqual(r.repo_name, 'g1/john')
 
 
         self.__update_group(g1.group_id, 'g1', parent_id=g2.group_id)
         self.assertTrue(self.__check_path('g2', 'g1'))
 
         # test repo
         self.assertEqual(r.repo_name, os.path.join('g2', 'g1', r.just_name))
 
 
 class TestNotifications(unittest.TestCase):
 
 
 
     def setUp(self):
-        self.u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                               email='[e-mail]',
-                                               name='u1', lastname='u1')
-        self.u2 = UserModel().create_or_update(username='u2', password='qweqwe',
-                                               email='[e-mail]',
-                                               name='u2', lastname='u3')
-        self.u3 = UserModel().create_or_update(username='u3', password='qweqwe',
-                                               email='[e-mail]',
-                                               name='u3', lastname='u3')
-
+        self.u1 = UserModel().create_or_update(username=u'u1', password=u'qweqwe',
+                                               email=u'[e-mail]',
+                                               name=u'u1', lastname=u'u1')
+        self.u2 = UserModel().create_or_update(username=u'u2', password=u'qweqwe',
+                                               email=u'[e-mail]',
+                                               name=u'u2', lastname=u'u3')
+        self.u3 = UserModel().create_or_update(username=u'u3', password=u'qweqwe',
+                                               email=u'[e-mail]',
+                                               name=u'u3', lastname=u'u3')
+    def tearDown(self):
+        User.delete(self.u1.user_id)
+        User.delete(self.u2.user_id)
+        User.delete(self.u3.user_id)
 
 
     def test_create_notification(self):
         usrs = [self.u1, self.u2]
         notification = Notification.create(created_by=self.u1,
-                                           subject='subj', body='hi there',
+                                           subject=u'subj', body=u'hi there',
                                            recipients=usrs)
+        Session.commit()
 
-        notifications = Session.query(Notification).all()
+
+        notifications = Notification.query().all()
+        self.assertEqual(len(notifications), 1)
+
         unotification = UserNotification.query()\
             .filter(UserNotification.notification == notification).all()
-        self.assertEqual(len(notifications), 1)
+
         self.assertEqual(notifications[0].recipients, [self.u1, self.u2])
         self.assertEqual(notification.notification_id,
                          notifications[0].notification_id)
         self.assertEqual(len(unotification), len(usrs))
         self.assertEqual([x.user.user_id for x in unotification],
                          [x.user_id for x in usrs])
 
     def test_user_notifications(self):
         notification1 = Notification.create(created_by=self.u1,
-                                            subject='subj', body='hi there',
+                                            subject=u'subj', body=u'hi there',
                                             recipients=[self.u3])
         notification2 = Notification.create(created_by=self.u1,
-                                            subject='subj', body='hi there',
+                                            subject=u'subj', body=u'hi there',
                                             recipients=[self.u3])
         self.assertEqual(self.u3.notifications, [notification1, notification2])
 
     def test_delete_notifications(self):
         notification = Notification.create(created_by=self.u1,
-                                           subject='title', body='hi there3',
+                                           subject=u'title', body=u'hi there3',
                                     recipients=[self.u3, self.u1, self.u2])
+        Session.commit()
         notifications = Notification.query().all()
         self.assertTrue(notification in notifications)
 
         Notification.delete(notification.notification_id)
+        Session.commit()
 
         notifications = Notification.query().all()
         self.assertFalse(notification in notifications)
 
         un = UserNotification.query().filter(UserNotification.notification
                                              == notification).all()
         self.assertEqual(un, [])
-
-    def tearDown(self):
-        User.delete(self.u1.user_id)
-        User.delete(self.u2.user_id)
-        User.delete(self.u3.user_id)