#49 Enabled anonymous access for web interface controllable from permissions pannel

rhodecode/controllers/admin/permissions.py

@@ -1,162 +1,165 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # permissions controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 #
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 27, 2010
 permissions controller for pylons
 @author: marcink
 """
 
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url
 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
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.forms import UserForm, DefaultPermissionsForm
 from rhodecode.model.permission_model import PermissionModel
 from rhodecode.model.user import UserModel
 import formencode
 import logging
 import traceback
 
 log = logging.getLogger(__name__)
 
 class PermissionsController(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('permission', 'permissions')
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(PermissionsController, self).__before__()
 
         self.perms_choices = [('repository.none', _('None'),),
                               ('repository.read', _('Read'),),
                               ('repository.write', _('Write'),),
                               ('repository.admin', _('Admin'),)]
         self.register_choices = [
-            ('hg.register.none', 'disabled'),
+            ('hg.register.none',
+                _('disabled')),
             ('hg.register.manual_activate',
-                            _('allowed with manual account activation')),
+                _('allowed with manual account activation')),
             ('hg.register.auto_activate',
-                            _('allowed with automatic account activation')), ]
+                _('allowed with automatic account activation')), ]
 
         self.create_choices = [('hg.create.none', _('Disabled')),
                                ('hg.create.repository', _('Enabled'))]
 
 
     def index(self, format='html'):
         """GET /permissions: All items in the collection"""
         # url('permissions')
 
     def create(self):
         """POST /permissions: Create a new item"""
         # url('permissions')
 
     def new(self, format='html'):
         """GET /permissions/new: Form to create a new item"""
         # url('new_permission')
 
     def update(self, id):
         """PUT /permissions/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('permission', id=ID),
         #           method='put')
         # url('permission', id=ID)
 
         permission_model = PermissionModel()
 
         _form = DefaultPermissionsForm([x[0] for x in self.perms_choices],
                                        [x[0] for x in self.register_choices],
                                        [x[0] for x in self.create_choices])()
 
         try:
             form_result = _form.to_python(dict(request.POST))
             form_result.update({'perm_user_name':id})
             permission_model.update(form_result)
             h.flash(_('Default permissions updated succesfully'),
                     category='success')
 
         except formencode.Invalid, errors:
             c.perms_choices = self.perms_choices
             c.register_choices = self.register_choices
             c.create_choices = self.create_choices
 
             return htmlfill.render(
                 render('admin/permissions/permissions.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 occured during update of permissions'),
                     category='error')
 
         return redirect(url('edit_permission', id=id))
 
 
 
     def delete(self, id):
         """DELETE /permissions/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('permission', id=ID),
         #           method='delete')
         # url('permission', id=ID)
 
     def show(self, id, format='html'):
         """GET /permissions/id: Show a specific item"""
         # url('permission', id=ID)
 
     def edit(self, id, format='html'):
         """GET /permissions/id/edit: Form to edit an existing item"""
         #url('edit_permission', id=ID)
         c.perms_choices = self.perms_choices
         c.register_choices = self.register_choices
         c.create_choices = self.create_choices
 
         if id == 'default':
-            defaults = {'_method':'put'}
-            for p in UserModel().get_by_username('default').user_perms:
+            default_user = UserModel().get_by_username('default')
+            defaults = {'_method':'put',
+                        'anonymous':default_user.active}
+            for p in default_user.user_perms:
                 if p.permission.permission_name.startswith('repository.'):
                     defaults['default_perm'] = p.permission.permission_name
 
                 if p.permission.permission_name.startswith('hg.register.'):
                     defaults['default_register'] = p.permission.permission_name
 
                 if p.permission.permission_name.startswith('hg.create.'):
                     defaults['default_create'] = p.permission.permission_name
 
             return htmlfill.render(
                         render('admin/permissions/permissions.html'),
                         defaults=defaults,
                         encoding="UTF-8",
                         force_defaults=True,)
         else:
             return redirect(url('admin_home'))

rhodecode/controllers/admin/settings.py

@@ -1,312 +1,316 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # settings controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 #
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on July 14, 2010
 settings controller for pylons
 @author: marcink
 """
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url, app_globals as g, \
     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
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
     set_rhodecode_config, get_hg_settings, get_hg_ui_settings
 from rhodecode.model.db import RhodeCodeSettings, RhodeCodeUi, Repository
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm
 from rhodecode.model.hg import HgModel
 from rhodecode.model.user import UserModel
 from rhodecode.lib.celerylib import tasks, run_task
 from sqlalchemy import func
 import formencode
 import logging
 import traceback
 
 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 = get_hg_settings()
         defaults.update(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 = HgModel().repo_scan(g.paths[0][1], g.baseui)
             for repo_name in initial.keys():
                 invalidate_cache('get_repo_cached_%s' % repo_name)
 
             repo2db_mapper(initial, rm_obsolete)
 
             h.flash(_('Repositories successfully rescanned'), category='success')
 
         if setting_id == 'whoosh':
             repo_location = get_hg_ui_settings()['paths_root_path']
             full_index = request.POST.get('full_index', False)
             task = 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 = self.sa.query(RhodeCodeSettings)\
-                    .filter(RhodeCodeSettings.app_settings_name == 'title').one()
+                        .filter(RhodeCodeSettings.app_settings_name \
+                                == 'title').one()
+
                     hgsettings1.app_settings_value = form_result['rhodecode_title']
 
                     hgsettings2 = self.sa.query(RhodeCodeSettings)\
-                    .filter(RhodeCodeSettings.app_settings_name == 'realm').one()
+                        .filter(RhodeCodeSettings.app_settings_name \
+                                == 'realm').one()
+
                     hgsettings2.app_settings_value = form_result['rhodecode_realm']
 
 
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
                     self.sa.commit()
                     set_rhodecode_config(config)
                     h.flash(_('Updated application 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 == '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")
 
 
 
         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)
 
     @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)
 
 
     def my_account(self):
         """
         GET /_admin/my_account Displays info about my account 
         """
 
         # url('admin_settings_my_account')
         c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False)
         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 = HgModel().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.__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 = c.rhodecode_user.user_id
         _form = UserForm(edit=True, old_data={'user_id':uid,
                                               'email':c.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 succesfully'),
                     category='success')
 
         except formencode.Invalid, errors:
             c.user = user_model.get(c.rhodecode_user.user_id, cache=False)
             c.user_repos = []
             for repo in c.cached_repo_list.values():
                 if repo.dbrepo.user.username == c.user.username:
                     c.user_repos.append(repo)
             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 occured during update of user %s') \
                     % form_result.get('username'), category='error')
 
         return redirect(url('my_account'))
 
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
         c.new_repo = h.repo_name_slug(new_repo)
 
         return render('admin/repos/repo_add_create_repository.html')
 

rhodecode/controllers/admin/users.py

@@ -1,168 +1,167 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # users controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 # 
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from rhodecode.lib.utils import action_logger
 """
 Created on April 4, 2010
 users controller for pylons
 @author: marcink
 """
 
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url
 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
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import User, UserLog
 from rhodecode.model.forms import UserForm
 from rhodecode.model.user import UserModel, DefaultUserException
 import formencode
 import logging
 import traceback
 
 log = logging.getLogger(__name__)
 
 class UsersController(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('user', 'users')
-    
+
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(UsersController, self).__before__()
-    
+
 
     def index(self, format='html'):
         """GET /users: All items in the collection"""
         # url('users')
-        
-        c.users_list = self.sa.query(User).all()     
+
+        c.users_list = self.sa.query(User).all()
         return render('admin/users/users.html')
-    
+
     def create(self):
         """POST /users: Create a new item"""
         # url('users')
-        
+
         user_model = UserModel()
         login_form = UserForm()()
         try:
             form_result = login_form.to_python(dict(request.POST))
             user_model.create(form_result)
             h.flash(_('created user %s') % form_result['username'],
                     category='success')
             #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa)
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
-                encoding="UTF-8") 
+                encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occured during creation of user %s') \
-                    % request.POST.get('username'), category='error')            
+                    % request.POST.get('username'), category='error')
         return redirect(url('users'))
-    
+
     def new(self, format='html'):
         """GET /users/new: Form to create a new item"""
         # url('new_user')
         return render('admin/users/user_add.html')
 
     def update(self, id):
         """PUT /users/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('user', id=ID),
         #           method='put')
         # url('user', id=ID)
         user_model = UserModel()
         c.user = user_model.get(id)
-        
+
         _form = UserForm(edit=True, old_data={'user_id':id,
                                               'email':c.user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update(id, form_result)
             h.flash(_('User updated succesfully'), category='success')
-                           
+
         except formencode.Invalid, errors:
             return htmlfill.render(
                 render('admin/users/user_edit.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
-                encoding="UTF-8") 
+                encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occured during update of user %s') \
                     % form_result.get('username'), category='error')
-            
+
         return redirect(url('users'))
-    
+
     def delete(self, id):
         """DELETE /users/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('user', id=ID),
         #           method='delete')
         # url('user', id=ID)
         user_model = UserModel()
         try:
             user_model.delete(id)
             h.flash(_('sucessfully deleted user'), category='success')
         except DefaultUserException, e:
             h.flash(str(e), category='warning')
         except Exception:
             h.flash(_('An error occured during deletion of user'),
-                    category='error')            
+                    category='error')
         return redirect(url('users'))
-        
+
     def show(self, id, format='html'):
         """GET /users/id: Show a specific item"""
         # url('user', id=ID)
-    
-    
+
+
     def edit(self, id, format='html'):
         """GET /users/id/edit: Form to edit an existing item"""
         # url('edit_user', id=ID)
         c.user = self.sa.query(User).get(id)
         if not c.user:
             return redirect(url('users'))
         if c.user.username == 'default':
