diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-11-11 19:27:38 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-11-11 19:27:38 +0100 |
| commit | 550f2d0089739c6371059a356311d54dbcc73255 (patch) | |
| tree | 9087d3d8dfe8314580c9a37674527bcbf8b311ef /apps | |
| parent | 082357a670de9af9bb1418b2b227f44a381ecc99 (diff) | |
| download | nextcloud-server-550f2d0089739c6371059a356311d54dbcc73255.tar.gz nextcloud-server-550f2d0089739c6371059a356311d54dbcc73255.zip | |
LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/css/settings.css | 8 | ||||
| -rw-r--r-- | apps/user_ldap/js/settings.js | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 41578e91b69..be03419c2de 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -3,13 +3,9 @@ width: 60%; } -.tablecell { - display: table-cell !important; - white-space: nowrap; -} - .tablerow { display: table-row; + white-space: nowrap; } .tablerow input, .tablerow textarea { @@ -78,6 +74,7 @@ .wizSpinner { height: 15px; + margin: 0.3em; } .ldapSettingControls { @@ -100,7 +97,6 @@ #ldap fieldset input, #ldap fieldset textarea { width: 60%; - display: inline-block; } #ldap fieldset p input[type=checkbox] { diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 6496c6aee59..dcaeb70b57f 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -192,6 +192,7 @@ var LdapWizard = { '&ldap_serverconfig_chooser='+$('#ldap_serverconfig_chooser').val(); LdapWizard.showSpinner('#ldap_base'); + $('#ldap_base').prop('disabled', 'disabled'); LdapWizard.ajax(param, function(result) { LdapWizard.applyChanges(result); @@ -199,10 +200,12 @@ var LdapWizard = { if($('#ldap_base').val()) { LdapWizard.hideInfoBox(); } + $('#ldap_base').prop('disabled', false); }, function (result) { LdapWizard.hideSpinner('#ldap_base'); LdapWizard.showInfoBox('Please specify a Base DN'); + $('#ldap_base').prop('disabled', false); } ); } @@ -514,7 +517,7 @@ var LdapWizard = { processChanges: function(triggerObj) { LdapWizard.hideInfoBox(); - + if(triggerObj.id == 'ldap_host' || triggerObj.id == 'ldap_port' || triggerObj.id == 'ldap_dn' |