kallithea Changeset - febb3f954509

Changeset - febb3f954509

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 12 1

Marcin Kuzminski - 14 years ago 2011-07-04 18:07:49
marcin@python-works.com

merge

12 files changed with 172 insertions and 58 deletions:

rhodecode/config/routing.py

rhodecode/controllers/login.py

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/smtp_mailer.py

rhodecode/model/db.py

rhodecode/model/user.py

rhodecode/public/css/style.css

rhodecode/templates/base/base.html

rhodecode/templates/password_reset.html

rhodecode/templates/password_reset_confirmation.html

new file

rhodecode/tests/functional/test_login.py

setup.cfg

0 comments (0 inline, 0 general)

rhodecode/config/routing.py

➞

Show inline comments

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

rhodecode/controllers/login.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.login
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Login controller for rhodeocode
     :created_on: Apr 22, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import formencode
 from formencode import htmlfill
 from pylons.i18n.translation import _
 from pylons.controllers.util import abort, redirect
 from pylons import request, response, session, tmpl_context as c, url
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import AuthUser, HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import User
 from rhodecode.model.forms import LoginForm, RegisterForm, PasswordResetForm
 from rhodecode.model.user import UserModel
 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 self.rhodecode_user.is_authenticated \
                             and self.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))
                 #form checks for username/password, now we're authenticated
                 username = c.form_result['username']
                 user = User.by_username(username,
                                                    case_insensitive=True)
                 auth_user = AuthUser(user.user_id)
                 auth_user.set_authenticated()
                 session['rhodecode_user'] = auth_user
                 session.save()
                 log.info('user %s is now authenticated and stored in session',
                          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'),
                 user_model.reset_password_link(form_result)
                 h.flash(_('Your password reset link 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 password_reset_confirmation(self):
         if request.GET and request.GET.get('key'):
             try:
                 user_model = UserModel()
                 user = User.get_by_api_key(request.GET.get('key'))
                 data = dict(email=user.email)
                 user_model.reset_password(data)
                 h.flash(_('Your password reset was successful, '
                           'new password has been sent to your email'),
                             category='success')
             except Exception, e:
                 log.error(e)
                 return redirect(url('reset_password'))
         return redirect(url('login_home'))
     def logout(self):
         del session['rhodecode_user']
         session.save()
         log.info('Logging out and setting user as Empty')
         redirect(url('home'))

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.celerylib.tasks
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     RhodeCode task modules, containing all task that suppose to be run
     by celery daemon
     :created_on: Oct 6, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from celery.decorators import task
 import os
 import traceback
 import logging
 from os.path import dirname as dn, join as jn
 from time import mktime
 from operator import itemgetter
 from string import lower
 from pylons import config
+from pylons import config, url
 from pylons.i18n.translation import _
 from rhodecode.lib import LANGUAGES_EXTENSIONS_MAP, safe_str
 from rhodecode.lib.celerylib import run_task, locked_task, str2bool, \
     __get_lockkey, LockHeld, DaemonLock
 from rhodecode.lib.helpers import person
 from rhodecode.lib.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import add_cache
 from rhodecode.lib.odict import OrderedDict
 from rhodecode.model import init_model
 from rhodecode.model import meta
 from rhodecode.model.db import RhodeCodeUi, Statistics, Repository
 from vcs.backends import get_repo
 from sqlalchemy import engine_from_config
 add_cache(config)
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
 __all__ = ['whoosh_index', 'get_commits_stats',
            'reset_user_password', 'send_email']
 CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
 def get_session():
     if CELERY_ON:
         engine = engine_from_config(config, 'sqlalchemy.db1.')
         init_model(engine)
     sa = meta.Session()
     return sa
 def get_repos_path():
     sa = get_session()
     q = sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one()
     return q.ui_value
 @task(ignore_result=True)
 @locked_task
 def whoosh_index(repo_location, full_index):
     #log = whoosh_index.get_logger()
     from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
     index_location = config['index_dir']
     WhooshIndexingDaemon(index_location=index_location,
                          repo_location=repo_location, sa=get_session())\
                          .run(full_index=full_index)
 @task(ignore_result=True)
 def get_commits_stats(repo_name, ts_min_y, ts_max_y):
     try:
         log = get_commits_stats.get_logger()
     except:
         log = logging.getLogger(__name__)
     lockkey = __get_lockkey('get_commits_stats', repo_name, ts_min_y,
                             ts_max_y)
     lockkey_path = dn(dn(dn(dn(os.path.abspath(__file__)))))
     log.info('running task with lockkey %s', lockkey)
     try:
         lock = l = DaemonLock(jn(lockkey_path, lockkey))
         #for js data compatibilty cleans the key for person from '
         akc = lambda k: person(k).replace('"', "")
         co_day_auth_aggr = {}
         commits_by_day_aggregate = {}
         repos_path = get_repos_path()
         repo = get_repo(safe_str(os.path.join(repos_path, repo_name)))
         repo_size = len(repo.revisions)
         #return if repo have no revisions
         if repo_size < 1:
             lock.release()
             return True
         skip_date_limit = True
         parse_limit = int(config['app_conf'].get('commit_parse_limit'))
         last_rev = 0
         last_cs = None
         timegetter = itemgetter('time')
         sa = get_session()
         dbrepo = sa.query(Repository)\
             .filter(Repository.repo_name == repo_name).scalar()
         cur_stats = sa.query(Statistics)\
             .filter(Statistics.repository == dbrepo).scalar()
         if cur_stats is not None:
             last_rev = cur_stats.stat_on_revision
         if last_rev == repo.get_changeset().revision and repo_size > 1:
             #pass silently without any work if we're not on first revision or
             #current state of parsing revision(from db marker) is the
             #last revision
             lock.release()
             return True
         if cur_stats:
             commits_by_day_aggregate = OrderedDict(json.loads(
                                         cur_stats.commit_activity_combined))
             co_day_auth_aggr = json.loads(cur_stats.commit_activity)
         log.debug('starting parsing %s', parse_limit)
         lmktime = mktime
         last_rev = last_rev + 1 if last_rev > 0 else last_rev
         for cs in repo[last_rev:last_rev + parse_limit]:
             last_cs = cs  # remember last parsed changeset
             k = lmktime([cs.date.timetuple()[0], cs.date.timetuple()[1],
                           cs.date.timetuple()[2], 0, 0, 0, 0, 0, 0])
             if akc(cs.author) in co_day_auth_aggr:
                 try:
                     l = [timegetter(x) for x in
                          co_day_auth_aggr[akc(cs.author)]['data']]
                     time_pos = l.index(k)
                 except ValueError:
                     time_pos = False
                 if time_pos >= 0 and time_pos is not False:
                     datadict = \
                         co_day_auth_aggr[akc(cs.author)]['data'][time_pos]
                     datadict["commits"] += 1
                     datadict["added"] += len(cs.added)
                     datadict["changed"] += len(cs.changed)
                     datadict["removed"] += len(cs.removed)
                 else:
                     if k >= ts_min_y and k <= ts_max_y or skip_date_limit:
                         datadict = {"time": k,
                                     "commits": 1,
                                     "added": len(cs.added),
                                     "changed": len(cs.changed),
                                     "removed": len(cs.removed),
+                                   }
                         co_day_auth_aggr[akc(cs.author)]['data']\
                             .append(datadict)
             else:
                 if k >= ts_min_y and k <= ts_max_y or skip_date_limit:
                     co_day_auth_aggr[akc(cs.author)] = {
                                         "label": akc(cs.author),
                                         "data": [{"time":k,
                                                  "commits":1,
                                                  "added":len(cs.added),
                                                  "changed":len(cs.changed),
                                                  "removed":len(cs.removed),
                                                  }],
                                         "schema": ["commits"],
+                                        }
             #gather all data by day
             if k in commits_by_day_aggregate:
                 commits_by_day_aggregate[k] += 1
             else:
                 commits_by_day_aggregate[k] = 1
         overview_data = sorted(commits_by_day_aggregate.items(),
                                key=itemgetter(0))
         if not co_day_auth_aggr:
             co_day_auth_aggr[akc(repo.contact)] = {
                 "label": akc(repo.contact),
                 "data": [0, 1],
                 "schema": ["commits"],
+            }
         stats = cur_stats if cur_stats else Statistics()
         stats.commit_activity = json.dumps(co_day_auth_aggr)
         stats.commit_activity_combined = json.dumps(overview_data)
         log.debug('last revison %s', last_rev)
         leftovers = len(repo.revisions[last_rev:])
         log.debug('revisions to parse %s', leftovers)
         if last_rev == 0 or leftovers < parse_limit:
             log.debug('getting code trending stats')
             stats.languages = json.dumps(__get_codes_stats(repo_name))
         try:
             stats.repository = dbrepo
             stats.stat_on_revision = last_cs.revision if last_cs else 0
             sa.add(stats)
             sa.commit()
         except:
             log.error(traceback.format_exc())
             sa.rollback()
             lock.release()
             return False
         #final release
         lock.release()
         #execute another task if celery is enabled
         if len(repo.revisions) > 1 and CELERY_ON:
             run_task(get_commits_stats, repo_name, ts_min_y, ts_max_y)
         return True
     except LockHeld:
         log.info('LockHeld')
         return 'Task with key %s already running' % lockkey
 @task(ignore_result=True)
 def send_password_link(user_email):
     try:
         log = reset_user_password.get_logger()
     except:
         log = logging.getLogger(__name__)
     from rhodecode.lib import auth
     from rhodecode.model.db import User
     try:
         sa = get_session()
         user = sa.query(User).filter(User.email == user_email).scalar()
         if user:
             link = url('reset_password_confirmation', key=user.api_key,
                        qualified=True)
             tmpl = """
 Hello %s
 We received a request to create a new password for your account.
 You can generate it by clicking following URL:
 %s
 If you didn't request new password please ignore this email.
             """
             run_task(send_email, user_email,
                      "RhodeCode password reset link",
                      tmpl % (user.short_contact, link))
             log.info('send new password mail to %s', user_email)
     except:
         log.error('Failed to update user password')
         log.error(traceback.format_exc())
         return False
     return True
 @task(ignore_result=True)
 def reset_user_password(user_email):
     try:
         log = reset_user_password.get_logger()
     except:
         log = logging.getLogger(__name__)
     from rhodecode.lib import auth
     from rhodecode.model.db import User
     try:
         try:
             sa = get_session()
             user = sa.query(User).filter(User.email == user_email).scalar()
             new_passwd = auth.PasswordGenerator().gen_password(8,
                              auth.PasswordGenerator.ALPHABETS_BIG_SMALL)
             if user:
                 user.password = auth.get_crypt_password(new_passwd)
                 user.api_key = auth.generate_api_key(user.username)
                 sa.add(user)
                 sa.commit()
                 log.info('change password for %s', user_email)
             if new_passwd is None:
                 raise Exception('unable to generate new password')
         except:
             log.error(traceback.format_exc())
             sa.rollback()
         run_task(send_email, user_email,
                  "Your new rhodecode password",
                  'Your new rhodecode password:%s' % (new_passwd))
                  "Your new RhodeCode password",
                  'Your new RhodeCode password:%s' % (new_passwd))
         log.info('send new password mail to %s', user_email)
     except:
         log.error('Failed to update user password')
         log.error(traceback.format_exc())
     return True
 @task(ignore_result=True)
 def send_email(recipients, subject, body):
     """
     Sends an email with defined parameters from the .ini files.
     :param recipients: list of recipients, it this is empty the defined email
         address from field 'email_to' is used instead
     :param subject: subject of the mail
     :param body: body of the mail
     """
     try:
         log = send_email.get_logger()
     except:
         log = logging.getLogger(__name__)
     email_config = config
     if not recipients:
         recipients = [email_config.get('email_to')]
     mail_from = email_config.get('app_email_from')
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_server = email_config.get('smtp_server')
     mail_port = email_config.get('smtp_port')
     tls = str2bool(email_config.get('smtp_use_tls'))
     ssl = str2bool(email_config.get('smtp_use_ssl'))
     debug = str2bool(config.get('debug'))
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server,
                        mail_port, ssl, tls, debug=debug)
         m.send(recipients, subject, body)
     except:
         log.error('Mail sending failed')
         log.error(traceback.format_exc())
         return False
     return True
 @task(ignore_result=True)
 def create_repo_fork(form_data, cur_user):
     from rhodecode.model.repo import RepoModel
     from vcs import get_backend
     try:
         log = create_repo_fork.get_logger()
     except:
         log = logging.getLogger(__name__)
     repo_model = RepoModel(get_session())
     repo_model.create(form_data, cur_user, just_db=True, fork=True)
     repo_name = form_data['repo_name']
     repos_path = get_repos_path()
     repo_path = os.path.join(repos_path, repo_name)
     repo_fork_path = os.path.join(repos_path, form_data['fork_name'])
     alias = form_data['repo_type']
     log.info('creating repo fork %s as %s', repo_name, repo_path)
     backend = get_backend(alias)
     backend(str(repo_fork_path), create=True, src_url=str(repo_path))
 def __get_codes_stats(repo_name):
     repos_path = get_repos_path()
     repo = get_repo(safe_str(os.path.join(repos_path, repo_name)))
     tip = repo.get_changeset()
     code_stats = {}
     def aggregate(cs):
         for f in cs[2]:
             ext = lower(f.extension)
             if ext in LANGUAGES_EXTENSIONS_MAP.keys() and not f.is_binary:
                 if ext in code_stats:
                     code_stats[ext] += 1
                 else:
                     code_stats[ext] = 1
     map(aggregate, tip.walk('/'))
     return code_stats or {}

rhodecode/lib/smtp_mailer.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.smtp_mailer
     ~~~~~~~~~~~~~~~~~~~~~~~~~
     Simple smtp mailer used in RhodeCode
     :created_on: Sep 13, 2010
     :copyright: (c) 2011 by marcink.
     :license: LICENSE_NAME, see LICENSE_FILE for more details.
 """
 import logging
 import smtplib
 import mimetypes
 from socket import sslerror
 from email.mime.multipart import MIMEMultipart
 from email.mime.image import MIMEImage
 from email.mime.audio import MIMEAudio
 from email.mime.base import MIMEBase
 from email.mime.text import MIMEText
 from email.utils import formatdate
 from email import encoders
 class SmtpMailer(object):
     """SMTP mailer class
     mailer = SmtpMailer(mail_from, user, passwd, mail_server,
                         mail_port, ssl, tls)
     mailer.send(recipients, subject, body, attachment_files)
     :param recipients might be a list of string or single string
     :param attachment_files is a dict of {filename:location}
         it tries to guess the mimetype and attach the file
     """
     def __init__(self, mail_from, user, passwd, mail_server,
                     mail_port=None, ssl=False, tls=False, debug=False):
         self.mail_from = mail_from
         self.mail_server = mail_server
         self.mail_port = mail_port
         self.user = user
         self.passwd = passwd
         self.ssl = ssl
         self.tls = tls
         self.debug = debug
     def send(self, recipients=[], subject='', body='', attachment_files=None):
         if isinstance(recipients, basestring):
             recipients = [recipients]
         if self.ssl:
             smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port)
         else:
             smtp_serv = smtplib.SMTP(self.mail_server, self.mail_port)
         if self.tls:
             smtp_serv.ehlo()
             smtp_serv.starttls()
         if self.debug:
             smtp_serv.set_debuglevel(1)
         smtp_serv.ehlo()
         #if server requires authorization you must provide login and password
         #but only if we have them
         if self.user and self.passwd:
             smtp_serv.login(self.user, self.passwd)
         date_ = formatdate(localtime=True)
         msg = MIMEMultipart()
         msg.set_type('multipart/alternative')
         msg.preamble = 'You will not see this in a MIME-aware mail reader.\n'
         text_msg = MIMEText(body)
         text_msg.set_type('text/plain')
         text_msg.set_param('charset', 'UTF-8')
         msg['From'] = self.mail_from
         msg['To'] = ','.join(recipients)
         msg['Date'] = date_
         msg['Subject'] = subject
         msg.preamble = 'You will not see this in a MIME-aware mail reader.\n'
-        msg.attach(MIMEText(body))
+        msg.attach(text_msg)
         if attachment_files:
             self.__atach_files(msg, attachment_files)
         smtp_serv.sendmail(self.mail_from, recipients, msg.as_string())
         logging.info('MAIL SEND TO: %s' % recipients)
         try:
             smtp_serv.quit()
         except sslerror:
             # sslerror is raised in tls connections on closing sometimes
             pass
     def __atach_files(self, msg, attachment_files):
         if isinstance(attachment_files, dict):
             for f_name, msg_file in attachment_files.items():
                 ctype, encoding = mimetypes.guess_type(f_name)
                 logging.info("guessing file %s type based on %s", ctype,
                              f_name)
                 if ctype is None or encoding is not None:
                     # No guess could be made, or the file is encoded
                     # (compressed), so use a generic bag-of-bits type.
                     ctype = 'application/octet-stream'
                 maintype, subtype = ctype.split('/', 1)
                 if maintype == 'text':
                     # Note: we should handle calculating the charset
                     file_part = MIMEText(self.get_content(msg_file),
                                          _subtype=subtype)
                 elif maintype == 'image':
                     file_part = MIMEImage(self.get_content(msg_file),
                                           _subtype=subtype)
                 elif maintype == 'audio':
                     file_part = MIMEAudio(self.get_content(msg_file),
                                           _subtype=subtype)
                 else:
                     file_part = MIMEBase(maintype, subtype)
                     file_part.set_payload(self.get_content(msg_file))
                     # Encode the payload using Base64
                     encoders.encode_base64(msg)
                 # Set the filename parameter
                 file_part.add_header('Content-Disposition', 'attachment',
                                      filename=f_name)
                 file_part.add_header('Content-Type', ctype, name=f_name)
                 msg.attach(file_part)
         else:
             raise Exception('Attachment files should be'
                             'a dict in format {"filename":"filepath"}')
     def get_content(self, msg_file):
         """Get content based on type, if content is a string do open first
         else just read because it's a probably open file object
         :param msg_file:
         """
         if isinstance(msg_file, str):
             return open(msg_file, "rb").read()
         else:
             #just for safe seek to 0
             msg_file.seek(0)
             return msg_file.read()

rhodecode/model/db.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.db
     ~~~~~~~~~~~~~~~~~~
     Database Models for RhodeCode
     :created_on: Apr 08, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import logging
 import datetime
 import traceback
 from datetime import date
 from sqlalchemy import *
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.orm import relationship, backref, joinedload, class_mapper
 from sqlalchemy.orm.interfaces import MapperExtension
 from beaker.cache import cache_region, region_invalidate
 from vcs import get_backend
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import RepositoryError, VCSError
 from vcs.utils.lazy import LazyProperty
 from vcs.nodes import FileNode
 from rhodecode.lib import str2bool, json, safe_str
 from rhodecode.model.meta import Base, Session
 from rhodecode.model.caching_query import FromCache
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 class ModelSerializer(json.JSONEncoder):
     """
     Simple Serializer for JSON,
     usage::
         to make object customized for serialization implement a __json__
         method that will return a dict for serialization into json
     example::
         class Task(object):
             def __init__(self, name, value):
                 self.name = name
                 self.value = value
             def __json__(self):
                 return dict(name=self.name,
                             value=self.value)
     """
     def default(self, obj):
         if hasattr(obj, '__json__'):
             return obj.__json__()
         else:
             return json.JSONEncoder.default(self, obj)
 class BaseModel(object):
     """Base Model for all classess
     """
     @classmethod
     def _get_keys(cls):
         """return column names for this model """
         return class_mapper(cls).c.keys()
     def get_dict(self):
         """return dict with keys and values corresponding
         to this model data """
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
         return d
     def get_appstruct(self):
         """return list with keys and values tupples corresponding
         to this model data """
         l = []
         for k in self._get_keys():
             l.append((k, getattr(self, k),))
         return l
     def populate_obj(self, populate_dict):
         """populate model with data from given populate_dict"""
         for k in self._get_keys():
             if k in populate_dict:
                 setattr(self, k, populate_dict[k])
     @classmethod
     def query(cls):
         return Session.query(cls)
     @classmethod
     def get(cls, id_):
         return Session.query(cls).get(id_)
 class RhodeCodeSettings(Base, BaseModel):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (UniqueConstraint('app_settings_name'), {'extend_existing':True})
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     app_settings_name = Column("app_settings_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     app_settings_value = Column("app_settings_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     def __init__(self, k='', v=''):
         self.app_settings_name = k
         self.app_settings_value = v
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.app_settings_name, self.app_settings_value)
     @classmethod
     def get_by_name(cls, ldap_key):
         return Session.query(cls)\
             .filter(cls.app_settings_name == ldap_key).scalar()
     @classmethod
     def get_app_settings(cls, cache=False):
         ret = Session.query(cls)
         if cache:
             ret = ret.options(FromCache("sql_cache_short", "get_hg_settings"))
         if not ret:
             raise Exception('Could not get application settings !')
         settings = {}
         for each in ret:
             settings['rhodecode_' + each.app_settings_name] = \
                 each.app_settings_value
         return settings
     @classmethod
     def get_ldap_settings(cls, cache=False):
         ret = Session.query(cls)\
                 .filter(cls.app_settings_name.startswith('ldap_'))\
                 .all()
         fd = {}
         for row in ret:
             fd.update({row.app_settings_name:row.app_settings_value})
         fd.update({'ldap_active':str2bool(fd.get('ldap_active'))})
         return fd
 class RhodeCodeUi(Base, BaseModel):
     __tablename__ = 'rhodecode_ui'
     __table_args__ = {'extend_existing':True}
     ui_id = Column("ui_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ui_section = Column("ui_section", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     ui_key = Column("ui_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     ui_value = Column("ui_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     ui_active = Column("ui_active", Boolean(), nullable=True, unique=None, default=True)
     @classmethod
     def get_by_key(cls, key):
         return Session.query(cls).filter(cls.ui_key == key)
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (UniqueConstraint('username'), UniqueConstraint('email'), {'extend_existing':True})
     user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     password = Column("password", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=None)
     admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
     name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     lastname = Column("lastname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     email = Column("email", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
     ldap_dn = Column("ldap_dn", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     api_key = Column("api_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user_log = relationship('UserLog', cascade='all')
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
     repositories = relationship('Repository')
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     repo_to_perm = relationship('RepoToPerm', primaryjoin='RepoToPerm.user_id==User.user_id', cascade='all')
     group_member = relationship('UsersGroupMember', cascade='all')
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.name, self.lastname, self.email)
     @property
     def short_contact(self):
         return '%s %s' % (self.name, self.lastname)
     @property
     def is_admin(self):
         return self.admin
     def __repr__(self):
         try:
             return "<%s('id:%s:%s')>" % (self.__class__.__name__,
                                              self.user_id, self.username)
         except:
             return self.__class__.__name__
     @classmethod
     def by_username(cls, username, case_insensitive=False):
         if case_insensitive:
             return Session.query(cls).filter(cls.username.like(username)).one()
         else:
             return Session.query(cls).filter(cls.username == username).one()
     @classmethod
     def get_by_api_key(cls, api_key):
         return Session.query(cls).filter(cls.api_key == api_key).one()
     def update_lastlogin(self):
         """Update user lastlogin"""
         self.last_login = datetime.datetime.now()
         Session.add(self)
         Session.commit()
         log.debug('updated user %s lastlogin', self.username)
 class UserLog(Base, BaseModel):
     __tablename__ = 'user_logs'
     __table_args__ = {'extend_existing':True}
     user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     repository_name = Column("repository_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action = Column("action", UnicodeText(length=1200000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
     @property
     def action_as_day(self):
         return date(*self.action_date.timetuple()[:3])
     user = relationship('User')
     repository = relationship('Repository')
 class UsersGroup(Base, BaseModel):
     __tablename__ = 'users_groups'
     __table_args__ = {'extend_existing':True}
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_name = Column("users_group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
     members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = Session.query(cls)\
             .filter(cls.users_group_name.ilike(group_name))
         else:
             gr = Session.query(UsersGroup)\
                 .filter(UsersGroup.users_group_name == group_name)
         if cache:
             gr = gr.options(FromCache("sql_cache_short",
                                           "get_user_%s" % group_name))
         return gr.scalar()
 class UsersGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = {'extend_existing':True}
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     user = relationship('User', lazy='joined')
     users_group = relationship('UsersGroup')
     def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (UniqueConstraint('repo_name'), {'extend_existing':True},)
     repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repo_name = Column("repo_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)
     repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg')
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     private = Column("private", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
     fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None)
     user = relationship('User')
     fork = relationship('Repository', remote_side=repo_id)
     group = relationship('Group')
     repo_to_perm = relationship('RepoToPerm', cascade='all', order_by='RepoToPerm.repo_to_perm_id')
     users_group_to_perm = relationship('UsersGroupRepoToPerm', cascade='all')
     stats = relationship('Statistics', cascade='all', uselist=False)
     followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
     logs = relationship('UserLog', cascade='all')
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.repo_id, self.repo_name)
     @classmethod
     def by_repo_name(cls, repo_name):
         q = Session.query(cls).filter(cls.repo_name == repo_name)
         q = q.options(joinedload(Repository.fork))\
             .options(joinedload(Repository.user))\
             .options(joinedload(Repository.group))\
         return q.one()
     @classmethod
     def get_repo_forks(cls, repo_id):
         return Session.query(cls).filter(Repository.fork_id == repo_id)
     @property
     def just_name(self):
         return self.repo_name.split(os.sep)[-1]
     @property
     def groups_with_parents(self):
         groups = []
         if self.group is None:
             return groups
         cur_gr = self.group
         groups.insert(0, cur_gr)
         while 1:
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             groups.insert(0, gr)
         return groups
     @property
     def groups_and_repo(self):
         return self.groups_with_parents, self.just_name
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
         q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/')
         q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
     @property
     def repo_full_path(self):
         p = [self.repo_path]
         # we need to split the name by / since this is how we store the
         # names in the database, but that eventually needs to be converted
         # into a valid system path
         p += self.repo_name.split('/')
         return os.path.join(*p)
     @property
     def _ui(self):
         """
         Creates an db based ui object for this repository
         """
         from mercurial import ui
         from mercurial import config
         baseui = ui.ui()
         #clean the baseui object
         baseui._ocfg = config.config()
         baseui._ucfg = config.config()
         baseui._tcfg = config.config()
         ret = Session.query(RhodeCodeUi)\
             .options(FromCache("sql_cache_short",
                                "repository_repo_ui")).all()
         hg_ui = ret
         for ui_ in hg_ui:
             if ui_.ui_active:
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section,
                           ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
         return baseui
     #==========================================================================
     # SCM CACHE INSTANCE
     #==========================================================================
     @property
     def invalidate(self):
         """
         Returns Invalidation object if this repo should be invalidated
         None otherwise. `cache_active = False` means that this cache
         state is not valid and needs to be invalidated
         """
         return Session.query(CacheInvalidation)\
             .filter(CacheInvalidation.cache_key == self.repo_name)\
             .filter(CacheInvalidation.cache_active == False)\
             .scalar()
     @property
     def set_invalidate(self):
         """
         set a cache for invalidation for this instance
         """
         inv = Session.query(CacheInvalidation)\
             .filter(CacheInvalidation.cache_key == self.repo_name)\
             .scalar()
         if inv is None:
             inv = CacheInvalidation(self.repo_name)
         inv.cache_active = True
         Session.add(inv)
         Session.commit()
     @property
     def scm_instance(self):
         return self.__get_instance()
     @property
     def scm_instance_cached(self):
         @cache_region('long_term')
         def _c(repo_name):
             return self.__get_instance()
         inv = self.invalidate
         if inv:
             region_invalidate(_c, None, self.repo_name)
             #update our cache
             inv.cache_key.cache_active = True
             Session.add(inv)
             Session.commit()
         # TODO: remove this trick when beaker 1.6 is released
         # and have fixed this issue
         rn = safe_str(self.repo_name)
         return _c(rn)
     def __get_instance(self):
         repo_full_path = self.repo_full_path
         try:
             alias = get_scm(repo_full_path)[0]
             log.debug('Creating instance of %s repository', alias)
             backend = get_backend(alias)
         except VCSError:
             log.error(traceback.format_exc())
             log.error('Perhaps this repository is in db and not in '
                       'filesystem run rescan repositories with '
                       '"destroy old data " option from admin panel')
             return
         if alias == 'hg':
             repo = backend(safe_str(repo_full_path), create=False,
                            baseui=self._ui)
             #skip hidden web repository
             if repo._get_hidden():
                 return
         else:
             repo = backend(repo_full_path, create=False)
         return repo
 class Group(Base, BaseModel):
     __tablename__ = 'groups'
     __table_args__ = (UniqueConstraint('group_name', 'group_parent_id'),
                       CheckConstraint('group_id != group_parent_id'), {'extend_existing':True},)
     __mapper_args__ = {'order_by':'group_name'}
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     parent_group = relationship('Group', remote_side=group_id)
     def __init__(self, group_name='', parent_group=None):
         self.group_name = group_name
         self.parent_group = parent_group
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__, self.group_id,
                                   self.group_name)
     @classmethod
     def url_sep(cls):
         return '/'
     @property
     def parents(self):
         parents_recursion_limit = 5
         groups = []
         if self.parent_group is None:
             return groups
         cur_gr = self.parent_group
         groups.insert(0, cur_gr)
         cnt = 0
         while 1:
             cnt += 1
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             if cnt == parents_recursion_limit:
                 # this will prevent accidental infinit loops
                 log.error('group nested more than %s' %
                           parents_recursion_limit)
                 break
             groups.insert(0, gr)
         return groups
     @property
     def children(self):
         return Session.query(Group).filter(Group.parent_group == self)
     @property
     def full_path(self):
         return Group.url_sep().join([g.group_name for g in self.parents] +
                         [self.group_name])
     @property
     def repositories(self):
         return Session.query(Repository).filter(Repository.group == self)
     @property
     def repositories_recursive_count(self):
         cnt = self.repositories.count()
         def children_count(group):
             cnt = 0
             for child in group.children:
                 cnt += child.repositories.count()
                 cnt += children_count(child)
             return cnt
         return cnt + children_count(self)
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = {'extend_existing':True}
     permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     permission_name = Column("permission_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.permission_id, self.permission_name)
     @classmethod
     def get_by_key(cls, key):
         return Session.query(cls).filter(cls.permission_name == key).scalar()
 class RepoToPerm(Base, BaseModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (UniqueConstraint('user_id', 'repository_id'), {'extend_existing':True})
     repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     user = relationship('User')
     permission = relationship('Permission')
     repository = relationship('Repository')
 class UserToPerm(Base, BaseModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'extend_existing':True})
     user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user = relationship('User')
     permission = relationship('Permission')
     @classmethod
     def has_perm(cls, user_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
         return Session.query(cls).filter(cls.user_id == user_id)\
             .filter(cls.permission == perm).scalar() is not None
     @classmethod
     def grant_perm(cls, user_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
         new = cls()
         new.user_id = user_id
         new.permission = perm
         try:
             Session.add(new)
             Session.commit()
         except:
             Session.rollback()
     @classmethod
     def revoke_perm(cls, user_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
         try:
             Session.query(cls).filter(cls.user_id == user_id)\
                 .filter(cls.permission == perm).delete()
             Session.commit()
         except:
             Session.rollback()
 class UsersGroupRepoToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (UniqueConstraint('repository_id', 'users_group_id', 'permission_id'), {'extend_existing':True})
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     users_group = relationship('UsersGroup')
     permission = relationship('Permission')
     repository = relationship('Repository')
 class UsersGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     users_group = relationship('UsersGroup')
     permission = relationship('Permission')
     @classmethod
     def has_perm(cls, users_group_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
         return Session.query(cls).filter(cls.users_group_id ==
                                          users_group_id)\
                                          .filter(cls.permission == perm)\
                                          .scalar() is not None
     @classmethod
     def grant_perm(cls, users_group_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
         new = cls()
         new.users_group_id = users_group_id
         new.permission = perm
         try:
             Session.add(new)
             Session.commit()
         except:
             Session.rollback()
     @classmethod
     def revoke_perm(cls, users_group_id, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class')
         try:
             Session.query(cls).filter(cls.users_group_id == users_group_id)\
                 .filter(cls.permission == perm).delete()
             Session.commit()
         except:
             Session.rollback()
 class GroupToPerm(Base, BaseModel):
     __tablename__ = 'group_to_perm'
     __table_args__ = (UniqueConstraint('group_id', 'permission_id'), {'extend_existing':True})
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     user = relationship('User')
     permission = relationship('Permission')
     group = relationship('Group')
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (UniqueConstraint('repository_id'), {'extend_existing':True})
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
     commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
     commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
     languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
     repository = relationship('Repository', single_parent=True)
 class UserFollowing(Base, BaseModel):
     __tablename__ = 'user_followings'
     __table_args__ = (UniqueConstraint('user_id', 'follows_repository_id'),
                       UniqueConstraint('user_id', 'follows_user_id')
                       , {'extend_existing':True})
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
     follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
     user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
     follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
     follows_repository = relationship('Repository', order_by='Repository.repo_name')
     @classmethod
     def get_repo_followers(cls, repo_id):
         return Session.query(cls).filter(cls.follows_repo_id == repo_id)
 class CacheInvalidation(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (UniqueConstraint('cache_key'), {'extend_existing':True})
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     cache_args = Column("cache_args", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
     def __init__(self, cache_key, cache_args=''):
         self.cache_key = cache_key
         self.cache_args = cache_args
         self.cache_active = False
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.cache_id, self.cache_key)
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = {'extend_existing':True}
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)

rhodecode/model/user.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.user
     ~~~~~~~~~~~~~~~~~~~~
     users model for RhodeCode
     :created_on: Apr 9, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import traceback
 from pylons.i18n.translation import _
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User, RepoToPerm, Repository, Permission, \
     UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember
 from rhodecode.lib.exceptions import DefaultUserException, \
     UserOwnsReposException
 from sqlalchemy.exc import DatabaseError
 from rhodecode.lib import generate_api_key
 from sqlalchemy.orm import joinedload
 log = logging.getLogger(__name__)
 PERM_WEIGHTS = {'repository.none': 0,
                 'repository.read': 1,
                 'repository.write': 3,
                 'repository.admin': 3}
 class UserModel(BaseModel):
     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, case_insensitive=False):
         if case_insensitive:
             user = self.sa.query(User).filter(User.username.ilike(username))
         else:
             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 get_by_api_key(self, api_key, cache=False):
         user = self.sa.query(User)\
                 .filter(User.api_key == api_key)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % api_key))
         return user.scalar()
     def create(self, form_data):
         try:
             new_user = User()
             for k, v in form_data.items():
                 setattr(new_user, k, v)
             new_user.api_key = generate_api_key(form_data['username'])
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def create_ldap(self, username, password, user_dn, attrs):
         """
         Checks if user is in database, if not creates this user marked
         as ldap user
         :param username:
         :param password:
         :param user_dn:
         :param attrs:
         """
         from rhodecode.lib.auth import get_crypt_password
         log.debug('Checking for such ldap account in RhodeCode database')
         if self.get_by_username(username, case_insensitive=True) is None:
             try:
                 new_user = User()
                 # add ldap account always lowercase
                 new_user.username = username.lower()
                 new_user.password = get_crypt_password(password)
                 new_user.api_key = generate_api_key(username)
                 new_user.email = attrs['email']
                 new_user.active = True
                 new_user.ldap_dn = user_dn
                 new_user.name = attrs['name']
                 new_user.lastname = attrs['lastname']
                 self.sa.add(new_user)
                 self.sa.commit()
                 return True
             except (DatabaseError,):
                 log.error(traceback.format_exc())
                 self.sa.rollback()
                 raise
         log.debug('this %s user exists skipping creation of ldap account',
                   username)
         return False
     def create_registration(self, form_data):
         from rhodecode.lib.celerylib import tasks, run_task
         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()
             body = ('New user registration\n'
                     'username: %s\n'
                     'email: %s\n')
             body = body % (form_data['username'], form_data['email'])
             run_task(tasks.send_email, None,
                      _('[RhodeCode] New User registration'),
                      body)
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def update(self, user_id, form_data):
         try:
             user = self.get(user_id, cache=False)
             if 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 != '':
                     user.password = v
                     user.api_key = generate_api_key(user.username)
                 else:
                     setattr(user, k, v)
             self.sa.add(user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def update_my_account(self, user_id, form_data):
         try:
             user = self.get(user_id, cache=False)
             if 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 != '':
                     user.password = v
                     user.api_key = generate_api_key(user.username)
                 else:
                     if k not in ['admin', 'active']:
                         setattr(user, k, v)
             self.sa.add(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"))
             if user.repositories:
                 raise UserOwnsReposException(_('This user still owns %s '
                                                'repositories and cannot be '
                                                'removed. Switch owners or '
                                                'remove those repositories') \
                                                % user.repositories)
             self.sa.delete(user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def reset_password_link(self, data):
         from rhodecode.lib.celerylib import tasks, run_task
         run_task(tasks.send_password_link, data['email'])
     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, auth_user, user_id=None, api_key=None):
         """
         Fetches auth_user by user_id,or api_key if present.
         Fills auth_user attributes with those taken from database.
         Additionally set's is_authenitated if lookup fails
         present in database
         :param auth_user: instance of user to set attributes
         :param user_id: user id to fetch by
         :param api_key: api key to fetch by
         """
         if user_id is None and api_key is None:
             raise Exception('You need to pass user_id or api_key')
         try:
             if api_key:
                 dbuser = self.get_by_api_key(api_key)
             else:
                 dbuser = self.get(user_id)
             if dbuser is not None:
                 log.debug('filling %s data', dbuser)
                 for k, v in dbuser.get_dict().items():
                     setattr(auth_user, k, v)
         except:
             log.error(traceback.format_exc())
             auth_user.is_authenticated = False
         return auth_user
     def fill_perms(self, user):
         """
         Fills user permission attribute with permissions taken from database
         works for permissions given for repositories, and for permissions that
         are granted to groups
         :param user: user instance to fill his perms
         """
         user.permissions['repositories'] = {}
         user.permissions['global'] = set()
         #======================================================================
         # fetch default permissions
         #======================================================================
         default_user = self.get_by_username('default', cache=True)
         default_perms = self.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
             #==================================================================
             uid = user.user_id
             #default global
             default_global_perms = self.sa.query(UserToPerm)\
                 .filter(UserToPerm.user == default_user)
             for perm in default_global_perms:
                 user.permissions['global'].add(perm.permission.permission_name)
             #default for repositories
             for perm in default_perms:
                 if perm.Repository.private and not (perm.Repository.user_id ==
                                                     uid):
                     #diself.sable defaults for private repos,
                     p = 'repository.none'
                 elif perm.Repository.user_id == uid:
                     #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 global
             user_perms = self.sa.query(UserToPerm)\
                     .options(joinedload(UserToPerm.permission))\
                     .filter(UserToPerm.user_id == uid).all()
             for perm in user_perms:
                 user.permissions['global'].add(perm.permission.
                                                permission_name)
             #user repositories
             user_repo_perms = self.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 == uid).all()
             for perm in user_repo_perms:
                 # set admin if owner
                 if perm.Repository.user_id == uid:
                     p = 'repository.admin'
                 else:
                     p = perm.Permission.permission_name
                 user.permissions['repositories'][perm.RepoToPerm.
                                                  repository.repo_name] = p
             #==================================================================
             # check if user is part of groups for this repository and fill in
             # (or replace with higher) permissions
             #==================================================================
             #users group global
             user_perms_from_users_groups = self.sa.query(UsersGroupToPerm)\
                 .options(joinedload(UsersGroupToPerm.permission))\
                 .join((UsersGroupMember, UsersGroupToPerm.users_group_id ==
                        UsersGroupMember.users_group_id))\
                 .filter(UsersGroupMember.user_id == uid).all()
             for perm in user_perms_from_users_groups:
                 user.permissions['global'].add(perm.permission.permission_name)
             #users group repositories
             user_repo_perms_from_users_groups = self.sa.query(
                                                 UsersGroupRepoToPerm,
                                                 Permission, Repository,)\
                 .join((Repository, UsersGroupRepoToPerm.repository_id ==
                        Repository.repo_id))\
                 .join((Permission, UsersGroupRepoToPerm.permission_id ==
                        Permission.permission_id))\
                 .join((UsersGroupMember, UsersGroupRepoToPerm.users_group_id ==
                        UsersGroupMember.users_group_id))\
                 .filter(UsersGroupMember.user_id == uid).all()
             for perm in user_repo_perms_from_users_groups:
                 p = perm.Permission.permission_name
                 cur_perm = user.permissions['repositories'][perm.
                                                     UsersGroupRepoToPerm.
                                                     repository.repo_name]
                 #overwrite permission only if it's greater than permission
                 # given from other sources
                 if PERM_WEIGHTS[p] > PERM_WEIGHTS[cur_perm]:
                     user.permissions['repositories'][perm.UsersGroupRepoToPerm.
                                                      repository.repo_name] = p
         return user

rhodecode/public/css/style.css

➞

Show inline comments

 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 10px;
+}
 #header ul#logged-user{
 margin-bottom:5px !important;
 -webkit-border-radius: 0px 0px 8px 8px;
 -khtml-border-radius: 0px 0px 8px 8px;
 -moz-border-radius: 0px 0px 8px 8px;
 border-radius: 0px 0px 8px 8px;
 height:37px;
 background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367
 background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367;
 box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #header ul#logged-user li {
 list-style:none;
 float:left;
 margin:8px 0 0;
 padding:4px 12px;
 border-left: 1px solid #316293;
+}
 #header ul#logged-user li.first {
 border-left:none;
 margin:4px;
+}
 #header ul#logged-user li.first div.gravatar {
 margin-top:-2px;
+}
 #header ul#logged-user li.first div.account {
 padding-top:4px;
 float:left;
+}
 #header ul#logged-user li.last {
 border-right:none;
+}
 #header ul#logged-user li a {
 color:#fff;
 font-weight:700;
 text-decoration:none;
+}
 #header ul#logged-user li a:hover {
 text-decoration:underline;
+}
 #header ul#logged-user li.highlight a {
 color:#fff;
+}
 #header ul#logged-user li.highlight a:hover {
 color:#FFF;
+}
 #header #header-inner {
 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:18px;
 margin:10px 0 0 13px;
 padding:0;
+}
 #header #header-inner #logo a {
 color:#fff;
 text-decoration:none;
+}
 #header #header-inner #logo a:hover {
 color:#bfe3ff;
+}
 #header #header-inner #quick,#header #header-inner #quick ul {
 position:relative;
 float:right;
 list-style-type:none;
 list-style-position:outside;
 margin: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.short {
 padding:9px 6px 8px 6px;
+}
 #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 span.icon_short {
 top:0;
 left:0;
 border-left:none;
 background:url("../images/quick_l.png") no-repeat top left;
 border-right:1px solid #2e5c89;
 padding:9px 4px 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,#header #header-inner #quick li a:hover span.icon_short {
 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 ul.repo_switcher li.qfilter_rs {
 float:none;
 margin:0;
 border-bottom:2px solid #003367;
+}
 #header #header-inner #quick .repo_switcher_type{
 position:absolute;
 left:0;
 top:9px;
+}
 #header #header-inner #quick li ul li {
 border-bottom:1px solid #ddd;
+}
 #header #header-inner #quick li ul li a {
 width:182px;
 height:auto;
 display:block;
 float:left;
 background:#FFF;
 color:#003367;
 font-weight:400;
 margin:0;
 padding:7px 9px;
+}
 #header #header-inner #quick li ul li a:hover {
 color:#000;
 background:#FFF;
+}
 #header #header-inner #quick ul ul {
 top:auto;
+}
 #header #header-inner #quick li ul ul {
 right:200px;
 max-height:275px;
 overflow:auto;
 overflow-x:hidden;
 white-space:normal;
+}
 #header #header-inner #quick li ul li a.journal,#header #header-inner #quick li ul li a.journal:hover {
 background:url("../images/icons/book.png") no-repeat scroll 4px 9px #FFF;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.private_repo,#header #header-inner #quick li ul li a.private_repo:hover {
 background:url("../images/icons/lock.png") no-repeat scroll 4px 9px #FFF;
 min-width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.public_repo,#header #header-inner #quick li ul li a.public_repo:hover {
 background:url("../images/icons/lock_open.png") no-repeat scroll 4px 9px #FFF;
 min-width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.hg,#header #header-inner #quick li ul li a.hg:hover {
 background:url("../images/icons/hgicon.png") no-repeat scroll 4px 9px #FFF;
 min-width:167px;
 margin:0 0 0 14px;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.git,#header #header-inner #quick li ul li a.git:hover {
 background:url("../images/icons/giticon.png") no-repeat scroll 4px 9px #FFF;
 min-width:167px;
 margin:0 0 0 14px;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.repos,#header #header-inner #quick li ul li a.repos:hover {
 background:url("../images/icons/database_edit.png") no-repeat scroll 4px 9px #FFF;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.repos_groups,#header #header-inner #quick li ul li a.repos_groups:hover {
 background:url("../images/icons/database_link.png") no-repeat scroll 4px 9px #FFF;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.users,#header #header-inner #quick li ul li a.users:hover {
 background:#FFF url("../images/icons/user_edit.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.groups,#header #header-inner #quick li ul li a.groups:hover {
 background:#FFF url("../images/icons/group_edit.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.settings,#header #header-inner #quick li ul li a.settings:hover {
 background:#FFF url("../images/icons/cog.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.permissions,#header #header-inner #quick li ul li a.permissions:hover {
 background:#FFF url("../images/icons/key.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.ldap,#header #header-inner #quick li ul li a.ldap:hover {
 background:#FFF url("../images/icons/server_key.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.fork,#header #header-inner #quick li ul li a.fork:hover {
 background:#FFF url("../images/icons/arrow_divide.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.search,#header #header-inner #quick li ul li a.search:hover {
 background:#FFF url("../images/icons/search_16.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.delete,#header #header-inner #quick li ul li a.delete:hover {
 background:#FFF url("../images/icons/delete.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover {
 background:#FFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover {
 background:#FFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.admin,#header #header-inner #quick li ul li a.admin:hover {
 background:#FFF url("../images/icons/cog_edit.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #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 {
     border-left: 1px solid #316293;
     color: #FFFFFF;
     display: block;
     float: left;
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     margin: 0;
     padding: 11px 22px 12px;
     text-decoration: none;
+}
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6 {
 clear:both;
 overflow:hidden;
 border-bottom:1px solid #DDD;
 margin:10px 20px;
 padding:0 0 15px;
+}
 #content div.box p {
 color:#5f5f5f;
 font-size:12px;
 line-height:150%;
 margin:0 24px 10px;
 padding:0;
+}
 #content div.box blockquote {
 border-left:4px solid #DDD;
 color:#5f5f5f;
 font-size:11px;
 line-height:150%;
 margin:0 34px;
 padding:0 0 0 14px;
+}
 #content div.box blockquote p {
 margin:10px 0;
 padding:0;
+}
 #content div.box dl {
 margin:10px 24px;
+}
 #content div.box dt {
 font-size:12px;
 margin:0;
+}
 #content div.box dd {
 font-size:12px;
 margin:0;
 padding:8px 0 8px 15px;
+}
 #content div.box li {
 font-size:12px;
 padding:4px 0;
+}
 #content div.box ul.disc,#content div.box ul.circle {
 margin:10px 24px 10px 38px;
+}
 #content div.box ul.square {
 margin:10px 24px 10px 40px;
+}
 #content div.box img.left {
 border:none;
 float:left;
 margin:10px 10px 10px 0;
+}
 #content div.box img.right {
 border:none;
 float:right;
 margin:10px 0 10px 10px;
+}
 #content div.box div.messages {
 clear:both;
 overflow:hidden;
 margin:0 20px;
 padding:0;
+}
 #content div.box div.message {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:10px 0;
+}
 #content div.box div.message a {
 font-weight:400 !important;
+}
 #content div.box div.message div.image {
 float:left;
 margin:9px 0 0 5px;
 padding:6px;
+}
 #content div.box div.message div.image img {
 vertical-align:middle;
 margin:0;
+}
 #content div.box div.message div.text {
 float:left;
 margin:0;
 padding:9px 6px;
+}
 #content div.box div.message div.dismiss a {
 height:16px;
 width:16px;
 display:block;
 background:url("../images/icons/cross.png") no-repeat;
 margin:15px 14px 0 0;
 padding:0;
+}
 #content div.box div.message div.text h1,#content div.box div.message div.text h2,#content div.box div.message div.text h3,#content div.box div.message div.text h4,#content div.box div.message div.text h5,#content div.box div.message div.text h6 {
 border:none;
 margin:0;
 padding:0;
+}
 #content div.box div.message div.text span {
 height:1%;
 display:block;
 margin:0;
 padding:5px 0 0;
+}
 #content div.box div.message-error {
 height:1%;
 clear:both;
 overflow:hidden;
 background:#FBE3E4;
 border:1px solid #FBC2C4;
 color:#860006;
+}
 #content div.box div.message-error h6 {
 color:#860006;
+}
 #content div.box div.message-warning {
 height:1%;
 clear:both;
 overflow:hidden;
 background:#FFF6BF;
 border:1px solid #FFD324;
 color:#5f5200;
+}
 #content div.box div.message-warning h6 {
 color:#5f5200;
+}
 #content div.box div.message-notice {
 height:1%;
 clear:both;
 overflow:hidden;
 background:#8FBDE0;
 border:1px solid #6BACDE;
 color:#003863;
+}
 #content div.box div.message-notice h6 {
 color:#003863;
+}
 #content div.box div.message-success {
 height:1%;
 clear:both;
 overflow:hidden;
 background:#E6EFC2;
 border:1px solid #C6D880;
 color:#4e6100;
+}
 #content div.box div.message-success h6 {
 color:#4e6100;
+}
 #content div.box div.form div.fields div.field {
 height:1%;
 border-bottom:1px solid #DDD;
 clear:both;
 margin:0;
 padding:10px 0;
+}
 #content div.box div.form div.fields div.field-first {
 padding:0 0 10px;
+}
 #content div.box div.form div.fields div.field-noborder {
 border-bottom:0 !important;
+}
 #content div.box div.form div.fields div.field span.error-message {
 height:1%;
 display:inline-block;
 color:red;
 margin:8px 0 0 4px;
 padding:0;
+}
 #content div.box div.form div.fields div.field span.success {
 height:1%;
 display:block;
 color:#316309;
 margin:8px 0 0;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.label {
 left:70px;
 width: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:5px 0 0 5px;
+}
 #content div.box-left div.form div.fields div.field div.label-select,#content div.box-right div.form div.fields div.field div.label-select {
 padding:0 0 8px;
+}
 #content div.box-left div.form div.fields div.field div.label-textarea,#content div.box-right div.form div.fields div.field div.label-textarea {
 padding:0 0 8px !important;
+}
 #content div.box div.form div.fields div.field div.label label, div.label label{
 color:#393939;
 font-weight:700;
+}
 #content div.box div.form div.fields div.field div.input {
 margin:0 0 0 200px;
+}
 #content div.box-left div.form div.fields div.field div.input,#content div.box-right div.form div.fields div.field div.input {
 margin:0 0 0 0px;
+}
 #content div.box div.form div.fields div.field div.input input {
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-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 div.form div.fields div.field div.input input.small {
 width:30%;
+}
 #content div.box div.form div.fields div.field div.input input.medium {
 width:55%;
+}
 #content div.box div.form div.fields div.field div.input input.large {
 width:85%;
+}
 #content div.box div.form div.fields div.field div.input input.date {
 width:177px;
+}
 #content div.box div.form div.fields div.field div.input input.button {
 background:#D4D0C8;
 border-top:1px solid #FFF;
 border-left:1px solid #FFF;
 border-right:1px solid #404040;
 border-bottom:1px solid #404040;
 color:#000;
 margin:0;
 padding:4px 8px;
+}
 #content div.box div.form div.fields div.field div.textarea {
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 margin:0 0 0 200px;
 padding:10px;
+}
 #content div.box div.form div.fields div.field div.textarea-editor {
 border:1px solid #ddd;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.textarea textarea {
 width:100%;
 height:220px;
 overflow:hidden;
 background:#FFF;
 color:#000;
 font-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 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-button {
 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-button {
 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;
+}
 #summary{
+}
 #summary .desc{
 white-space: pre;
 width: 100%;
+}
 #summary .repo_name{
 font-size: 1.6em;
 font-weight: bold;
 vertical-align: baseline;
 clear:right
+}
 #footer {
 clear:both;
 overflow:hidden;
 text-align:right;
 margin:0;
 padding:0 10px 4px;
 margin:-10px 0 0;
+}
 #footer div#footer-inner {
 background: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,#footer div#footer-inner .footer-link-right 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;
+}
 #quick_login{
 top: 31px;
 background-color: rgb(0, 51, 103);
 z-index: 999;
 height: 150px;
 position: absolute;
 margin-left: -16px;
 width: 281px;
 border-radius: 0 0 8px 8px;
 box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #quick_login .password_forgoten{
 padding-right:10px;
 padding-top:10px;
 float:left;
+}
 #quick_login div.form div.fields{
 padding-top: 2px;
 padding-left:10px;
+}
 #quick_login div.form div.fields div.field{
  padding: 5px;
+}
 #quick_login div.form div.fields div.field div.label label{
 color:#fff;
 padding-bottom: 3px;
+}
 #quick_login div.form div.fields div.field div.input input {
 width:236px;
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 margin:0;
 padding:5px 7px 4px;
+}
 #quick_login div.form div.fields div.buttons {
 clear:both;
 overflow:hidden;
 text-align:right;
 margin:0;
 padding:10px 14px 0;
+}
 #quick_login div.form div.fields div.buttons input.ui-button{
 background:#e5e3e3 url("../images/button.png") repeat-x;
 border-top:1px solid #DDD;
 border-left:1px solid #c6c6c6;
 border-right:1px solid #DDD;
 border-bottom:1px solid #c6c6c6;
 color:#515151;
 margin:0;
 padding:4px 10px;
+}
 #quick_login div.form div.links {
 clear:both;
 overflow:hidden;
 margin:10px 0 0;
 padding:0 0 2px;
+}
 #register div.title {
 clear:both;
 overflow:hidden;
 position:relative;
 background:#003367 url("../images/header_inner.png") repeat-x;
 margin:0 auto;
 padding:0;
+}
 #register div.inner {
 background:#FFF;
 border-top:none;
 border-bottom:none;
 margin:0 auto;
 padding:20px;
+}
 #register div.form div.fields div.field div.label {
 width:135px;
 float:left;
 text-align:right;
 margin:2px 10px 0 0;
 padding:5px 0 0 5px;
+}
 #register div.form div.fields div.field div.input input {
 width:300px;
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-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 150px;
+}
 #register div.form div.fields div.buttons div.highlight input.ui-button {
 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;
+}
 #journal .journal_day{
 font-size:20px;
 padding:10px 0px;
 border-bottom:2px solid #DDD;
 margin-left:10px;
 margin-right:10px;
+}
 #journal .journal_container{
 padding:5px;
 clear:both;
 margin:0px 5px 0px 10px;
+}
 #journal .journal_action_container{
 padding-left:38px;
+}
 #journal .journal_user{
 color: #747474;
 font-size: 14px;
 font-weight: bold;
 height: 30px;
+}
 #journal .journal_icon{
 clear: both;
 float: left;
 padding-right: 4px;
 padding-top: 3px;
+}
 #journal .journal_action{
 padding-top:4px;
 min-height:2px;
 float:left
+}
 #journal .journal_action_params{
 clear: left;
 padding-left: 22px;
+}
 #journal .journal_repo{
 float: left;
 margin-left: 6px;
 padding-top: 3px;
+}
 #journal .date{
 clear: both;
 color: #777777;
 font-size: 11px;
 padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name{
 font-weight: bold;
 font-size: 1.1em;
+}
 #journal .compare_view{
 padding: 5px 0px 5px 0px;
 width: 95px;
+}
 .journal_highlight{
 font-weight: bold;
 padding: 0 2px;
 vertical-align: bottom;
+}
 .trending_language_tbl,.trending_language_tbl td {
 border:0 !important;
 margin:0 !important;
 padding:0 !important;
+}
 .trending_language {
 background-color:#003367;
 color:#FFF;
 display:block;
 min-width:20px;
 text-decoration:none;
 height:12px;
 margin-bottom:4px;
 margin-left:5px;
 white-space:pre;
 padding:3px;
+}
 h3.files_location {
 font-size:1.8em;
 font-weight:700;
 border-bottom:none !important;
 margin:10px 0 !important;
+}
 #files_data dl dt {
 float:left;
 width:115px;
 margin:0 !important;
 padding:5px;
+}
 #files_data dl dd {
 margin:0 !important;
 padding:5px !important;
+}
 #changeset_content {
 border:1px solid #CCC;
 padding:5px;
+}
 #changeset_compare_view_content{
 border:1px solid #CCC;
 padding:5px;
+}
 #changeset_content .container {
 min-height:120px;
 font-size:1.2em;
 overflow:hidden;
+}
 #changeset_compare_view_content .compare_view_commits{
 width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td{
 padding:0px 0px 0px 12px !important;
+}
 #changeset_content .container .right {
 float:right;
 width:25%;
 text-align:right;
+}
 #changeset_content .container .left .message {
 font-style:italic;
 color:#556CB5;
 white-space:pre-wrap;
+}
 .cs_files .cur_cs{
 margin:10px 2px;
 font-weight: bold;
+}
 .cs_files .node{
 float: left;
+}
 .cs_files .changes{
 float: right;
+}
 .cs_files .changes .added{
 background-color: #BBFFBB;
 float: left;
 text-align: center;
 font-size: 90%;
+}
 .cs_files .changes .deleted{
 background-color: #FF8888;
 float: left;
 text-align: center;
 font-size: 90%;
+}
 .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 #rev_range_container{
 padding:10px 0px;
+}
 #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 .date span{
 vertical-align: text-top;
+}
 #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;
 cursor: help;
+}
 .right .changes .large {
 border:1px solid #DDD;
 display:block;
 float:right;
 text-align:center;
 min-width:45px;
 cursor: help;
 background: #54A9F7;
+}
 .right .changes .added {
 background:#BFB;
+}
 .right .changes .changed {
 background:#FD8;
+}
 .right .changes .removed {
 background:#F88;
+}
 .right .merge {
 vertical-align:top;
 font-size:0.75em;
 font-weight:700;
+}
 .right .parent {
 font-size:90%;
 font-family:monospace;
+}
 .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 {
 background:#FFF;
 padding:10px 0px 25px 0px;
 width: 100%;
+}
 div.browserblock .browser-nav {
 float:left
+}
 div.browserblock .browser-branch {
 float:left;
+}
 div.browserblock .browser-branch label {
 color:#4A4A4A;
 vertical-align:text-top;
+}
 div.browserblock .browser-header span {
 margin-left:5px;
 font-weight:700;
+}
 div.browserblock .browser-body {
 background:#EEE;
 border-top:1px solid #CCC;
+}
 table.code-browser {
 border-collapse:collapse;
 width:100%;
+}
 table.code-browser tr {
 margin:3px;
+}
 table.code-browser thead th {
 background-color:#EEE;
 height:20px;
 font-size:1.1em;
 font-weight:700;
 text-align:left;
 padding-left:10px;
+}
 table.code-browser tbody td {
 padding-left:10px;
 height:20px;
+}
 table.code-browser .browser-file {
 background:url("../images/icons/document_16.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 text-align:left;
+}
 .diffblock .changeset_file{
 background:url("../images/icons/file.png") no-repeat scroll 3px;
 height:16px;
 padding-left:22px;
 text-align:left;
 font-size: 14px;
+}
 .diffblock .changeset_header{
 margin-left: 6px !important;
+}
 table.code-browser .browser-dir {
 background:url("../images/icons/folder_16.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 text-align:left;
+}
 .box .search {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:0 20px 10px;
+}
 .box .search div.search_path {
 background:none repeat scroll 0 0 #EEE;
 border:1px solid #CCC;
 color:blue;
 margin-bottom:10px;
 padding:10px 0;
+}
 .box .search div.search_path div.link {
 font-weight:700;
 margin-left:25px;
+}
 .box .search div.search_path div.link a {
 color:#003367;
 cursor:pointer;
 text-decoration:none;
+}
 #path_unlock {
 color:red;
 font-size:1.2em;
 padding-left:4px;
+}
 .info_box span {
 margin-left:3px;
 margin-right:3px;
+}
 .info_box .rev {
 color: #003367;
 font-size: 1.6em;
 font-weight: bold;
 vertical-align: sub;
+}
 .info_box input#at_rev,.info_box input#size {
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:12px;
 margin:0;
 padding:1px 5px 1px;
+}
 .info_box input#view {
 text-align:center;
 padding:4px 3px 2px 2px;
+}
 .yui-overlay,.yui-panel-container {
 visibility:hidden;
 position:absolute;
 z-index:2;
+}
 .yui-tt {
 visibility:hidden;
 position:absolute;
 color:#666;
 background-color:#FFF;
 font-family:arial, helvetica, verdana, sans-serif;
 border:2px solid #003367;
 font:100% sans-serif;
 width:auto;
 opacity:1px;
 padding:8px;
 white-space: pre-wrap;
 -webkit-border-radius: 8px 8px 8px 8px;
 -khtml-border-radius: 8px 8px 8px 8px;
 -moz-border-radius: 8px 8px 8px 8px;
 border-radius: 8px 8px 8px 8px;
+}
 .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;
+}
 .follow{
 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
 height: 16px;
 width: 20px;
 cursor: pointer;
 display: block;
 float: right;
 margin-top: 2px;
+}
 .following{
 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 height: 16px;
 width: 20px;
 cursor: pointer;
 display: block;
 float: right;
 margin-top: 2px;
+}
 .currently_following{
 padding-left: 10px;
 padding-bottom:5px;
+}
 .add_icon {
 background:url("../images/icons/add.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .edit_icon {
 background:url("../images/icons/folder_edit.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .delete_icon {
 background:url("../images/icons/delete.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .refresh_icon {
 background:url("../images/icons/arrow_refresh.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .pull_icon {
 background:url("../images/icons/connect.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .rss_icon {
 background:url("../images/icons/rss_16.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .atom_icon {
 background:url("../images/icons/atom.png") no-repeat scroll 3px;
 padding-left:20px;
 padding-top:0px;
 text-align:left;
+}
 .archive_icon {
 background:url("../images/icons/compress.png") no-repeat scroll 3px;
 padding-left:20px;
 text-align:left;
 padding-top:1px;
+}
 .start_following_icon {
 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
 padding-left:20px;
 text-align:left;
 padding-top:0px;
+}
 .stop_following_icon {
 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 padding-left:20px;
 text-align:left;
 padding-top:0px;
+}
 .action_button {
 border:0;
 display:inline;
+}
 .action_button:hover {
 border:0;
 text-decoration:underline;
 cursor:pointer;
+}
 #switch_repos {
 position:absolute;
 height:25px;
 z-index:1;
+}
 #switch_repos select {
 min-width:150px;
 max-height:250px;
 z-index:1;
+}
 .breadcrumbs {
 border:medium none;
 color:#FFF;
 float:left;
 text-transform:uppercase;
 font-weight:700;
 font-size:14px;
 margin:0;
 padding:11px 0 11px 10px;
+}
 .breadcrumbs a {
 color:#FFF;
+}
 .flash_msg 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:978px;
+}
 #content {
 min-height:100%;
 clear:both;
 overflow:hidden;
 padding:14px 10px;
+}
 #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-button {
 background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border:1px solid #316293;
 border-left:none;
 color:#FFF;
+}
 #content div.box input.ui-button-small {
 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;
+}
 #content div.box input.ui-button-small-blue {
 background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
 border-right:1px solid #2b7089;
 border-bottom:1px solid #1a6480;
 color:#fff;
+}
 #content div.box input.ui-button-small submit,button{
 cursor: pointer;
+}
 #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-button {
 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.graph{
 padding:0 10px 10px;
+}
 #content div.box div.title ul.links li a:hover,#content div.box div.title ul.links li.ui-tabs-selected a {
 color:#bfe3ff;
+}
 #content div.box ol.lower-roman,#content div.box ol.upper-roman,#content div.box ol.lower-alpha,#content div.box ol.upper-alpha,#content div.box ol.decimal {
 margin:10px 24px 10px 44px;
+}
 #content div.box div.form,#content div.box div.table,#content div.box div.traffic {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:0 20px 10px;
+}
 #content div.box div.form div.fields,#login div.form,#login div.form div.fields,#register div.form,#register div.form div.fields {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.label span,#login div.form div.fields div.field div.label span,#register div.form div.fields div.field div.label span {
 height:1%;
 display:block;
 color:#363636;
 margin:0;
 padding:2px 0 0;
+}
 #content div.box div.form div.fields div.field div.input input.error,#login div.form div.fields div.field div.input input.error,#register div.form div.fields div.field div.input input.error {
 background:#FBE3E4;
 border-top:1px solid #e1b2b3;
 border-left:1px solid #e1b2b3;
 border-right:1px solid #FBC2C4;
 border-bottom:1px solid #FBC2C4;
+}
 #content div.box div.form div.fields div.field div.input input.success,#login div.form div.fields div.field div.input input.success,#register div.form div.fields div.field div.input input.success {
 background:#E6EFC2;
 border-top:1px solid #cebb98;
 border-left:1px solid #cebb98;
 border-right:1px solid #c6d880;
 border-bottom:1px solid #c6d880;
+}
 #content div.box-left div.form div.fields div.field div.textarea,#content div.box-right div.form div.fields div.field div.textarea,#content div.box div.form div.fields div.field div.select select,#content div.box table th.selected input,#content div.box table td.selected input {
 margin:0;
+}
 #content div.box-left div.form div.fields div.field div.select,#content div.box-left div.form div.fields div.field div.checkboxes,#content div.box-left div.form div.fields div.field div.radios,#content div.box-right div.form div.fields div.field div.select,#content div.box-right div.form div.fields div.field div.checkboxes,#content div.box-right div.form div.fields div.field div.radios{
 margin:0 0 0 0px !important;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.select,#content div.box div.form div.fields div.field div.checkboxes,#content div.box div.form div.fields div.field div.radios {
 margin:0 0 0 200px;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.select a:hover,#content div.box div.form div.fields div.field div.select a.ui-selectmenu:hover,#content div.box div.action a:hover {
 color:#000;
 text-decoration:none;
+}
 #content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus,#content div.box div.action a.ui-selectmenu-focus {
 border:1px solid #666;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox,#content div.box div.form div.fields div.field div.radios div.radio {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:8px 0 2px;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox input,#content div.box div.form div.fields div.field div.radios div.radio input {
 float:left;
 margin:0;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox label,#content div.box div.form div.fields div.field div.radios div.radio label {
 height:1%;
 display:block;
 float:left;
 margin:2px 0 0 4px;
+}
 div.form div.fields div.field div.button input,#content div.box div.form div.fields div.buttons input,div.form div.fields div.buttons input,#content div.box div.action div.button input {
 color:#000;
 font-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-button,#content div.box div.form div.fields div.buttons input.ui-button {
 background:#e5e3e3 url("../images/button.png") repeat-x;
 border-top:1px solid #DDD;
 border-left:1px solid #c6c6c6;
 border-right:1px solid #DDD;
 border-bottom:1px solid #c6c6c6;
 color:#515151;
 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-button,#login div.form div.fields div.buttons input.ui-button,#register div.form div.fields div.buttons input.ui-button {
 background:#e5e3e3 url("../images/button.png") repeat-x;
 border-top:1px solid #DDD;
 border-left:1px solid #c6c6c6;
 border-right:1px solid #DDD;
 border-bottom:1px solid #c6c6c6;
 color:#515151;
 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:520px;
 margin:10% auto 0;
 padding:0;
+}
 #login div.color,#register div.color {
 clear:both;
 overflow:hidden;
 background:#FFF;
 margin:10px auto 0;
 padding:3px 3px 3px 0;
+}
 #login div.color a,#register div.color a {
 width:20px;
 height:20px;
 display:block;
 float:left;
 margin:0 0 0 3px;
 padding:0;
+}
 #login div.title h5,#register div.title h5 {
 color:#fff;
 margin:10px;
 padding:0;
+}
 #login div.form div.fields div.field,#register div.form div.fields div.field {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:0 0 10px;
+}
 #login div.form div.fields div.field span.error-message,#register div.form div.fields div.field span.error-message {
 height:1%;
 display:block;
 color:red;
 margin:8px 0 0;
 padding:0;
 max-width: 320px;
+}
 #login div.form div.fields div.field div.label label,#register div.form div.fields div.field div.label label {
 color:#000;
 font-weight:700;
+}
 #login div.form div.fields div.field div.input,#register div.form div.fields div.field div.input {
 float:left;
 margin:0;
 padding:0;
+}
 #login div.form div.fields div.field div.checkbox,#register div.form div.fields div.field div.checkbox {
 margin:0 0 0 184px;
 padding:0;
+}
 #login div.form div.fields div.field div.checkbox label,#register div.form div.fields div.field div.checkbox label {
 color:#565656;
 font-weight:700;
+}
 #login div.form div.fields div.buttons input,#register div.form div.fields div.buttons input {
 color:#000;
 font-size:1em;
 font-weight:700;
 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/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 <!-- HEADER -->
 <div id="header">
     <!-- user -->
     <ul id="logged-user">
          <li class="first">
 			<div id="quick_login" style="display:none">
 			${h.form(h.url('login_home',came_from=h.url.current()))}
 			<div class="form">
 			    <div class="fields">
 			        <div class="field">
 			            <div class="label">
 			                <label for="username">${_('Username')}:</label>
 			            </div>
 			            <div class="input">
 			                ${h.text('username',class_='focus',size=40)}
 			            </div>
 			        </div>
 			        <div class="field">
 			            <div class="label">
 			                <label for="password">${_('Password')}:</label>
 			            </div>
 			            <div class="input">
 			                ${h.password('password',class_='focus',size=40)}
 			            </div>
 			        </div>
 			        <div class="buttons">
 			            ${h.submit('sign_in','Sign In',class_="ui-button")}
+			            <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>${h.submit('sign_in','Sign In',class_="ui-button")}
 			        </div>
 			    </div>
 			</div>
 			${h.end_form()}
 			<script type="text/javascript">
 			YUE.on('quick_login_link','click',function(e){
 				if(YUD.hasClass('quick_login_link','enabled')){
 					YUD.setStyle('quick_login','display','none');
 					YUD.removeClass('quick_login_link','enabled');
+				}
 				else{
 	                YUD.setStyle('quick_login','display','');
 	                YUD.addClass('quick_login_link','enabled');
 	                YUD.get('username').focus();
+				}
 			    //make sure we don't redirect
 				YUE.preventDefault(e);
 			});
 			</script>
 			</div>
              <div class="gravatar">
                  <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
              </div>
           <div class="account">
           %if c.rhodecode_user.username == 'default':
               <a href="${h.url('public_journal')}">${_('Public journal')}</a>
           %else:
           	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
           %endif
           </div>
          </li>
          <li>
             <a href="${h.url('home')}">${_('Home')}</a>
          </li>
          %if c.rhodecode_user.username != 'default':
             <li>
                <a href="${h.url('journal')}">${_('Journal')}</a>
                ##(${c.unread_journal}
             </li>
             %endif
             %if c.rhodecode_user.username == 'default':
                 <li class="last highlight">${h.link_to(u'Login',h.url('login_home'),id='quick_login_link')}</li>
             %else:
                 <li class="last highlight">${h.link_to(u'Log Out',h.url('logout_home'))}</li>
             %endif
     </ul>
     <!-- end user -->
     <div id="header-inner" class="title top-left-rounded-corner top-right-rounded-corner">
         <div id="logo">
             <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
         ${self.body()}
     </div>
 </div>
 <!-- END HEADER -->
 <!-- CONTENT -->
 <div id="content">
     <div class="flash_msg">
         <% messages = h.flash.pop_messages() %>
         % if messages:
         <ul id="flash-messages">
             % for message in messages:
             <li class="${message.category}_msg">${message}</li>
             % endfor
         </ul>
         % endif
     </div>
     <div id="main">
         ${next.main()}
     </div>
 </div>
 <!-- END CONTENT -->
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title bottom-left-rounded-corner bottom-right-rounded-corner">
        <div>
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
 	       <p class="footer-link-right">
 	           <a href="${h.url('rhodecode_official')}">RhodeCode</a>
 	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
 	       </p>
        </div>
    </div>
    <script type="text/javascript">
    function tooltip_activate(){
 	    ${h.tooltip.activate()}
+   }
    tooltip_activate();
    </script>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="page_nav()">
     ${self.menu()}
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="menu(current=None)">
 		<%
 		def is_current(selected):
 			if selected == current:
 				return h.literal('class="current"')
 		%>
 		%if current not in ['home','admin']:
 		   ##REGULAR MENU
 	        <ul id="quick">
 				<!-- repo switcher -->
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" />
                     </span>
                     <span>&darr;</span>
 					</a>
 					<ul id="repo_switcher_list" class="repo_switcher">
                         <li>
                             <a href="#">${_('loading...')}</a>
                         </li>
 					</ul>
 					<script type="text/javascript">
 					   YUE.on('repo_switcher','mouseover',function(){
 						      function qfilter(){
 						         var S = YAHOO.util.Selector;
 						         var q_filter = YUD.get('q_filter_rs');
 						         var F = YAHOO.namespace('q_filter_rs');
 						         YUE.on(q_filter,'click',function(){
 						            q_filter.value = '';
 						         });
 						         F.filterTimeout = null;
 						         F.updateFilter  = function() {
 						            // Reset timeout
 						            F.filterTimeout = null;
 						            var obsolete = [];
 						            var nodes = S.query('ul#repo_switcher_list li a.repo_name');
 						            var req = YUD.get('q_filter_rs').value;
 						            for (n in nodes){
 						                YUD.setStyle(nodes[n].parentNode,'display','')
+						            }
 						            if (req){
 						                for (n in nodes){
 						                    console.log(n);
 						                    if (nodes[n].innerHTML.toLowerCase().indexOf(req) == -1) {
 						                        obsolete.push(nodes[n]);
+						                    }
+						                }
 						                if(obsolete){
 						                    for (n in obsolete){
 						                        YUD.setStyle(obsolete[n].parentNode,'display','none');
+						                    }
+						                }
+						            }
+						         }
 						         YUE.on(q_filter,'keyup',function(e){
 						             clearTimeout(F.filterTimeout);
 						             setTimeout(F.updateFilter,600);
 						         });
+						}
 						   var loaded = YUD.hasClass('repo_switcher','loaded');
 						   if(!loaded){
 							   YUD.addClass('repo_switcher','loaded');
 							   YAHOO.util.Connect.asyncRequest('GET',"${h.url('repo_switcher')}",{
 								   success:function(o){
 								      YUD.get('repo_switcher_list').innerHTML = o.responseText;
 								      qfilter();
 								   },
 								   failure:function(o){
 									   YUD.removeClass('repo_switcher','loaded');
+								   }
 							   },null);
+						   }
 						   return false;
 					   });
 					</script>
 				</li>
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>
 	               </a>
 	            </li>
                 ##<li ${is_current('shortlog')}>
                 ##   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                 ##   <span class="icon">
                 ##       <img src="${h.url("/images/icons/application_view_list.png")}" alt="${_('Shortlog')}" />
                 ##   </span>
                 ##   <span>${_('Shortlog')}</span>
                 ##   </a>
                 ##</li>
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>
                    </a>
                 </li>
                 <li ${is_current('switch_to')}>
                    <a title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="${h.url('/images/icons/arrow_switch.png')}" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul>
                         <li>
                             ${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.rhodecode_repo.branches.values():
 						        %for cnt,branch in enumerate(c.rhodecode_repo.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.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.rhodecode_repo.tags.values():
                                 %for cnt,tag in enumerate(c.rhodecode_repo.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="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
                    </span>
                    <span>${_('Files')}</span>
                    </a>
                 </li>
                 <li ${is_current('options')}>
                    <a title="${_('Options')}" href="#">
                    <span class="icon">
                        <img src="${h.url('/images/icons/table_gear.png')}" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Options')}</span>
                    </a>
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                      %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                          <li>${h.link_to(_('settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                      %else:
                          <li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                      %endif
                    %endif
                    	<li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
                    	<li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
                     % if h.HasPermissionAll('hg.admin')('access admin main page'):
                      <li>
                        ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}
                         <%def name="admin_menu()">
                         <ul>
                             <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
                             <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
                             <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
                             <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
                             <li>${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}</li>
                             <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
                             <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
                             <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
                         </ul>
                         </%def>
                         ${admin_menu()}
                      </li>
                     % endif
                    </ul>
                 </li>
                 <li>
                     <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                     <span class="icon_short">
                         <img src="${h.url('/images/icons/heart.png')}" alt="${_('Followers')}" />
                     </span>
                     <span id="current_followers_count" class="short">${c.repository_followers}</span>
                     </a>
                 </li>
                 <li>
                     <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                     <span class="icon_short">
                         <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Forks')}" />
                     </span>
                     <span class="short">${c.repository_forks}</span>
                     </a>
                 </li>
 	        </ul>
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
                     <a title="${_('Home')}"  href="${h.url('home')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/home_16.png')}" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>
                     </a>
                 </li>
                 % if c.rhodecode_user.username != 'default':
                  <li>
                     <a title="${_('Journal')}"  href="${h.url('journal')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
                     </span>
                     <span>${_('Journal')}</span>
                     </a>
                  </li>
                 % endif
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
                     </span>
                     <span>${_('Search')}</span>
                     </a>
                 </li>
 				%if h.HasPermissionAll('hg.admin')('access admin main page'):
                 <li ${is_current('admin')}>
                    <a title="${_('Admin')}" href="${h.url('admin_home')}">
                    <span class="icon">
                        <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Admin')}</span>
                    </a>
                     ${admin_menu()}
                 </li>
 				%endif
 			</ul>
 		%endif
 </%def>
@@ \ No newline at end of file @@

rhodecode/templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%def name="title()">
     ${_('Reset You password')} - ${c.rhodecode_name}
 </%def>
 <div id="register">
 	<div class="title top-left-rounded-corner top-right-rounded-corner">
 		<h5>${_('Reset You password to')} ${c.rhodecode_name}</h5>
 	</div>
 	<div class="inner">
 	    ${h.form(url('password_reset'))}
 	    <div class="form">
 	        <!-- fields -->
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
 	                    <label for="email">${_('Email address')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('email')}
 	                </div>
 	             </div>
 	            <div class="buttons">
 		            <div class="nohighlight">
 		              ${h.submit('send','Reset my password',class_="ui-button")}
-					  	<div class="activation_msg">${_('Your new password will be send to matching email address')}</div>
+					  	<div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
 		            </div>
 	            </div>
 	    	</div>
 	    </div>
 	    ${h.end_form()}
         <script type="text/javascript">
         YUE.onDOMReady(function(){
             YUD.get('email').focus();
         })
         </script>
 	</div>
    </div>

rhodecode/templates/password_reset_confirmation.html

➞

Show inline comments

new file 100644

rhodecode/tests/functional/test_login.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from rhodecode.tests import *
 from rhodecode.model.db import User
 from rhodecode.lib import generate_api_key
 from rhodecode.lib.auth import check_password
 class TestLoginController(TestController):
     def test_index(self):
         response = self.app.get(url(controller='login', action='index'))
-        assert response.status == '200 OK', 'Wrong response from login page got %s' % response.status
+        self.assertEqual(response.status, '200 OK')
         # Test response...
     def test_login_admin_ok(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'test_admin',
                                   'password':'test12'})
         assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status
         assert response.session['rhodecode_user'].username == 'test_admin', 'wrong logged in user'
         self.assertEqual(response.status, '302 Found')
         self.assertEqual(response.session['rhodecode_user'].username ,
                          'test_admin')
         response = response.follow()
-        assert '%s repository' % HG_REPO in response.body
+        self.assertTrue('%s repository' % HG_REPO in response.body)
     def test_login_regular_ok(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'test_regular',
                                   'password':'test12'})
         print response
         assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status
         assert response.session['rhodecode_user'].username == 'test_regular', 'wrong logged in user'
         self.assertEqual(response.status, '302 Found')
         self.assertEqual(response.session['rhodecode_user'].username ,
                          'test_regular')
         response = response.follow()
         assert '%s repository' % HG_REPO in response.body
         assert '<a title="Admin" href="/_admin">' not in response.body
         self.assertTrue('%s repository' % HG_REPO in response.body)
         self.assertTrue('<a title="Admin" href="/_admin">' not in response.body)
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users'
         response = self.app.post(url(controller='login', action='index', came_from=test_came_from),
         response = self.app.post(url(controller='login', action='index',
                                      came_from=test_came_from),
                                  {'username':'test_admin',
                                   'password':'test12'})
-        assert response.status == '302 Found', 'Wrong response code from came from redirection'
+        self.assertEqual(response.status, '302 Found')
         response = response.follow()
         assert response.status == '200 OK', 'Wrong response from login page got %s' % response.status
         assert 'Users administration' in response.body, 'No proper title in response'
         self.assertEqual(response.status, '200 OK')
         self.assertTrue('Users administration' in response.body)
     def test_login_short_password(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'test_admin',
                                   'password':'as'})
         self.assertEqual(response.status, '200 OK')
-        print response.body
         self.assertTrue('Enter 3 characters or more' in response.body)
     def test_login_wrong_username_password(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'error',
                                   'password':'test12'})
-        assert response.status == '200 OK', 'Wrong response from login page'
+        self.assertEqual(response.status , '200 OK')
         assert 'invalid user name' in response.body, 'No error username message in response'
         assert 'invalid password' in response.body, 'No error password message in response'
         self.assertTrue('invalid user name' in response.body)
         self.assertTrue('invalid password' in response.body)
     #==========================================================================
     # REGISTRATIONS
     #==========================================================================
     def test_register(self):
         response = self.app.get(url(controller='login', action='register'))
-        assert 'Sign Up to RhodeCode' in response.body, 'wrong page for user registration'
+        self.assertTrue('Sign Up to RhodeCode' in response.body)
     def test_register_err_same_username(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'test_admin',
                                              'password':'test12',
                                              'password_confirmation':'test12',
                                              'email':'goodmail@domain.com',
                                              'name':'test',
                                              'lastname':'test'})
         assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
         assert 'This username already exists' in response.body
         self.assertEqual(response.status , '200 OK')
         self.assertTrue('This username already exists' in response.body)
     def test_register_err_same_email(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'test_admin_0',
                                              'password':'test12',
                                              'password_confirmation':'test12',
                                              'email':'test_admin@mail.com',
                                              'name':'test',
                                              'lastname':'test'})
-        assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
+        self.assertEqual(response.status , '200 OK')
         assert 'This e-mail address is already taken' in response.body
     def test_register_err_same_email_case_sensitive(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'test_admin_1',
                                              'password':'test12',
                                              'password_confirmation':'test12',
                                              'email':'TesT_Admin@mail.COM',
                                              'name':'test',
                                              'lastname':'test'})
-        assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
+        self.assertEqual(response.status , '200 OK')
         assert 'This e-mail address is already taken' in response.body
     def test_register_err_wrong_data(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'xs',
                                              'password':'test',
                                              'password_confirmation':'test',
                                              'email':'goodmailm',
                                              'name':'test',
                                              'lastname':'test'})
-        assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
+        self.assertEqual(response.status , '200 OK')
         assert 'An email address must contain a single @' in response.body
         assert 'Enter a value 6 characters long or more' in response.body
     def test_register_err_username(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'error user',
                                              'password':'test12',
                                              'password_confirmation':'test12',
                                              'email':'goodmailm',
                                              'name':'test',
                                              'lastname':'test'})
         print response.body
         assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
         self.assertEqual(response.status , '200 OK')
         assert 'An email address must contain a single @' in response.body
         assert ('Username may only contain '
                 'alphanumeric characters underscores, '
                 'periods or dashes and must begin with '
                 'alphanumeric character') in response.body
     def test_register_err_case_sensitive(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'Test_Admin',
                                              'password':'test12',
                                              'password_confirmation':'test12',
                                              'email':'goodmailm',
                                              'name':'test',
                                              'lastname':'test'})
-        assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
+        self.assertEqual(response.status , '200 OK')
         assert 'An email address must contain a single @' in response.body
         assert 'This username already exists' in response.body
     def test_register_special_chars(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'xxxaxn',
                                              'password':'ąćźżąśśśś',
                                              'password_confirmation':'ąćźżąśśśś',
                                              'email':'goodmailm@test.plx',
                                              'name':'test',
                                              'lastname':'test'})
         print response.body
         assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
         self.assertEqual(response.status , '200 OK')
         assert 'Invalid characters in password' in response.body
     def test_register_password_mismatch(self):
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':'xs',
                                              'password':'123qwe',
                                              'password_confirmation':'qwe123',
                                              'email':'goodmailm@test.plxa',
                                              'name':'test',
                                              'lastname':'test'})
         assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
         print response.body
         self.assertEqual(response.status , '200 OK')
         assert 'Password do not match' in response.body
     def test_register_ok(self):
         username = 'test_regular4'
         password = 'qweqwe'
         email = 'marcin@test.com'
         name = 'testname'
         lastname = 'testlastname'
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':username,
                                              'password':password,
                                              'password_confirmation':password,
                                              'email':email,
                                              'name':name,
                                              'lastname':lastname})
-        assert response.status == '302 Found', 'Wrong response from register page got %s' % response.status
+        self.assertEqual(response.status , '302 Found')
         assert 'You have successfully registered into rhodecode' in response.session['flash'][0], 'No flash message about user registration'
         ret = self.sa.query(User).filter(User.username == 'test_regular4').one()
         assert ret.username == username , 'field mismatch %s %s' % (ret.username, username)
         assert check_password(password, ret.password) == True , 'password mismatch'
         assert ret.email == email , 'field mismatch %s %s' % (ret.email, email)
         assert ret.name == name , 'field mismatch %s %s' % (ret.name, name)
         assert ret.lastname == lastname , 'field mismatch %s %s' % (ret.lastname, lastname)
     def test_forgot_password_wrong_mail(self):
         response = self.app.post(url(controller='login', action='password_reset'),
                                             {'email':'marcin@wrongmail.org', })
         assert "This e-mail address doesn't exist" in response.body, 'Missing error message about wrong email'
     def test_forgot_password(self):
         response = self.app.get(url(controller='login', action='password_reset'))
         assert response.status == '200 OK', 'Wrong response from login page got %s' % response.status
         response = self.app.get(url(controller='login',
                                     action='password_reset'))
         self.assertEqual(response.status , '200 OK')
         username = 'test_password_reset_1'
         password = 'qweqwe'
         email = 'marcin@python-works.com'
         name = 'passwd'
         lastname = 'reset'
         response = self.app.post(url(controller='login', action='register'),
                                             {'username':username,
                                              'password':password,
                                              'password_confirmation':password,
                                              'email':email,
                                              'name':name,
                                              'lastname':lastname})
         #register new user for email test
         response = self.app.post(url(controller='login', action='password_reset'),
                                             {'email':email, })
         print response.session['flash']
         assert 'You have successfully registered into rhodecode' in response.session['flash'][0], 'No flash message about user registration'
         assert 'Your new password was sent' in response.session['flash'][1], 'No flash message about password reset'
         new = User()
         new.username = username
         new.password = password
         new.email = email
         new.name = name
         new.lastname = lastname
         new.api_key = generate_api_key(username)
         self.sa.add(new)
         self.sa.commit()
         response = self.app.post(url(controller='login',
                                      action='password_reset'),
                                  {'email':email, })
         self.checkSessionFlash(response, 'Your password reset link was sent')
         response = response.follow()
         # BAD KEY
         key = "bad"
         response = self.app.get(url(controller='login',
                                     action='password_reset_confirmation',
                                     key=key))
         self.assertEqual(response.status, '302 Found')
         self.assertTrue(response.location.endswith(url('reset_password')))
         # GOOD KEY
         key = User.by_username(username).api_key
         response = self.app.get(url(controller='login',
                                     action='password_reset_confirmation',
                                     key=key))
         self.assertEqual(response.status, '302 Found')
         self.assertTrue(response.location.endswith(url('login_home')))
         self.checkSessionFlash(response,
                                ('Your password reset was successful, '
                                 'new password has been sent to your email'))
         response = response.follow()

setup.cfg

➞

Show inline comments

 [egg_info]
 tag_build = beta
 tag_svn_revision = true
 [easy_install]
 find_links = http://www.pylonshq.com/download/
 [nosetests]
-verbose=False
+verbose=True
 verbosity=2
 with-pylons=test.ini
-detailed-errors=0
+detailed-errors=1
 nologcapture=1
 # Babel configuration
 [compile_catalog]
 domain = rhodecode
 directory = rhodecode/i18n
 statistics = true
 [extract_messages]
 add_comments = TRANSLATORS:
 output_file = rhodecode/i18n/rhodecode.pot
 width = 80
 [init_catalog]
 domain = rhodecode
 input_file = rhodecode/i18n/rhodecode.pot
 output_dir = rhodecode/i18n
 [update_catalog]
 domain = rhodecode
 input_file = rhodecode/i18n/rhodecode.pot
 output_dir = rhodecode/i18n
 previous = true
 [build_sphinx]
 source-dir = docs/
 build-dir  = docs/_build
 all_files  = 1
 [upload_sphinx]
 upload-dir = docs/_build/html
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)