-            h.flash(_("You can't edit this user since it's" 
-              " crucial for entire application"), category='warning')
+            h.flash(_("You can't edit this user"), category='warning')
             return redirect(url('users'))
-        
+
         defaults = c.user.__dict__
         return htmlfill.render(
             render('admin/users/user_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
-        )    
+        )

rhodecode/controllers/login.py

@@ -1,144 +1,146 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # login controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 # 
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
 """
 Created on April 22, 2010
 login controller for pylons
 @author: marcink
 """
 from formencode import htmlfill
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from rhodecode.lib.auth import AuthUser, HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 import rhodecode.lib.helpers as h
 from pylons.i18n.translation import _
 from rhodecode.model.forms import LoginForm, RegisterForm, PasswordResetForm
 from rhodecode.model.user import UserModel
 import formencode
 import logging
 
 log = logging.getLogger(__name__)
 
 class LoginController(BaseController):
 
     def __before__(self):
         super(LoginController, self).__before__()
 
     def index(self):
         #redirect if already logged in
         c.came_from = request.GET.get('came_from', None)
 
-        if c.rhodecode_user.is_authenticated:
+        if c.rhodecode_user.is_authenticated \
+                            and c.rhodecode_user.username != 'default':
+
             return redirect(url('home'))
 
         if request.POST:
             #import Login Form validator class
             login_form = LoginForm()
             try:
                 c.form_result = login_form.to_python(dict(request.POST))
                 username = c.form_result['username']
                 user = UserModel().get_by_username(username)
                 auth_user = AuthUser()
                 auth_user.username = user.username
                 auth_user.is_authenticated = True
                 auth_user.is_admin = user.admin
                 auth_user.user_id = user.user_id
                 auth_user.name = user.name
                 auth_user.lastname = user.lastname
                 session['rhodecode_user'] = auth_user
                 session.save()
                 log.info('user %s is now authenticated', username)
 
                 user.update_lastlogin()
 
                 if c.came_from:
                     return redirect(c.came_from)
                 else:
                     return redirect(url('home'))
 
             except formencode.Invalid, errors:
                 return htmlfill.render(
                     render('/login.html'),
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8")
 
         return render('/login.html')
 
     @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate',
                                'hg.register.manual_activate')
     def register(self):
         user_model = UserModel()
         c.auto_active = False
         for perm in user_model.get_by_username('default', cache=False).user_perms:
             if perm.permission.permission_name == 'hg.register.auto_activate':
                 c.auto_active = True
                 break
 
         if request.POST:
 
             register_form = RegisterForm()()
             try:
                 form_result = register_form.to_python(dict(request.POST))
                 form_result['active'] = c.auto_active
                 user_model.create_registration(form_result)
                 h.flash(_('You have successfully registered into rhodecode'),
                             category='success')
                 return redirect(url('login_home'))
 
             except formencode.Invalid, errors:
                 return htmlfill.render(
                     render('/register.html'),
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8")
 
         return render('/register.html')
 
     def password_reset(self):
         user_model = UserModel()
         if request.POST:
 
             password_reset_form = PasswordResetForm()()
             try:
                 form_result = password_reset_form.to_python(dict(request.POST))
                 user_model.reset_password(form_result)
                 h.flash(_('Your new password was sent'),
                             category='success')
                 return redirect(url('login_home'))
 
             except formencode.Invalid, errors:
                 return htmlfill.render(
                     render('/password_reset.html'),
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8")
 
         return render('/password_reset.html')
 
     def logout(self):
         session['rhodecode_user'] = AuthUser()
         session.save()
         log.info('Logging out and setting user as Empty')
         redirect(url('home'))

rhodecode/lib/auth.py

@@ -1,486 +1,475 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # authentication and permission libraries
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 #
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 4, 2010
 
 @author: marcink
 """
 from pylons import config, session, url, request
 from pylons.controllers.util import abort, redirect
 from rhodecode.lib.utils import get_repo_slug
 from rhodecode.model import meta
+from rhodecode.model.user import UserModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User, RepoToPerm, Repository, Permission, \
-    UserToPerm    
+    UserToPerm
 import bcrypt
 from decorator import decorator
 import logging
 import random
 
-log = logging.getLogger(__name__) 
+log = logging.getLogger(__name__)
 
 class PasswordGenerator(object):
     """This is a simple class for generating password from
         different sets of characters
         usage:
         passwd_gen = PasswordGenerator()
         #print 8-letter password containing only big and small letters of alphabet
         print passwd_gen.gen_password(8, passwd_gen.ALPHABETS_BIG_SMALL)        
     """
     ALPHABETS_NUM = r'''1234567890'''#[0]
     ALPHABETS_SMALL = r'''qwertyuiopasdfghjklzxcvbnm'''#[1]
     ALPHABETS_BIG = r'''QWERTYUIOPASDFGHJKLZXCVBNM'''#[2]
     ALPHABETS_SPECIAL = r'''`-=[]\;',./~!@#$%^&*()_+{}|:"<>?'''    #[3]
     ALPHABETS_FULL = ALPHABETS_BIG + ALPHABETS_SMALL + ALPHABETS_NUM + ALPHABETS_SPECIAL#[4]
     ALPHABETS_ALPHANUM = ALPHABETS_BIG + ALPHABETS_SMALL + ALPHABETS_NUM#[5]
     ALPHABETS_BIG_SMALL = ALPHABETS_BIG + ALPHABETS_SMALL
     ALPHABETS_ALPHANUM_BIG = ALPHABETS_BIG + ALPHABETS_NUM#[6]
     ALPHABETS_ALPHANUM_SMALL = ALPHABETS_SMALL + ALPHABETS_NUM#[7]
-            
+
     def __init__(self, passwd=''):
         self.passwd = passwd
 
     def gen_password(self, len, type):
         self.passwd = ''.join([random.choice(type) for _ in xrange(len)])
         return self.passwd
 
-    
+
 def get_crypt_password(password):
     """Cryptographic function used for password hashing based on sha1
     :param password: password to hash
-    """    
+    """
     return bcrypt.hashpw(password, bcrypt.gensalt(10))
 
 def check_password(password, hashed):
     return bcrypt.hashpw(password, hashed) == hashed
 
 def authfunc(environ, username, password):
-    from rhodecode.model.user import UserModel
     user = UserModel().get_by_username(username, cache=False)
-            
+
     if user:
         if user.active:
             if user.username == username and check_password(password, user.password):
                 log.info('user %s authenticated correctly', username)
                 return True
         else:
             log.error('user %s is disabled', username)
-            
+
     return False
 
 class  AuthUser(object):
     """
     A simple object that handles a mercurial username for authentication
     """
     def __init__(self):
         self.username = 'None'
         self.name = ''
         self.lastname = ''
         self.email = ''
         self.user_id = None
         self.is_authenticated = False
         self.is_admin = False
         self.permissions = {}
 
+    def __repr__(self):
+        return "<AuthUser('id:%s:%s')>" % (self.user_id, self.username)
 
 def set_available_permissions(config):
     """
     This function will propagate pylons globals with all available defined
     permission given in db. We don't wannt to check each time from db for new 
     permissions since adding a new permission also requires application restart
     ie. to decorate new views with the newly created permission
     :param config:
     """
     log.info('getting information about all available permissions')
     try:
         sa = meta.Session()
         all_perms = sa.query(Permission).all()
     except:
         pass
     finally:
         meta.Session.remove()
-    
+
     config['available_permissions'] = [x.permission_name for x in all_perms]
 
 def set_base_path(config):
     config['base_path'] = config['pylons.app_globals'].base_path
 
-def fill_data(user):
-    """
-    Fills user data with those from database and log out user if not present
-    in database
-    :param user:
-    """
-    sa = meta.Session()
-    try:
-        dbuser = sa.query(User)\
-        .options(FromCache('sql_cache_short', 'getuser_%s' % user.user_id))\
-        .get(user.user_id)
-    except:
-        pass
-    finally:
-        meta.Session.remove()
-        
-    if dbuser:
-        user.username = dbuser.username
-        user.is_admin = dbuser.admin
-        user.name = dbuser.name
-        user.lastname = dbuser.lastname
-        user.email = dbuser.email
-    else:
-        user.is_authenticated = False
-        
-    
-    return user
-            
+
 def fill_perms(user):
     """
     Fills user permission attribute with permissions taken from database
     :param user:
     """
-    
+
     sa = meta.Session()
     user.permissions['repositories'] = {}
     user.permissions['global'] = set()
-    
+
     #===========================================================================
     # fetch default permissions
     #===========================================================================
-    default_user = sa.query(User)\
-        .options(FromCache('sql_cache_short', 'getuser_%s' % 'default'))\
-        .filter(User.username == 'default').scalar()
-                                            
+    default_user = UserModel(sa).get_by_username('default', cache=True)
+
     default_perms = sa.query(RepoToPerm, Repository, Permission)\
         .join((Repository, RepoToPerm.repository_id == Repository.repo_id))\
         .join((Permission, RepoToPerm.permission_id == Permission.permission_id))\
         .filter(RepoToPerm.user == default_user).all()
-                                            
+
     if user.is_admin:
         #=======================================================================
         # #admin have all default rights set to admin        
         #=======================================================================
         user.permissions['global'].add('hg.admin')
-        
+
         for perm in default_perms:
             p = 'repository.admin'
             user.permissions['repositories'][perm.RepoToPerm.repository.repo_name] = p
-    
+
     else:
         #=======================================================================
         # set default permissions
         #=======================================================================
-        
+
         #default global
         default_global_perms = sa.query(UserToPerm)\
-            .filter(UserToPerm.user == sa.query(User).filter(User.username == 
+            .filter(UserToPerm.user == sa.query(User).filter(User.username ==
             'default').one())
-        
+
         for perm in default_global_perms:
             user.permissions['global'].add(perm.permission.permission_name)
-                    
+
         #default repositories
         for perm in default_perms:
             if perm.Repository.private and not perm.Repository.user_id == user.user_id:
                 #disable defaults for private repos,
                 p = 'repository.none'
             elif perm.Repository.user_id == user.user_id:
                 #set admin if owner
                 p = 'repository.admin'
             else:
                 p = perm.Permission.permission_name
-                
+
             user.permissions['repositories'][perm.RepoToPerm.repository.repo_name] = p
-                                                
+
         #=======================================================================
         # #overwrite default with user permissions if any
         #=======================================================================
         user_perms = sa.query(RepoToPerm, Permission, Repository)\
             .join((Repository, RepoToPerm.repository_id == Repository.repo_id))\
             .join((Permission, RepoToPerm.permission_id == Permission.permission_id))\
             .filter(RepoToPerm.user_id == user.user_id).all()
-            
+
         for perm in user_perms:
             if perm.Repository.user_id == user.user_id:#set admin if owner
                 p = 'repository.admin'
             else:
                 p = perm.Permission.permission_name
             user.permissions['repositories'][perm.RepoToPerm.repository.repo_name] = p
-    meta.Session.remove()         
+    meta.Session.remove()
     return user
-    
+
 def get_user(session):
     """
     Gets user from session, and wraps permissions into user
     :param session:
     """
     user = session.get('rhodecode_user', AuthUser())
+
+
+    #if the user is not logged in we check for anonymous access
+    #if user is logged and it's a default user check if we still have anonymous
+    #access enabled
+    if user.user_id is None or user.username == 'default':
+        anonymous_user = UserModel().get_by_username('default', cache=True)
+        if anonymous_user.active is True:
+            #then we set this user is logged in
+            user.is_authenticated = True
+        else:
+            user.is_authenticated = False
+
     if user.is_authenticated:
-        user = fill_data(user)
+        user = UserModel().fill_data(user)
+
     user = fill_perms(user)
     session['rhodecode_user'] = user
     session.save()
     return user
-        
+
 #===============================================================================
 # CHECK DECORATORS
 #===============================================================================
 class LoginRequired(object):
     """Must be logged in to execute this function else redirect to login page"""
-   
+
     def __call__(self, func):
         return decorator(self.__wrapper, func)
-    
+
     def __wrapper(self, func, *fargs, **fkwargs):
         user = session.get('rhodecode_user', AuthUser())
         log.debug('Checking login required for user:%s', user.username)
         if user.is_authenticated:
             log.debug('user %s is authenticated', user.username)
             return func(*fargs, **fkwargs)
         else:
             log.warn('user %s not authenticated', user.username)
-            
+
             p = ''
             if request.environ.get('SCRIPT_NAME') != '/':
                 p += request.environ.get('SCRIPT_NAME')
-                
+
             p += request.environ.get('PATH_INFO')
             if request.environ.get('QUERY_STRING'):
                 p += '?' + request.environ.get('QUERY_STRING')
-                
-            log.debug('redirecting to login page with %s', p)                
+
+            log.debug('redirecting to login page with %s', p)
             return redirect(url('login_home', came_from=p))
 
 class PermsDecorator(object):
     """Base class for decorators"""
-    
+
     def __init__(self, *required_perms):
         available_perms = config['available_permissions']
         for perm in required_perms:
             if perm not in available_perms:
                 raise Exception("'%s' permission is not defined" % perm)
         self.required_perms = set(required_perms)
         self.user_perms = None
-        
+
     def __call__(self, func):
         return decorator(self.__wrapper, func)
-    
-    
+
+
     def __wrapper(self, func, *fargs, **fkwargs):
 #        _wrapper.__name__ = func.__name__
 #        _wrapper.__dict__.update(func.__dict__)
 #        _wrapper.__doc__ = func.__doc__
+        self.user = session.get('rhodecode_user', AuthUser())
+        self.user_perms = self.user.permissions
+        log.debug('checking %s permissions %s for %s %s',
+           self.__class__.__name__, self.required_perms, func.__name__,
+               self.user)
 
-        self.user_perms = session.get('rhodecode_user', AuthUser()).permissions
-        log.debug('checking %s permissions %s for %s',
-           self.__class__.__name__, self.required_perms, func.__name__)
-        
         if self.check_permissions():
-            log.debug('Permission granted for %s', func.__name__)
-            
+            log.debug('Permission granted for %s %s', func.__name__, self.user)
+
             return func(*fargs, **fkwargs)
-        
+
         else:
-            log.warning('Permission denied for %s', func.__name__)
+            log.warning('Permission denied for %s %s', func.__name__, self.user)
             #redirect with forbidden ret code
             return abort(403)
 
-        
-        
+
+
     def check_permissions(self):
         """Dummy function for overriding"""
         raise Exception('You have to write this function in child class')
 
 class HasPermissionAllDecorator(PermsDecorator):
     """Checks for access permission for all given predicates. All of them 
     have to be meet in order to fulfill the request
     """
-        
+
     def check_permissions(self):
         if self.required_perms.issubset(self.user_perms.get('global')):
             return True
         return False
-            
+
 
 class HasPermissionAnyDecorator(PermsDecorator):
     """Checks for access permission for any of given predicates. In order to 
     fulfill the request any of predicates must be meet
     """
-    
+
     def check_permissions(self):
         if self.required_perms.intersection(self.user_perms.get('global')):
             return True
         return False
 
 class HasRepoPermissionAllDecorator(PermsDecorator):
     """Checks for access permission for all given predicates for specific 
     repository. All of them have to be meet in order to fulfill the request
     """
-            
+
     def check_permissions(self):
         repo_name = get_repo_slug(request)
         try:
             user_perms = set([self.user_perms['repositories'][repo_name]])
         except KeyError:
             return False
         if self.required_perms.issubset(user_perms):
             return True
         return False
-            
+
 
 class HasRepoPermissionAnyDecorator(PermsDecorator):
     """Checks for access permission for any of given predicates for specific 
     repository. In order to fulfill the request any of predicates must be meet
     """
-            
+
     def check_permissions(self):
         repo_name = get_repo_slug(request)
-        
+
         try:
             user_perms = set([self.user_perms['repositories'][repo_name]])
         except KeyError:
             return False
         if self.required_perms.intersection(user_perms):
             return True
         return False
 #===============================================================================
 # CHECK FUNCTIONS
 #===============================================================================
 
 class PermsFunction(object):
     """Base function for other check functions"""
-    
+
     def __init__(self, *perms):
         available_perms = config['available_permissions']
-        
+
         for perm in perms:
             if perm not in available_perms:
                 raise Exception("'%s' permission in not defined" % perm)
         self.required_perms = set(perms)
         self.user_perms = None
         self.granted_for = ''
         self.repo_name = None
-        
+
     def __call__(self, check_Location=''):
         user = session.get('rhodecode_user', False)
         if not user:
             return False
         self.user_perms = user.permissions
-        self.granted_for = user.username        
-        log.debug('checking %s %s', self.__class__.__name__, self.required_perms)            
-        
+        self.granted_for = user.username
+        log.debug('checking %s %s %s', self.__class__.__name__,
+                  self.required_perms, user)
+
         if self.check_permissions():
-            log.debug('Permission granted for %s @%s', self.granted_for,
-                      check_Location)
+            log.debug('Permission granted for %s @ %s %s', self.granted_for,
+                      check_Location, user)
             return True
-        
+
         else:
-            log.warning('Permission denied for %s @%s', self.granted_for,
-                        check_Location)
-            return False 
-    
+            log.warning('Permission denied for %s @ %s %s', self.granted_for,
+                        check_Location, user)
+            return False
+
     def check_permissions(self):
         """Dummy function for overriding"""
         raise Exception('You have to write this function in child class')
-        
+
 class HasPermissionAll(PermsFunction):
     def check_permissions(self):
         if self.required_perms.issubset(self.user_perms.get('global')):
             return True
         return False
 
 class HasPermissionAny(PermsFunction):
     def check_permissions(self):
         if self.required_perms.intersection(self.user_perms.get('global')):
             return True
         return False
 
 class HasRepoPermissionAll(PermsFunction):
-    
+
     def __call__(self, repo_name=None, check_Location=''):
         self.repo_name = repo_name
         return super(HasRepoPermissionAll, self).__call__(check_Location)
-            
+
     def check_permissions(self):
         if not self.repo_name:
             self.repo_name = get_repo_slug(request)
 
         try:
             self.user_perms = set([self.user_perms['repositories']\
                                    [self.repo_name]])
         except KeyError:
             return False
-        self.granted_for = self.repo_name       
+        self.granted_for = self.repo_name
         if self.required_perms.issubset(self.user_perms):
             return True
         return False
-            
+
 class HasRepoPermissionAny(PermsFunction):
-    
+
     def __call__(self, repo_name=None, check_Location=''):
         self.repo_name = repo_name
         return super(HasRepoPermissionAny, self).__call__(check_Location)
-        
+
     def check_permissions(self):
         if not self.repo_name:
             self.repo_name = get_repo_slug(request)
 
         try:
             self.user_perms = set([self.user_perms['repositories']\
                                    [self.repo_name]])
         except KeyError:
             return False
         self.granted_for = self.repo_name
         if self.required_perms.intersection(self.user_perms):
             return True
         return False
 
 #===============================================================================
 # SPECIAL VERSION TO HANDLE MIDDLEWARE AUTH
 #===============================================================================
 
 class HasPermissionAnyMiddleware(object):
     def __init__(self, *perms):
         self.required_perms = set(perms)
-    
+
     def __call__(self, user, repo_name):
         usr = AuthUser()
         usr.user_id = user.user_id
         usr.username = user.username
         usr.is_admin = user.admin
-        
+
         try:
             self.user_perms = set([fill_perms(usr)\
                                    .permissions['repositories'][repo_name]])
         except:
             self.user_perms = set()
         self.granted_for = ''
         self.username = user.username
-        self.repo_name = repo_name        
+        self.repo_name = repo_name
         return self.check_permissions()
-            
+
     def check_permissions(self):
         log.debug('checking mercurial protocol '
                   'permissions for user:%s repository:%s',
                                                 self.username, self.repo_name)
         if self.required_perms.intersection(self.user_perms):
             log.debug('permission granted')
             return True
         log.debug('permission denied')
         return False

rhodecode/lib/db_manage.py

@@ -1,300 +1,300 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # database management for RhodeCode
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 #
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
 """
 Created on April 10, 2010
 database management and creation for RhodeCode
 @author: marcink
 """
 
 from os.path import dirname as dn, join as jn
 import os
 import sys
 import uuid
 
 from rhodecode.lib.auth import get_crypt_password
 from rhodecode.lib.utils import ask_ok
 from rhodecode.model import init_model
 from rhodecode.model.db import User, Permission, RhodeCodeUi, RhodeCodeSettings, \
     UserToPerm
 from rhodecode.model import meta
 from sqlalchemy.engine import create_engine
 import logging
 
 log = logging.getLogger(__name__)
 
 class DbManage(object):
     def __init__(self, log_sql, dbname, root, tests=False):
         self.dbname = dbname
         self.tests = tests
         self.root = root
         dburi = 'sqlite:////%s' % jn(self.root, self.dbname)
         engine = create_engine(dburi, echo=log_sql)
         init_model(engine)
         self.sa = meta.Session()
         self.db_exists = False
 
     def check_for_db(self, override):
         db_path = jn(self.root, self.dbname)
         log.info('checking for existing db in %s', db_path)
         if os.path.isfile(db_path):
             self.db_exists = True
             if not override:
                 raise Exception('database already exists')
 
     def create_tables(self, override=False):
         """
         Create a auth database
         """
         self.check_for_db(override)
         if self.db_exists:
             log.info("database exist and it's going to be destroyed")
             if self.tests:
                 destroy = True
             else:
                 destroy = ask_ok('Are you sure to destroy old database ? [y/n]')
             if not destroy:
                 sys.exit()
             if self.db_exists and destroy:
                 os.remove(jn(self.root, self.dbname))
         checkfirst = not override
         meta.Base.metadata.create_all(checkfirst=checkfirst)
         log.info('Created tables for %s', self.dbname)
 
     def admin_prompt(self, second=False):
         if not self.tests:
             import getpass
 
 
             def get_password():
                 password = getpass.getpass('Specify admin password (min 6 chars):')
                 confirm = getpass.getpass('Confirm password:')
 
                 if password != confirm:
                     log.error('passwords mismatch')
                     return False
                 if len(password) < 6:
                     log.error('password is to short use at least 6 characters')
                     return False
 
                 return password
 
             username = raw_input('Specify admin username:')
 
             password = get_password()
             if not password:
                 #second try
                 password = get_password()
                 if not password:
                     sys.exit()
 
             email = raw_input('Specify admin email:')
             self.create_user(username, password, email, True)
         else:
             log.info('creating admin and regular test users')
             self.create_user('test_admin', 'test12', '[e-mail]', True)
             self.create_user('test_regular', 'test12', '[e-mail]', False)
             self.create_user('test_regular2', 'test12', '[e-mail]', False)
 
 
 
     def config_prompt(self, test_repo_path=''):
         log.info('Setting up repositories config')
 
         if not self.tests and not test_repo_path:
             path = raw_input('Specify valid full path to your repositories'
                         ' you can change this later in application settings:')
         else:
             path = test_repo_path
 
         if not os.path.isdir(path):
             log.error('You entered wrong path: %s', path)
             sys.exit()
 
         hooks1 = RhodeCodeUi()
         hooks1.ui_section = 'hooks'
         hooks1.ui_key = 'changegroup.update'
         hooks1.ui_value = 'hg update >&2'
         hooks1.ui_active = False
 
         hooks2 = RhodeCodeUi()
         hooks2.ui_section = 'hooks'
         hooks2.ui_key = 'changegroup.repo_size'
         hooks2.ui_value = 'python:rhodecode.lib.hooks.repo_size'
-        
+
         hooks3 = RhodeCodeUi()
         hooks3.ui_section = 'hooks'
         hooks3.ui_key = 'pretxnchangegroup.push_logger'
         hooks3.ui_value = 'python:rhodecode.lib.hooks.log_push_action'
-        
+
         hooks4 = RhodeCodeUi()
         hooks4.ui_section = 'hooks'
         hooks4.ui_key = 'preoutgoing.pull_logger'
         hooks4.ui_value = 'python:rhodecode.lib.hooks.log_pull_action'
-        
+
 
         web1 = RhodeCodeUi()
         web1.ui_section = 'web'
         web1.ui_key = 'push_ssl'
         web1.ui_value = 'false'
 
         web2 = RhodeCodeUi()
         web2.ui_section = 'web'
         web2.ui_key = 'allow_archive'
         web2.ui_value = 'gz zip bz2'
 
         web3 = RhodeCodeUi()
         web3.ui_section = 'web'
         web3.ui_key = 'allow_push'
         web3.ui_value = '*'
 
         web4 = RhodeCodeUi()
         web4.ui_section = 'web'
         web4.ui_key = 'baseurl'
         web4.ui_value = '/'
 
         paths = RhodeCodeUi()
         paths.ui_section = 'paths'
         paths.ui_key = '/'
         paths.ui_value = path
 
 
         hgsettings1 = RhodeCodeSettings()
 
         hgsettings1.app_settings_name = 'realm'
         hgsettings1.app_settings_value = 'RhodeCode authentication'
 
         hgsettings2 = RhodeCodeSettings()
         hgsettings2.app_settings_name = 'title'
         hgsettings2.app_settings_value = 'RhodeCode'
 
         try:
             self.sa.add(hooks1)
             self.sa.add(hooks2)
             self.sa.add(hooks3)
             self.sa.add(hooks4)
             self.sa.add(web1)
             self.sa.add(web2)
             self.sa.add(web3)
             self.sa.add(web4)
             self.sa.add(paths)
             self.sa.add(hgsettings1)
             self.sa.add(hgsettings2)
             self.sa.commit()
         except:
             self.sa.rollback()
             raise
         log.info('created ui config')
 
     def create_user(self, username, password, email='', admin=False):
         log.info('creating administrator user %s', username)
         new_user = User()
         new_user.username = username
         new_user.password = get_crypt_password(password)
         new_user.name = 'RhodeCode'
         new_user.lastname = 'Admin'
         new_user.email = email
         new_user.admin = admin
         new_user.active = True
 
         try:
             self.sa.add(new_user)
             self.sa.commit()
         except:
             self.sa.rollback()
             raise
 
     def create_default_user(self):
         log.info('creating default user')
         #create default user for handling default permissions.
         def_user = User()
         def_user.username = 'default'
         def_user.password = get_crypt_password(str(uuid.uuid1())[:8])
-        def_user.name = 'default'
-        def_user.lastname = 'default'
-        def_user.email = '[e-mail]'
+        def_user.name = 'Anonymous'
+        def_user.lastname = 'User'
+        def_user.email = '[e-mail]'
         def_user.admin = False
         def_user.active = False
         try:
             self.sa.add(def_user)
             self.sa.commit()
         except:
             self.sa.rollback()
             raise
 
     def create_permissions(self):
         #module.(access|create|change|delete)_[name]
         #module.(read|write|owner)
         perms = [('repository.none', 'Repository no access'),
                  ('repository.read', 'Repository read access'),
                  ('repository.write', 'Repository write access'),
                  ('repository.admin', 'Repository admin access'),
                  ('hg.admin', 'Hg Administrator'),
                  ('hg.create.repository', 'Repository create'),
                  ('hg.create.none', 'Repository creation disabled'),
                  ('hg.register.none', 'Register disabled'),
                  ('hg.register.manual_activate', 'Register new user with rhodecode without manual activation'),
                  ('hg.register.auto_activate', 'Register new user with rhodecode without auto activation'),
                 ]
 
         for p in perms:
             new_perm = Permission()
             new_perm.permission_name = p[0]
             new_perm.permission_longname = p[1]
             try:
                 self.sa.add(new_perm)
                 self.sa.commit()
             except:
                 self.sa.rollback()
                 raise
 
     def populate_default_permissions(self):
         log.info('creating default user permissions')
 
         default_user = self.sa.query(User)\
         .filter(User.username == 'default').scalar()
 
         reg_perm = UserToPerm()
         reg_perm.user = default_user
         reg_perm.permission = self.sa.query(Permission)\
         .filter(Permission.permission_name == 'hg.register.manual_activate')\
         .scalar()
 
         create_repo_perm = UserToPerm()
         create_repo_perm.user = default_user
         create_repo_perm.permission = self.sa.query(Permission)\
         .filter(Permission.permission_name == 'hg.create.repository')\
         .scalar()
 
         default_repo_perm = UserToPerm()
         default_repo_perm.user = default_user
         default_repo_perm.permission = self.sa.query(Permission)\
         .filter(Permission.permission_name == 'repository.read')\
         .scalar()
 
         try:
             self.sa.add(reg_perm)
             self.sa.add(create_repo_perm)
             self.sa.add(default_repo_perm)
             self.sa.commit()
         except:
             self.sa.rollback()
             raise
 

rhodecode/model/forms.py

@@ -1,365 +1,366 b''
 """ this is forms validation classes
 http://formencode.org/module-formencode.validators.html
 for list off all availible validators
 
 we can create our own validators
 
 The table below outlines the options which can be used in a schema in addition to the validators themselves
 pre_validators          []     These validators will be applied before the schema
 chained_validators      []     These validators will be applied after the schema
 allow_extra_fields      False     If True, then it is not an error when keys that aren't associated with a validator are present
 filter_extra_fields     False     If True, then keys that aren't associated with a validator are removed
 if_key_missing          NoDefault If this is given, then any keys that aren't available but are expected will be replaced with this value (and then validated). This does not override a present .if_missing attribute on validators. NoDefault is a special FormEncode class to mean that no default values has been specified and therefore missing keys shouldn't take a default value.
 ignore_key_missing      False     If True, then missing keys will be missing in the result, if the validator doesn't have .if_missing on it already    
   
   
 <name> = formencode.validators.<name of validator>
 <name> must equal form name
 list=[1,2,3,4,5]
 for SELECT use formencode.All(OneOf(list), Int())
     
 """
 from formencode import All
 from formencode.validators import UnicodeString, OneOf, Int, Number, Regex, \
     Email, Bool, StringBoolean
 from pylons import session
 from pylons.i18n.translation import _
 from rhodecode.lib.auth import check_password, get_crypt_password
 from rhodecode.model import meta
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
 from webhelpers.pylonslib.secure_form import authentication_token
 from vcs import BACKENDS
 import formencode
 import logging
 import os
 import rhodecode.lib.helpers as h
 
 log = logging.getLogger(__name__)
 
 #this is needed to translate the messages using _() in validators
 class State_obj(object):
     _ = staticmethod(_)
 
 #===============================================================================
 # VALIDATORS
 #===============================================================================
 class ValidAuthToken(formencode.validators.FancyValidator):
     messages = {'invalid_token':_('Token mismatch')}
 
     def validate_python(self, value, state):
 
         if value != authentication_token():
             raise formencode.Invalid(self.message('invalid_token', state,
                                             search_number=value), value, state)
 
 def ValidUsername(edit, old_data):
     class _ValidUsername(formencode.validators.FancyValidator):
 
         def validate_python(self, value, state):
             if value in ['default', 'new_user']:
                 raise formencode.Invalid(_('Invalid username'), value, state)
             #check if user is unique
             old_un = None
             if edit:
                 old_un = UserModel().get(old_data.get('user_id')).username
 
             if old_un != value or not edit:
                 if UserModel().get_by_username(value, cache=False):
                     raise formencode.Invalid(_('This username already exists') ,
                                              value, state)
 
     return _ValidUsername
 
 class ValidPassword(formencode.validators.FancyValidator):
 
     def to_python(self, value, state):
         if value:
             return get_crypt_password(value)
 
 class ValidAuth(formencode.validators.FancyValidator):
     messages = {
             'invalid_password':_('invalid password'),
             'invalid_login':_('invalid user name'),
             'disabled_account':_('Your acccount is disabled')
 
             }
     #error mapping
     e_dict = {'username':messages['invalid_login'],
               'password':messages['invalid_password']}
     e_dict_disable = {'username':messages['disabled_account']}
 
     def validate_python(self, value, state):
         password = value['password']
         username = value['username']
         user = UserModel().get_by_username(username)
         if user is None:
             raise formencode.Invalid(self.message('invalid_password',
                                      state=State_obj), value, state,
                                      error_dict=self.e_dict)
         if user:
             if user.active:
                 if user.username == username and check_password(password,
                                                                 user.password):
                     return value
                 else:
                     log.warning('user %s not authenticated', username)
                     raise formencode.Invalid(self.message('invalid_password',
                                              state=State_obj), value, state,
                                              error_dict=self.e_dict)
             else:
                 log.warning('user %s is disabled', username)
                 raise formencode.Invalid(self.message('disabled_account',
                                          state=State_obj),
                                          value, state,
                                          error_dict=self.e_dict_disable)
 
 class ValidRepoUser(formencode.validators.FancyValidator):
 
     def to_python(self, value, state):
         sa = meta.Session()
         try:
             self.user_db = sa.query(User)\
                 .filter(User.active == True)\
                 .filter(User.username == value).one()
         except Exception:
             raise formencode.Invalid(_('This username is not valid'),
                                      value, state)
         finally:
             meta.Session.remove()
 
         return self.user_db.user_id
 
 def ValidRepoName(edit, old_data):
     class _ValidRepoName(formencode.validators.FancyValidator):
 
         def to_python(self, value, state):
             slug = h.repo_name_slug(value)
             if slug in ['_admin']:
                 raise formencode.Invalid(_('This repository name is disallowed'),
                                          value, state)
             if old_data.get('repo_name') != value or not edit:
                 if RepoModel().get(slug, cache=False):
                     raise formencode.Invalid(_('This repository already exists') ,
                                              value, state)
             return slug
 
 
     return _ValidRepoName
 
 def ValidForkType(old_data):
     class _ValidForkType(formencode.validators.FancyValidator):
 
         def to_python(self, value, state):
             if old_data['repo_type'] != value:
                 raise formencode.Invalid(_('Fork have to be the same type as original'), value, state)
             return value
     return _ValidForkType
 
 class ValidPerms(formencode.validators.FancyValidator):
     messages = {'perm_new_user_name':_('This username is not valid')}
 
     def to_python(self, value, state):
         perms_update = []
         perms_new = []
         #build a list of permission to update and new permission to create
         for k, v in value.items():
             if k.startswith('perm_'):
                 if  k.startswith('perm_new_user'):
                     new_perm = value.get('perm_new_user', False)
                     new_user = value.get('perm_new_user_name', False)
                     if new_user and new_perm:
                         if (new_user, new_perm) not in perms_new:
                             perms_new.append((new_user, new_perm))
                 else:
                     usr = k[5:]
                     if usr == 'default':
                         if value['private']:
                             #set none for default when updating to private repo
                             v = 'repository.none'
                     perms_update.append((usr, v))
         value['perms_updates'] = perms_update
         value['perms_new'] = perms_new
         sa = meta.Session
         for k, v in perms_new:
             try:
                 self.user_db = sa.query(User)\
                     .filter(User.active == True)\
                     .filter(User.username == k).one()
             except Exception:
                 msg = self.message('perm_new_user_name',
                                      state=State_obj)
                 raise formencode.Invalid(msg, value, state, error_dict={'perm_new_user_name':msg})
         return value
 
 class ValidSettings(formencode.validators.FancyValidator):
 
     def to_python(self, value, state):
         #settings  form can't edit user
         if value.has_key('user'):
             del['value']['user']
 
         return value
 
 class ValidPath(formencode.validators.FancyValidator):
     def to_python(self, value, state):
 
         if not os.path.isdir(value):
             msg = _('This is not a valid path')
             raise formencode.Invalid(msg, value, state,
                                      error_dict={'paths_root_path':msg})
         return value
 
 def UniqSystemEmail(old_data):
     class _UniqSystemEmail(formencode.validators.FancyValidator):
         def to_python(self, value, state):
             if old_data.get('email') != value:
                 sa = meta.Session()
                 try:
                     user = sa.query(User).filter(User.email == value).scalar()
                     if user:
                         raise formencode.Invalid(_("That e-mail address is already taken") ,
                                                  value, state)
                 finally:
                     meta.Session.remove()
 
             return value
 
     return _UniqSystemEmail
 
 class ValidSystemEmail(formencode.validators.FancyValidator):
     def to_python(self, value, state):
         sa = meta.Session
         try:
             user = sa.query(User).filter(User.email == value).scalar()
             if  user is None:
                 raise formencode.Invalid(_("That e-mail address doesn't exist.") ,
                                          value, state)
         finally:
             meta.Session.remove()
 
         return value
 
 #===============================================================================
 # FORMS        
 #===============================================================================
 class LoginForm(formencode.Schema):
     allow_extra_fields = True
     filter_extra_fields = True
     username = UnicodeString(
                              strip=True,
                              min=1,
                              not_empty=True,
                              messages={
                                        'empty':_('Please enter a login'),
                                        'tooShort':_('Enter a value %(min)i characters long or more')}
                             )
 
     password = UnicodeString(
                             strip=True,
                             min=6,
                             not_empty=True,
                             messages={
                                       'empty':_('Please enter a password'),
                                       'tooShort':_('Enter %(min)i characters or more')}
                                 )
 
 
     #chained validators have access to all data
     chained_validators = [ValidAuth]
 
 def UserForm(edit=False, old_data={}):
     class _UserForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = All(UnicodeString(strip=True, min=1, not_empty=True), ValidUsername(edit, old_data))
         if edit:
             new_password = All(UnicodeString(strip=True, min=6, not_empty=False), ValidPassword)
             admin = StringBoolean(if_missing=False)
         else:
             password = All(UnicodeString(strip=True, min=6, not_empty=True), ValidPassword)
         active = StringBoolean(if_missing=False)
         name = UnicodeString(strip=True, min=1, not_empty=True)
         lastname = UnicodeString(strip=True, min=1, not_empty=True)
         email = All(Email(not_empty=True), UniqSystemEmail(old_data))
 
     return _UserForm
 
 RegisterForm = UserForm
 
 def PasswordResetForm():
     class _PasswordResetForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         email = All(ValidSystemEmail(), Email(not_empty=True))
     return _PasswordResetForm
 
 def RepoForm(edit=False, old_data={}):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=1, not_empty=True)
         private = StringBoolean(if_missing=False)
         repo_type = OneOf(BACKENDS.keys())
         if edit:
             user = All(Int(not_empty=True), ValidRepoUser)
 
         chained_validators = [ValidPerms]
     return _RepoForm
 
 def RepoForkForm(edit=False, old_data={}):
     class _RepoForkForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         fork_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=1, not_empty=True)
         private = StringBoolean(if_missing=False)
         repo_type = All(ValidForkType(old_data), OneOf(BACKENDS.keys()))
     return _RepoForkForm
 
 def RepoSettingsForm(edit=False, old_data={}):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=1, not_empty=True)
         private = StringBoolean(if_missing=False)
 
         chained_validators = [ValidPerms, ValidSettings]
     return _RepoForm
 
 
 def ApplicationSettingsForm():
     class _ApplicationSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         rhodecode_title = UnicodeString(strip=True, min=1, not_empty=True)
         rhodecode_realm = UnicodeString(strip=True, min=1, not_empty=True)
 
     return _ApplicationSettingsForm
 
 def ApplicationUiSettingsForm():
     class _ApplicationUiSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         web_push_ssl = OneOf(['true', 'false'], if_missing='false')
         paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True))
         hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False)
         hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False)
         hooks_pretxnchangegroup_push_logger = OneOf(['True', 'False'], if_missing=False)
         hooks_preoutgoing_pull_logger = OneOf(['True', 'False'], if_missing=False)
 
     return _ApplicationUiSettingsForm
 
 def DefaultPermissionsForm(perms_choices, register_choices, create_choices):
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         overwrite_default = OneOf(['true', 'false'], if_missing='false')
+        anonymous = OneOf(['True', 'False'], if_missing=False)
         default_perm = OneOf(perms_choices)
         default_register = OneOf(register_choices)
         default_create = OneOf(create_choices)
 
     return _DefaultPermissionsForm

