diff options
| author | blizzz <blizzz@owncloud.com> | 2014-10-16 15:35:30 +0200 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2014-10-16 15:35:30 +0200 |
| commit | 8553e04a7888b9cfaac906dad439f940475695c1 (patch) | |
| tree | 8df486e751be40f8bbd54d76775ba3bd5dd30445 /apps/user_ldap/templates | |
| parent | 480fd1353e5170a964ef6ea0f20ee297eb7d1ac3 (diff) | |
| parent | 7b15fcc3f8fb0cf61e3d5d8748b5396bcd2745c2 (diff) | |
| download | nextcloud-server-8553e04a7888b9cfaac906dad439f940475695c1.tar.gz nextcloud-server-8553e04a7888b9cfaac906dad439f940475695c1.zip | |
Merge pull request #11478 from owncloud/fix-11448
LDAP: add setting to wizard that disables auto-detection and enables raw mode
Diffstat (limited to 'apps/user_ldap/templates')
4 files changed, 21 insertions, 4 deletions
diff --git a/apps/user_ldap/templates/part.wizard-groupfilter.php b/apps/user_ldap/templates/part.wizard-groupfilter.php index e460997b1bf..1953d2eaa6e 100644 --- a/apps/user_ldap/templates/part.wizard-groupfilter.php +++ b/apps/user_ldap/templates/part.wizard-groupfilter.php @@ -30,13 +30,16 @@ placeholder="<?php p($l->t('Raw LDAP filter'));?>" title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName()));?>" /> + <button class="ldapGetEntryCount hidden" name="ldapGetEntryCount" type="button"> + <?php p($l->t('Test Filter'));?> + </button> </p> <p> <div class="ldapWizardInfo invisible"> </div> </p> - <p> + <p class="ldap_count"> <span id="ldap_group_count">0 <?php p($l->t('groups found'));?></span> </p> <?php print_unescaped($_['wizardControls']); ?> </div> -</fieldset>
\ No newline at end of file +</fieldset> diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php index bee2b874178..c1744143f98 100644 --- a/apps/user_ldap/templates/part.wizard-server.php +++ b/apps/user_ldap/templates/part.wizard-server.php @@ -69,6 +69,16 @@ </textarea> </div> + <div class="tablerow left"> + <input type="checkbox" id="ldap_experienced_admin" value="1" + name="ldap_experienced_admin" class="tablecell lwautosave" + title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>" + /> + <label for="ldap_experienced_admin" class="tablecell"> + <?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?> + </label> + </div> + <div class="tablerow"> <div class="tablecell ldapWizardInfo invisible"> </div> diff --git a/apps/user_ldap/templates/part.wizard-userfilter.php b/apps/user_ldap/templates/part.wizard-userfilter.php index eff9f89ce2c..99a6e75370b 100644 --- a/apps/user_ldap/templates/part.wizard-userfilter.php +++ b/apps/user_ldap/templates/part.wizard-userfilter.php @@ -30,13 +30,16 @@ placeholder="<?php p($l->t('Raw LDAP filter'));?>" title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>" /> + <button class="ldapGetEntryCount hidden" name="ldapGetEntryCount" type="button"> + <?php p($l->t('Test Filter'));?> + </button> </p> <p> <div class="ldapWizardInfo invisible"> </div> </p> - <p> + <p class="ldap_count"> <span id="ldap_user_count">0 <?php p($l->t('users found'));?></span> </p> <?php print_unescaped($_['wizardControls']); ?> </div> -</fieldset>
\ No newline at end of file +</fieldset> diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php index 33e1614c9c6..90d558e72d1 100644 --- a/apps/user_ldap/templates/part.wizardcontrols.php +++ b/apps/user_ldap/templates/part.wizardcontrols.php @@ -1,4 +1,5 @@ <div class="ldapWizardControls"> + <span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span> <span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span> <button class="ldap_action_back invisible" name="ldap_action_back" type="button"> |