merge

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)

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 {

rhodecode/templates/index.html

@@ -30,6 +30,7
 	        <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 c.rhodecode_user.username != 'default':
 	        %if h.HasPermissionAny('hg.admin','hg.create.repository')():
 	        <ul class="links">
 	          <li>
@@ -37,6 +38,7
 	          </li>          
 	        </ul>  	        
 	        %endif
+		    %endif
 	    </div>
 	    <!-- end box / title -->
         <div class="table">