rhodecode/model/permission_model.py

@@ -1,95 +1,106 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # Model for permissions
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on Aug 20, 2010
 Model for permissions
 @author: marcink
 """
 
 from rhodecode.model.db import User, Permission, UserToPerm, RepoToPerm
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.meta import Session
 import logging
 import traceback
 log = logging.getLogger(__name__)
 
 
 class PermissionModel(object):
 
     def __init__(self, sa=None):
         if not sa:
             self.sa = Session()
         else:
             self.sa = sa
 
     def get_permission(self, permission_id, cache=False):
         perm = self.sa.query(Permission)
         if cache:
             perm = perm.options(FromCache("sql_cache_short",
                                           "get_permission_%s" % permission_id))
         return perm.get(permission_id)
 
     def get_permission_by_name(self, name, cache=False):
         perm = self.sa.query(Permission)\
             .filter(Permission.permission_name == name)
         if cache:
             perm = perm.options(FromCache("sql_cache_short",
                                           "get_permission_%s" % name))
         return perm.scalar()
 
     def update(self, form_result):
         perm_user = self.sa.query(User)\
                 .filter(User.username == form_result['perm_user_name']).scalar()
         u2p = self.sa.query(UserToPerm).filter(UserToPerm.user == perm_user).all()
         if len(u2p) != 3:
-            raise Exception('There is more than 3 defined'
-            ' permissions for default user. This should not happen please verify'
-            ' your database')
+            raise Exception('Defined: %s should be 3  permissions for default'
+                            ' user. This should not happen please verify'
+                            ' your database' % len(u2p))
 
         try:
             #stage 1 change defaults    
             for p in u2p:
                 if p.permission.permission_name.startswith('repository.'):
-                    p.permission = self.get_permission_by_name(form_result['default_perm'])
+                    p.permission = self.get_permission_by_name(
+                                       form_result['default_perm'])
                     self.sa.add(p)
 
                 if p.permission.permission_name.startswith('hg.register.'):
-                    p.permission = self.get_permission_by_name(form_result['default_register'])
+                    p.permission = self.get_permission_by_name(
+                                       form_result['default_register'])
                     self.sa.add(p)
 
                 if p.permission.permission_name.startswith('hg.create.'):
-                    p.permission = self.get_permission_by_name(form_result['default_create'])
+                    p.permission = self.get_permission_by_name(
+                                        form_result['default_create'])
                     self.sa.add(p)
             #stage 2 update all default permissions for repos if checked
             if form_result['overwrite_default'] == 'true':
-                for r2p in self.sa.query(RepoToPerm).filter(RepoToPerm.user == perm_user).all():
-                    r2p.permission = self.get_permission_by_name(form_result['default_perm'])
+                for r2p in self.sa.query(RepoToPerm)\
+                               .filter(RepoToPerm.user == perm_user).all():
+                    r2p.permission = self.get_permission_by_name(
+                                         form_result['default_perm'])
                     self.sa.add(r2p)
 
+            #stage 3 set anonymous access
+            if perm_user.username == 'default':
+                perm_user.active = bool(form_result['anonymous'])
+                self.sa.add(perm_user)
+
+
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
 
 
 
 

rhodecode/model/user.py

@@ -1,145 +1,166 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # Model for users
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
 # 
 # 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; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 9, 2010
 Model for users
 :author: marcink
 """
 
 from pylons.i18n.translation import _
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User
 from rhodecode.model.meta import Session
 import logging
 import traceback
 
 log = logging.getLogger(__name__)
 
 class DefaultUserException(Exception):pass
 
 class UserModel(object):
 
     def __init__(self, sa=None):
         if not sa:
             self.sa = Session()
         else:
             self.sa = sa
 
     def get(self, user_id, cache=False):
         user = self.sa.query(User)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % user_id))
         return user.get(user_id)
 
 
     def get_by_username(self, username, cache=False):
         user = self.sa.query(User)\
             .filter(User.username == username)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % username))
         return user.scalar()
 
     def create(self, form_data):
         try:
             new_user = User()
             for k, v in form_data.items():
                 setattr(new_user, k, v)
 
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def create_registration(self, form_data):
         try:
             new_user = User()
             for k, v in form_data.items():
                 if k != 'admin':
                     setattr(new_user, k, v)
 
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def update(self, user_id, form_data):
         try:
             new_user = self.get(user_id, cache=False)
             if new_user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't Edit this user since it's"
                                   " crucial for entire application"))
             for k, v in form_data.items():
                 if k == 'new_password' and v != '':
                     new_user.password = v
                 else:
                     setattr(new_user, k, v)
 
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def update_my_account(self, user_id, form_data):
         try:
             new_user = self.get(user_id, cache=False)
             if new_user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't Edit this user since it's"
                                   " crucial for entire application"))
             for k, v in form_data.items():
                 if k == 'new_password' and v != '':
                     new_user.password = v
                 else:
                     if k not in ['admin', 'active']:
                         setattr(new_user, k, v)
 
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def delete(self, user_id):
         try:
             user = self.get(user_id, cache=False)
             if user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't remove this user since it's"
                                   " crucial for entire application"))
             self.sa.delete(user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def reset_password(self, data):
         from rhodecode.lib.celerylib import tasks, run_task
         run_task(tasks.reset_user_password, data['email'])
+
+
+    def fill_data(self, user):
+        """
+        Fills user data with those from database and log out user if not 
+        present in database
+        :param user:
+        """
+        log.debug('filling auth user data')
+        try:
+            dbuser = self.get(user.user_id)
+            user.username = dbuser.username
+            user.is_admin = dbuser.admin
+            user.name = dbuser.name
+            user.lastname = dbuser.lastname
+            user.email = dbuser.email
+        except:
+            log.error(traceback.format_exc())
+            user.is_authenticated = False
+
+        return user

rhodecode/public/css/style.css

@@ -1,2321 +1,2321 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;
 }
 
 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;
 font-weight:700;
 }
 
 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 30px;
 }
 
 #header ul#logged-user li {
 list-style:none;
 float:left;
 border-left:1px solid #bbb;
 border-right:1px solid #a5a5a5;
 margin:-2px 0 0;
 padding:10px 12px;
 }
 
 #header ul#logged-user li.first {
 border-left:none;
 margin:-6px;
 }
 
 #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:#4e4e4e;
 font-weight:700;
 text-decoration:none;
 }
 
 #header ul#logged-user li a:hover {
 color:#376ea6;
 text-decoration:underline;
 }
 
 #header ul#logged-user li.highlight a {
 color:#fff;
 }
 
 #header ul#logged-user li.highlight a:hover {
 color:#376ea6;
 }
 
 #header #header-inner {
 height:40px;
 clear:both;
 position:relative;
 background:#003367 url("../images/header_inner.png") repeat-x;
 border-bottom:2px solid #fff;
 margin:0;
 padding:0;
 }
 
 #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 h1 {
 color:#FFF;
 font-size:14px;
 margin:13px 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:10px 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 url("../../images/quick_l.png") no-repeat top left;
 padding:0;
 }
 
 #header #header-inner #quick li span {
 top:0;
 right:0;
 height:1%;
 display:block;
 float:left;
 background:url("../../images/quick_r.png") no-repeat top right;
 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;
 background:url("../../images/quick_l.png") no-repeat top left;
 border-right:1px solid #2e5c89;
 padding:8px 8px 4px;
 }
 
 #header #header-inner #quick li a:hover {
 background:#4e4e4e url("../../images/quick_l_selected.png") no-repeat top left;
 }
 
 #header #header-inner #quick li a:hover span {
 border-left:1px solid #545454;
 background:url("../../images/quick_r_selected.png") no-repeat top right;
 }
 
 #header #header-inner #quick li a:hover span.icon {
 border-left:none;
 border-right:1px solid #464646;
 background:url("../../images/quick_l_selected.png") no-repeat top left;
 }
 
 #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 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:nowrap;
 }
 
 #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.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.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.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.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;
 }
 
 #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;
 }
 
 #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:#369 url("../images/header_inner.png") repeat-x;
 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 {
 height:1%;
 display:block;
 float:left;
 border-left:1px solid #316293;
 color:#fff;
 font-size:11px;
 font-weight:700;
 text-decoration:none;
 margin:0;
 padding:13px 16px 12px;
 }
 
 #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:80px;
 width:auto;
 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:2px 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 {
 color:#393939;
 font-weight:700;
 }
 
 #content div.box div.form div.fields div.field div.input {
 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 {
 clear:both;
 overflow:hidden;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 margin:0;
 padding:7px 7px 6px;
 }
 
 #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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 margin:0;
 padding:7px 7px 6px;
 }
 
 #content div.box-left div.form div.fields div.field div.input input,#content div.box-right div.form div.fields div.field div.input input {
 width:100%;
 border:none;
 padding:0;
 }
 
 #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.input a.ui-input-file {
 width:28px;
 height:28px;
 display:inline;
 position:absolute;
 overflow:hidden;
 cursor:pointer;
 background:#e5e3e3 url("../images/button_browse.png") no-repeat;
 border:none;
 text-decoration:none;
 margin:0 0 0 6px;
 padding:0;
 }
 
 #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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 padding:5px 5px 5px 0;
 }
 
 #content div.box div.form div.fields div.field div.textarea table td table td a.mceButtonActive {
 background:#b1b1b1;
 }
 
 #content div.box div.form div.fields div.field div.select a.ui-selectmenu {
 color:#565656;
 text-decoration:none;
 }
 
 #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;
 }
 
 div.form div.fields div.field div.highlight .ui-state-default {
 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;
 margin:0;
 padding:6px 12px;
 }
 
 div.form div.fields div.field div.highlight .ui-state-hover {
 background:#46a0c1 url("../images/button_highlight_selected.png") repeat-x;
 border-top:1px solid #78acbf;
 border-left:1px solid #34819e;
 border-right:1px solid #35829f;
 border-bottom:1px solid #257897;
 color:#FFF;
 margin:0;
 padding:6px 12px;
 }
 
 #content div.box div.form div.fields div.buttons div.highlight input.ui-state-default {
 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;
 margin:0;
 padding:6px 12px;
 }
 
 #content div.box div.form div.fields div.buttons div.highlight input.ui-state-hover {
 background:#46a0c1 url("../../images/button_highlight_selected.png") repeat-x;
 border-top:1px solid #78acbf;
 border-left:1px solid #34819e;
 border-right:1px solid #35829f;
 border-bottom:1px solid #257897;
 color:#fff;
 margin:0;
 padding:6px 12px;
 }
 
 #content div.box table {
 width:100%;
 border-collapse:collapse;
 margin:0;
 padding:0;
 }
 
 #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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 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;
 }
 
 #footer {
 clear:both;
 overflow:hidden;
 text-align:right;
 margin:0;
 padding:0 30px 4px;
 margin:-10px 0 0;
 }
 
 #footer div#footer-inner {
 background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367;
 border-top:2px solid #FFFFFF;
 }
 
 #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 {
 color:#FFF; 
 }
 
 #login div.title {
 width:420px;
 clear:both;
 overflow:hidden;
 position:relative;
 background:#003367 url("../../images/header_inner.png") repeat-x;
 margin:0 auto;
 padding: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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 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;
 }
 
 #register div.title {
 width:420px;
 clear:both;
 overflow:hidden;
 position:relative;
 background:#003367 url("../images/header_inner.png") repeat-x;
 margin:0 auto;
 padding:0;
 }
 
 #register div.inner {
 width:380px;
 background:#FFF;
 border-top:none;
 border-bottom:none;
 margin:0 auto;
 padding:20px;
 }
 
 #register div.form div.fields div.field div.label {
 width:100px;
 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:245px;
 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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 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 114px;
 }
 
 #register div.form div.fields div.buttons div.highlight input.ui-state-default {
 background:url("../images/button_highlight.png") repeat-x scroll 0 0 #4E85BB;
 color:#FFF;
 border-color:#5C91A4 #2B7089 #1A6480 #2A6F89;
 border-style:solid;
 border-width:1px;
 }
 
 #register div.form div.activation_msg {
 padding-top:4px;
 padding-bottom:4px;
 }
 
 .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_content .container {
 min-height:120px;
 font-size:1.2em;
 overflow:hidden;
 }
 
 #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 .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 {
 width:160px;
 float:left;
 margin-left:-50px;
 margin-top:5px;
 }
 
 #graph_content {
 width:800px;
 float:left;
 }
 
 #graph_content .container_header {
 border:1px solid #CCC;
 padding:10px;
 }
 
 #graph_content .container {
 border-bottom:1px solid #CCC;
 border-left:1px solid #CCC;
 border-right:1px solid #CCC;
 min-height:80px;
 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 .message {
 font-size:100%;
 padding-top:3px;
 white-space:pre-wrap;
 }
 
 .right div {
 clear:both;
 }
 
 .right .changes .added,.changed,.removed {
 border:1px solid #DDD;
 display:block;
 float:right;
 text-align:center;
 min-width:15px;
 }
 
 .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;
 }
 
 .right .logtags .branchtag {
 background:#FFF url("../images/icons/arrow_branch.png") no-repeat right 6px;
 display:block;
 font-size:0.8em;
 padding:11px 16px 0 0;
 }
 
 .right .logtags .tagtag {
 background:#FFF url("../images/icons/tag_blue.png") no-repeat right 6px;
 display:block;
 font-size:0.8em;
 padding:11px 16px 0 0;
 }
 
 div.browserblock {
 overflow:hidden;
 border:1px solid #ccc;
 background:#f8f8f8;
 font-size:100%;
 line-height:125%;
 padding:0;
 }
 
 div.browserblock .browser-header {
 border-bottom:1px solid #CCC;
 background:#FFF;
 color:blue;
 padding:10px 0;
 }
 
 div.browserblock .browser-header span {
 margin-left:25px;
 font-weight:700;
 }
 
 div.browserblock .browser-body {
 background:#EEE;
 }
 
 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;
 }
 
 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 * {
 background:url("../../images/pager.png") repeat-x scroll 0 0 #EBEBEB;
 color:#4A4A4A;
 font-weight:700;
 height:1%;
 display:inline;
 border-color:#DEDEDE #C4C4C4 #C4C4C4 #CFCFCF;
 border-style:solid;
 border-width:1px;
 padding:4px 6px;
 }
 
 .info_box span {
 margin-left:3px;
 margin-right:3px;
 }
 
 .info_box input#at_rev {
 text-align:center;
 padding:5px 3px 3px 2px;
 }
 
 .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;
 font-family:arial, helvetica, verdana, sans-serif;
 border:2px solid #003367;
 font:100% sans-serif;
 width:auto;
 opacity:1px;
 padding:8px;
 white-space: pre;
 }
 
 .ac {
 vertical-align:top;
 }
 
 .ac .yui-ac {
 position:relative;
 font-family:arial;
 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;
 }
 
 .add_icon {
 background:url("../images/icons/add.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 padding-top:1px;
 text-align:left;
 }
 
 .edit_icon {
 background:url("../images/icons/folder_edit.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 padding-top:1px;
 text-align:left;
 }
 
 .delete_icon {
 background:url("../images/icons/delete.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 padding-top:1px;
 text-align:left;
 }
 
 .rss_icon {
 background:url("../images/icons/rss_16.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 padding-top:1px;
 text-align:left;
 }
 
 .atom_icon {
 background:url("../images/icons/atom.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 padding-top:1px;
 text-align:left;
 }
 
 .archive_icon {
 background:url("../images/icons/compress.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 text-align:left;
 padding-top:1px;
 }
 
 .action_button {
 border:0;
 display:block;
 }
 
 .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 ul {
 margin:0;
 padding:0 0 10px;
 }
 
 .error_msg {
 background-color:#FFCFCF;
 background-image:url("../../images/icons/error_msg.png");
 border:1px solid #FF9595;
 color:#C30;
 }
 
 .warning_msg {
 background-color:#FFFBCC;
 background-image:url("../../images/icons/warning_msg.png");
 border:1px solid #FFF35E;
 color:#C69E00;
 }
 
 .success_msg {
 background-color:#D5FFCF;
 background-image:url("../../images/icons/success_msg.png");
 border:1px solid #97FF88;
 color:#090;
 }
 
 .notice_msg {
 background-color:#DCE3FF;
 background-image:url("../../images/icons/notice_msg.png");
 border:1px solid #93A8FF;
 color:#556CB5;
 }
 
 .success_msg,.error_msg,.notice_msg,.warning_msg {
 background-position:10px center;
 background-repeat:no-repeat;
 font-size:12px;
 font-weight:700;
 min-height:14px;
 line-height:14px;
 margin-bottom:0;
 margin-top:0;
 display:block;
 overflow:auto;
 padding:6px 10px 6px 40px;
 }
 
 #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:1px solid #D0D0D0;
 float:left;
 margin-right:0.7em;
 padding:2px 2px 0;
 }
 
 #header,#content,#footer {
 min-width:1024px;
 }
 
 #content {
 min-height:100%;
 clear:both;
 overflow:hidden;
 padding:14px 30px;
 }
 
 #content div.box div.title div.search {
 background:url("../../images/title_link.png") no-repeat top left;
 border-left:1px solid #316293;
 }
 
 #content div.box div.title div.search div.input input {
 border:1px solid #316293;
 }
 
 #content div.box div.title div.search div.button input.ui-state-default {
 background:#4e85bb url("../../images/button_highlight.png") repeat-x;
 border:1px solid #316293;
 border-left:none;
 color:#FFF;
 }
 
 #content div.box div.title div.search div.button input.ui-state-hover {
 background:#46a0c1 url("../../images/button_highlight_selected.png") repeat-x;
 border:1px solid #316293;
 border-left:none;
 color:#FFF;
 }
 
 #content div.box div.form div.fields div.field div.highlight .ui-state-default {
 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;
 }
 
 #content div.box div.form div.fields div.field div.highlight .ui-state-hover {
 background:#46a0c1 url("../../images/button_highlight_selected.png") repeat-x;
 border-top:1px solid #78acbf;
 border-left:1px solid #34819e;
 border-right:1px solid #35829f;
 border-bottom:1px solid #257897;
 color:#fff;
 }
 
 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.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-checkbox,#content div.box div.form div.fields div.field div.label-radio,#content div.box div.form div.fields div.field div.label-textarea {
 padding:0 0 0 5px !important;
 }
 
 #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 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:2px 0;
