Mercurial > kallithea
changeset 798:be15cc83361c beta
merge
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 02 Dec 2010 03:52:26 +0100 |
| parents | 47d5781bfe8a (current diff) 81c173490971 (diff) |
| children | 6d37fe113da0 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/auth_ldap.py Mon Nov 29 23:35:30 2010 +0100 +++ b/rhodecode/lib/auth_ldap.py Thu Dec 02 03:52:26 2010 +0100 @@ -82,8 +82,7 @@ server.protocol = ldap.VERSION3 if self.LDAP_BIND_DN and self.LDAP_BIND_PASS: - login_dn = self.BASE_DN % {'user':uid} - server.simple_bind_s(login_dn, self.LDAP_BIND_PASS) + server.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS) dn = self.BASE_DN % {'user':uid} log.debug("Authenticating %r at %s", dn, self.LDAP_SERVER)
--- a/rhodecode/public/css/style.css Mon Nov 29 23:35:30 2010 +0100 +++ b/rhodecode/public/css/style.css Thu Dec 02 03:52:26 2010 +0100 @@ -1405,7 +1405,7 @@ border-top:1px solid #DDD; text-align:left; margin:0; -padding:10px 0 0 114px; +padding:10px 0 0 150px; } #register div.form div.fields div.buttons div.highlight input.ui-state-default {
--- a/rhodecode/templates/index.html Mon Nov 29 23:35:30 2010 +0100 +++ b/rhodecode/templates/index.html Thu Dec 02 03:52:26 2010 +0100 @@ -30,13 +30,15 @@ <h5>${_('Dashboard')} <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...')}"/> </h5> - %if h.HasPermissionAny('hg.admin','hg.create.repository')(): - <ul class="links"> - <li> - <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span> - </li> - </ul> - %endif + %if c.rhodecode_user.username != 'default': + %if h.HasPermissionAny('hg.admin','hg.create.repository')(): + <ul class="links"> + <li> + <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span> + </li> + </ul> + %endif + %endif </div> <!-- end box / title --> <div class="table">