Mercurial > kallithea
changeset 1626:69cd66071f02 beta
merge from bb
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 31 Oct 2011 20:51:29 +0200 |
| parents | b8cde49f5e5b (diff) b7094c69979e (current diff) |
| children | c622e3a85499 |
| files | rhodecode/model/user.py |
| diffstat | 5 files changed, 14 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/user.py Mon Oct 31 19:10:21 2011 +0200 +++ b/rhodecode/model/user.py Mon Oct 31 20:51:29 2011 +0200 @@ -141,7 +141,7 @@ 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.active = attrs.get('active',True) new_user.ldap_dn = safe_unicode(user_dn) new_user.name = attrs['name'] new_user.lastname = attrs['lastname']
--- a/rhodecode/public/css/style.css Mon Oct 31 19:10:21 2011 +0200 +++ b/rhodecode/public/css/style.css Mon Oct 31 20:51:29 2011 +0200 @@ -3005,6 +3005,13 @@ padding: 0 !important; } +.q_filter_box { + -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + #q_filter { border: 0 none; color: #AAAAAA;
--- a/rhodecode/templates/admin/repos_groups/repos_groups.html Mon Oct 31 19:10:21 2011 +0200 +++ b/rhodecode/templates/admin/repos_groups/repos_groups.html Mon Oct 31 20:51:29 2011 +0200 @@ -5,11 +5,9 @@ </%def> <%def name="breadcrumbs()"> - <span class="groups_breadcrumbs"> - ${_('Groups')} + <span class="groups_breadcrumbs"> ${_('Groups')} %if c.group.parent_group: - » ${h.link_to(c.group.parent_group.name, - h.url('repos_group_home',group_name=c.group.parent_group.group_name))} + » ${h.link_to(c.group.parent_group.name,h.url('repos_group_home',group_name=c.group.parent_group.group_name))} %endif » "${c.group.name}" ${_('with')} </span>
--- a/rhodecode/templates/index.html Mon Oct 31 19:10:21 2011 +0200 +++ b/rhodecode/templates/index.html Mon Oct 31 20:51:29 2011 +0200 @@ -1,14 +1,8 @@ ## -*- coding: utf-8 -*- <%inherit file="base/base.html"/> -<%def name="title()"> - ${_('Dashboard')} - ${c.rhodecode_name} -</%def> -<%def name="breadcrumbs()"> - ${c.rhodecode_name} -</%def> -<%def name="page_nav()"> - ${self.menu('home')} -</%def> +<%def name="title()">${_('Dashboard')} - ${c.rhodecode_name}</%def> +<%def name="breadcrumbs()">${c.rhodecode_name}</%def> +<%def name="page_nav()">${self.menu('home')}</%def> <%def name="main()"> <%include file="index_base.html" args="parent=self"/> </%def>
--- a/rhodecode/templates/index_base.html Mon Oct 31 19:10:21 2011 +0200 +++ b/rhodecode/templates/index_base.html Mon Oct 31 20:51:29 2011 +0200 @@ -3,8 +3,7 @@ <!-- box / title --> <div class="title"> <h5> - <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> - ${parent.breadcrumbs()} <span id="repo_count"></span> ${_('repositories')} + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count"></span> ${_('repositories')} </h5> %if c.rhodecode_user.username != 'default': %if h.HasPermissionAny('hg.admin','hg.create.repository')():