mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN

This commit is contained in:
Arthur Schiwon 2013-11-11 19:27:38 +01:00
parent 082357a670
commit 550f2d0089
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/user_ldap/css/settings.css
View File

@ -3,13 +3,9 @@
width: 60%; width: 60%;
} }
.tablecell {
display: table-cell !important;
white-space: nowrap;
}
.tablerow { .tablerow {
display: table-row; display: table-row;
white-space: nowrap;
} }
.tablerow input, .tablerow textarea { .tablerow input, .tablerow textarea {
@ -78,6 +74,7 @@
.wizSpinner { .wizSpinner {
height: 15px; height: 15px;
margin: 0.3em;
} }
.ldapSettingControls { .ldapSettingControls {
@ -100,7 +97,6 @@
#ldap fieldset input, #ldap fieldset textarea { #ldap fieldset input, #ldap fieldset textarea {
width: 60%; width: 60%;
display: inline-block;
} }
#ldap fieldset p input[type=checkbox] { #ldap fieldset p input[type=checkbox] {

5
apps/user_ldap/js/settings.js
View File

@ -192,6 +192,7 @@ var LdapWizard = {
'&ldap_serverconfig_chooser='+$('#ldap_serverconfig_chooser').val(); '&ldap_serverconfig_chooser='+$('#ldap_serverconfig_chooser').val();
LdapWizard.showSpinner('#ldap_base'); LdapWizard.showSpinner('#ldap_base');
$('#ldap_base').prop('disabled', 'disabled');
LdapWizard.ajax(param, LdapWizard.ajax(param,
function(result) { function(result) {
LdapWizard.applyChanges(result); LdapWizard.applyChanges(result);
@ -199,10 +200,12 @@ var LdapWizard = {
if($('#ldap_base').val()) { if($('#ldap_base').val()) {
LdapWizard.hideInfoBox(); LdapWizard.hideInfoBox();
} }
$('#ldap_base').prop('disabled', false);
}, },
function (result) { function (result) {
LdapWizard.hideSpinner('#ldap_base'); LdapWizard.hideSpinner('#ldap_base');
LdapWizard.showInfoBox('Please specify a Base DN'); LdapWizard.showInfoBox('Please specify a Base DN');
$('#ldap_base').prop('disabled', false);
} }
); );
} }
@ -514,7 +517,7 @@ var LdapWizard = {
processChanges: function(triggerObj) { processChanges: function(triggerObj) {
LdapWizard.hideInfoBox(); LdapWizard.hideInfoBox();
if(triggerObj.id == 'ldap_host' if(triggerObj.id == 'ldap_host'
|| triggerObj.id == 'ldap_port' || triggerObj.id == 'ldap_port'
|| triggerObj.id == 'ldap_dn' || triggerObj.id == 'ldap_dn'