+padding:2px 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:3px 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-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 font-weight:700;
 margin:0;
 }
 
 div.form div.fields div.field div.button .ui-state-default,#content div.box div.form div.fields div.buttons input.ui-state-default {
 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;
 outline:none;
 margin:0;
 padding:6px 12px;
 }
 
 div.form div.fields div.field div.button .ui-state-hover,#content div.box 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;
 outline:none;
 margin:0;
 padding:6px 12px;
 }
 
 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-default,#login div.form div.fields div.buttons input.ui-state-default,#register div.form div.fields div.buttons input.ui-state-default {
 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;
 margin:0;
 padding:6px 12px;
 }
 
 #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:420px;
 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;
 }
 
 #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;
 font-family:Verdana, Helvetica, Sans-Serif;
 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{
 border:0 none;
 color:#AAAAAA;
 margin-bottom:-4px;
 margin-top:-4px;
 padding-left:3px;
 }
 

rhodecode/templates/admin/permissions/permissions.html

@@ -1,68 +1,77 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Permissions administration')} - ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} 
     &raquo;
     ${_('Permissions')}    
 </%def>
 
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}       
     </div>
     <h3>${_('Default permissions')}</h3>
     ${h.form(url('permission', id='default'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
-        
+            <div class="field">
+                <div class="label label-checkbox">
+                    <label for="anonymous">${_('Anonymous access')}:</label>
+                </div>
+                <div class="checkboxes">
+                    <div class="checkbox">
+                        ${h.checkbox('anonymous',True)}
+                    </div>
+                </div>
+            </div>        
 			<div class="field">
 				<div class="label">
 					<label for="default_perm">${_('Repository permission')}:</label>
 				</div>
 				<div class="select">
 					${h.select('default_perm','',c.perms_choices)}
 				
 		                ${h.checkbox('overwrite_default','true')}
 		                <label for="overwrite_default">
 		                <span class="tooltip" 
 		                tooltip_title="${h.tooltip(_('All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost'))}">
 		                ${_('overwrite existing settings')}</span> </label>
 				</div>		                
 			</div>   
 			<div class="field">
 		        <div class="label">
 		            <label for="default_register">${_('Registration')}:</label>
 		        </div>
 				<div class="select">
 					${h.select('default_register','',c.register_choices)}
 				</div>
 			</div> 		
              <div class="field">
                 <div class="label">
                     <label for="default_create">${_('Repository creation')}:</label>
                 </div>
 				<div class="select">
 					${h.select('default_create','',c.create_choices)}
 				</div>
              </div>	
 				        
 	        <div class="buttons">
 	        ${h.submit('set','set',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 	        </div>	                                                               
         </div>
     </div>  
     ${h.end_form()}
 </div>
 </%def>    

rhodecode/templates/base/base.html

@@ -1,286 +1,296 b''
 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <head>
     <title>${next.title()}</title>
     <link rel="icon" href="/images/hgicon.png" type="image/png" />
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="robots" content="index, nofollow"/>
     <!-- stylesheets -->
     ${self.css()}
     <!-- scripts -->
     ${self.js()}
 </head>
 <body>
     <!-- header -->
     <div id="header">
         <!-- user -->
         <ul id="logged-user">
             <li class="first">
 	            <div class="gravatar">
 	            	<img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,24)}" />
 	            </div>
+	        %if c.rhodecode_user.username == 'default':
+                <div class="account">
+                    ${h.link_to('%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname),h.url('#'))}<br/>
+                    ${h.link_to(c.rhodecode_user.username,h.url('#'))}
+                </div>  
+            </li>
+            <li class="last highlight">${h.link_to(u'Login',h.url('login_home'))}</li>	        
+	        %else:
+	            
 	            <div class="account">
 	            	${h.link_to('%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname),h.url('admin_settings_my_account'))}<br/>
 	            	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'))}
 	            </div>	
             </li>
             <li class="last highlight">${h.link_to(u'Logout',h.url('logout_home'))}</li>
+            %endif
         </ul>
         <!-- end user -->
         <div id="header-inner" class="title top-left-rounded-corner top-right-rounded-corner">
             <!-- logo -->
             <div id="logo">
                 <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
             </div>
             <!-- end logo -->
             <!-- menu -->
             ${self.page_nav()}
             <!-- quick -->
         </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 bottom-left-rounded-corner bottom-right-rounded-corner">
 	       <div>
 	           <p class="footer-link">${h.link_to(_('Submit a bug'),h.url('bugtracker'))}</p>
 		       <p class="footer-link">${h.link_to(_('GPL license'),h.url('gpl_license'))}</p>
 		       <p>RhodeCode ${c.rhodecode_version} &copy; 2010 by Marcin Kuzminski</p>
 	       </div>
 	   </div>
         <script type="text/javascript">${h.tooltip.activate()}</script>
 	</div>
 	<!-- end footer -->
 </body>
 
 </html>
 
 ### MAKO DEFS ### 
 <%def name="page_nav()">
 	${self.menu()}
 </%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="/images/icons/database.png" alt="${_('Products')}" />
                     </span>
                     <span>&darr;</span>					
 					</a>
 					<ul class="repo_switcher">
                         %for repo in c.cached_repo_list:
                         
                           %if repo['repo'].dbrepo.private:
                              <li>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="private_repo %s" % repo['repo'].dbrepo.repo_type)}</li>
                           %else:
                              <li>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="public_repo %s" % repo['repo'].dbrepo.repo_type)}</li>
                           %endif  
                         %endfor					
 					</ul>			
 				</li>
 				
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="/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="/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="/images/icons/time.png" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>                 
                    </a>             
                 </li>   	
                 
                 <li ${is_current('switch_to')}>
                    <a title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="/images/icons/arrow_switch.png" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>                 
                    </a>    
                     <ul>
                         <li>
                             ${h.link_to('%s (%s)' % (_('branches'),len(c.repository_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
 						            <li>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
 						    %endif
                             </ul>                        
                         </li>
                         <li>
                             ${h.link_to('%s (%s)' % (_('tags'),len(c.repository_tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
                                  <li>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
                             %endif
                             </ul>                        
                         </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="/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="/images/icons/table_gear.png" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Options')}</span>                 
                    </a>
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    	<li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                    %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')}  
                         <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(_('users'),h.url('users'),class_='users')}</li>
                             <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
                             <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>        
                         </ul>
                     </li>
                     %endif                    
 
                 
 ##                   %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
 ##                   	<li class="last">
 ##                   	${h.link_to(_('delete'),'#',class_='delete')}
 ##	                  ${h.form(url('repo_settings_delete', repo_name=c.repo_name),method='delete')}
 ##	                    ${h.submit('remove_%s' % c.repo_name,'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
 ##	                  ${h.end_form()}
 ##                   	</li>
 ##                   	%endif
                    </ul>             
                 </li>
 	        </ul>
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
                     <a title="${_('Home')}"  href="${h.url('home')}">
                     <span class="icon">
                         <img src="/images/icons/home_16.png" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>                 
                     </a>        
                 </li>
                 
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="/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="/images/icons/cog_edit.png" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Admin')}</span>                 
                    </a>    
 				    <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(_('users'),h.url('users'),class_='users')}</li>
 				        <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
 				        <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>        
 				    </ul>
                 </li>
 				%endif
 				
 			</ul>
 		%endif    
 </%def>
 
 
 <%def name="css()">
 <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen" />
 <link rel="stylesheet" type="text/css" href="/css/pygments.css"  />
 <link rel="stylesheet" type="text/css" href="/css/diff.css"  />
 </%def>
 
 <%def name="js()">
 ##<script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
 ##<script type="text/javascript" src="/js/yui/container/container.js"></script>
 ##<script type="text/javascript" src="/js/yui/datasource/datasource.js"></script>
 ##<script type="text/javascript" src="/js/yui/autocomplete/autocomplete.js"></script>
 ##<script type="text/javascript" src="/js/yui/selector/selector-min.js"></script>
 
 <script type="text/javascript" src="/js/yui2.js"></script>
 <script type="text/javascript" src="/js/yui/selector/selector-min.js"></script>
 <!--[if IE]><script language="javascript" type="text/javascript" src="/js/excanvas.min.js"></script><![endif]-->
 <script type="text/javascript" src="/js/yui.flot.js"></script>
 </%def>
 
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
  No newline at end of file