# HG changeset patch # User Marcin Kuzminski # Date 2010-12-02 02:52:26 # Node ID be15cc83361c19ae2f1a533c2201fe00beca14a5 # Parent 47d5781bfe8a9a68832cbf0da3a403d8598717c7 # Parent 81c173490971b495135eb6bbd8cd3ce8efc449fd merge diff --git a/rhodecode/lib/auth_ldap.py b/rhodecode/lib/auth_ldap.py --- a/rhodecode/lib/auth_ldap.py +++ b/rhodecode/lib/auth_ldap.py @@ -82,8 +82,7 @@ class AuthLdap(object): 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) diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -1405,7 +1405,7 @@ overflow:hidden; 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 { diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html --- a/rhodecode/templates/index.html +++ b/rhodecode/templates/index.html @@ -30,13 +30,15 @@
${_('Dashboard')}
- %if h.HasPermissionAny('hg.admin','hg.create.repository')(): - - %endif + %if c.rhodecode_user.username != 'default': + %if h.HasPermissionAny('hg.admin','hg.create.repository')(): + + %endif + %endif