Skip to content

Revert "[stable25] Replace custom tooltips with native ones and add description to all e…" #37285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Mar 21, 2023
Merged

Revert "[stable25] Replace custom tooltips with native ones and add description to all e…" #37285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/user_ldap/js/wizard/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ OCA = OCA || {};
this.$settings.tabs({});
$('#ldapSettings button:not(.icon-default-style):not(.ui-multiselect)').button();
$('#ldapSettings').tabs({ beforeActivate: this.onTabChange });
$('#ldapSettings :input').tooltip({placement: "right", container: "body", trigger: "hover"});

this.initControls();
this.disableTabs();
Expand Down
13 changes: 0 additions & 13 deletions apps/user_ldap/templates/part.wizard-groupfilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,13 @@
<p class="ldapManyGroupsSupport hidden">
<label></label>
<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
aria-describedby="ldapGroupListAvailable_instructions"
title="<?php p($l->t('Available groups'));?>"></select>
<p class="hidden-visually" id="ldapGroupListAvailable_instructions">
<?php p($l->t('Available groups'));?>
</p>
<span class="buttonSpan">
<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
<button class="ldapGroupListDeselect" type="button">&lt;</button>
</span>
<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
aria-describedby="ldapGroupListSelected_instructions"
title="<?php p($l->t('Selected groups'));?>"></select>
<p class="hidden-visually" id="ldapGroupListSelected_instructions">
<?php p($l->t('Selected groups'));?>
</p>
</p>
<p>
<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
Expand All @@ -53,13 +45,8 @@
<p id="rawGroupFilterContainer" class="invisible">
<textarea type="text" id="ldap_group_filter" name="ldap_group_filter"
placeholder="<?php p($l->t('Edit LDAP Query'));?>"
aria-describedby="rawGroupFilterContainer_instructions"
title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()]));?>">
</textarea>
<p class="hidden-visually" id="rawGroupFilterContainer_instructions">
<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()]));?>
</p>

</p>
<p>
<div class="ldapWizardInfo invisible">&nbsp;</div>
Expand Down
18 changes: 1 addition & 17 deletions apps/user_ldap/templates/part.wizard-loginfilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@
</label>

<input type="checkbox" id="ldap_loginfilter_username"
aria-describedby="ldap_loginfilter_username_instructions"
title="<?php p($l->t('Allows login against the LDAP/AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>"
name="ldap_loginfilter_username" value="1" />
<p class="hidden-visually" id="ldap_loginfilter_username_instructions">
<?php p($l->t('Allows login against the LDAP/AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>
</p>
</p>
<p>
<label for="ldap_loginfilter_email">
Expand All @@ -23,11 +19,7 @@

<input type="checkbox" id="ldap_loginfilter_email"
title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>"
aria-describedby="ldap_loginfilter_email_instructions"
name="ldap_loginfilter_email" value="1" />
<p class="hidden-visually" id="ldap_loginfilter_email_instructions">
<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>
</p>
</p>
<p>
<label for="ldap_loginfilter_attributes">
Expand All @@ -49,12 +41,8 @@
<textarea type="text" id="ldap_login_filter" name="ldap_login_filter"
class="ldapFilterInputElement"
placeholder="<?php p($l->t('Edit LDAP Query'));?>"
aria-describedby="ldap_login_filter_instructions"
title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"'));?>">
</textarea>
<p class="hidden-visually" id="ldap_login_filter_instructions">
<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"'));?>
</p>
</p>
<p>
<div class="ldapWizardInfo invisible">&nbsp;</div>
Expand All @@ -63,11 +51,7 @@ class="ldapFilterInputElement"
<input type="text" id="ldap_test_loginname" name="ldap_test_loginname"
placeholder="<?php p($l->t('Test Loginname'));?>"
class="ldapVerifyInput"
aria-describedby="ldap_test_loginname_instructions"
title="<?php p($l->t('Attempts to receive a DN for the given loginname and the current login filter'));?>"/>
<p class="hidden-visually" id="ldap_test_loginname_instructions">
<?php p($l->t('Attempts to receive a DN for the given loginname and the current login filter'));?>
</p>
title="Attempts to receive a DN for the given loginname and the current login filter"/>
<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled">
<?php p($l->t('Verify settings'));?>
</button>
Expand Down
32 changes: 0 additions & 32 deletions apps/user_ldap/templates/part.wizard-server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,15 @@
?>
</select>
<button type="button" id="ldap_action_add_configuration"
aria-describedby="ldap_action_add_configuration_instructions"
name="ldap_action_add_configuration" class="icon-add icon-default-style"
title="<?php p($l->t('Add a new configuration'));?>">&nbsp;</button>
<p class="hidden-visually" id="ldap_action_add_configuration_instructions">
<?php p($l->t('Add a new configuration'));?>
</p>
<button type="button" id="ldap_action_copy_configuration"
name="ldap_action_copy_configuration"
aria-describedby="ldap_action_copy_configuration_instructions"
class="ldapIconCopy icon-default-style"
title="<?php p($l->t('Copy current configuration into new directory binding'));?>">&nbsp;</button>
<p class="hidden-visually" id="ldap_action_copy_configuration_instructions">
<?php p($l->t('Copy current configuration into new directory binding'));?>
</p>
<button type="button" id="ldap_action_delete_configuration"
aria-describedby="ldap_action_delete_configuration_instructions"
name="ldap_action_delete_configuration" class="icon-delete icon-default-style"
title="<?php p($l->t('Delete the current configuration'));?>">&nbsp;</button>
<p class="hidden-visually" id="ldap_action_delete_configuration_instructions">
<?php p($l->t('Delete the current configuration'));?>
</p>
</p>

<div class="hostPortCombinator">
Expand All @@ -42,13 +30,9 @@ class="ldapIconCopy icon-default-style"
<div class="table">
<input type="text" class="host" id="ldap_host"
name="ldap_host"
aria-describedby="ldap_host_instructions"
placeholder="<?php p($l->t('Host'));?>"
title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
/>
<p class="hidden-visually" id="ldap_host_instructions">
<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>
</p>
<span class="hostPortCombinatorSpan">
<input type="number" id="ldap_port" name="ldap_port"
placeholder="<?php p($l->t('Port'));?>" />
Expand All @@ -63,25 +47,17 @@ class="ldapIconCopy icon-default-style"
<div class="tablerow">
<input type="text" id="ldap_dn" name="ldap_dn"
class="tablecell"
aria-describedby="ldap_dn_instructions"
placeholder="<?php p($l->t('User DN'));?>" autocomplete="off"
title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.'));?>"
/>
<p class="hidden-visually" id="ldap_dn_instructions">
<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.'));?>
</p>
</div>

<div class="tablerow">
<input type="password" id="ldap_agent_password"
class="tablecell" name="ldap_agent_password"
aria-describedby="ldap_agent_password_instructions"
placeholder="<?php p($l->t('Password'));?>" autocomplete="off"
title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>"
/>
<p class="hidden-visually" id="ldap_agent_password_instructions">
<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>
</p>
<button class="ldapSaveAgentCredentials" name="ldapSaveAgentCredentials" type="button">
<?php p($l->t('Save Credentials'));?>
</button>
Expand All @@ -91,13 +67,9 @@ class="tablecell" name="ldap_agent_password"
<div class="tablerow">
<textarea id="ldap_base" name="ldap_base"
class="tablecell"
aria-describedby="ldap_base_instructions"
placeholder="<?php p($l->t('One Base DN per line'));?>"
title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>">
</textarea>
<p class="hidden-visually" id="ldap_base_instructions">
<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>
</p>
<button class="ldapDetectBase" name="ldapDetectBase" type="button">
<?php p($l->t('Detect Base DN'));?>
</button>
Expand All @@ -109,12 +81,8 @@ class="tablecell"
<div class="tablerow left">
<input type="checkbox" id="ldap_experienced_admin" value="1"
name="ldap_experienced_admin" class="tablecell"
aria-describedby="ldap_experienced_admin_instructions"
title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
/>
<p class="hidden-visually" id="ldap_experienced_admin_instructions">
<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>
</p>
<label for="ldap_experienced_admin" class="tablecell">
<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
</label>
Expand Down
12 changes: 0 additions & 12 deletions apps/user_ldap/templates/part.wizard-userfilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,13 @@
<p class="ldapManyGroupsSupport hidden">
<label></label>
<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
aria-describedby="ldapGroupListAvailable_instructions"
title="<?php p($l->t('Available groups'));?>"></select>
<p class="hidden-visually" id="ldapGroupListAvailable_instructions">
<?php p($l->t('Available groups'));?>
</p>
<span class="buttonSpan">
<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
<button class="ldapGroupListDeselect" type="button">&lt;</button>
</span>
<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
aria-describedby="ldapGroupListSelected_instructions"
title="<?php p($l->t('Selected groups'));?>"></select>
<p class="hidden-visually" id="ldapGroupListSelected_instructions">
<?php p($l->t('Selected groups'));?>
</p>
</p>
<p>
<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
Expand All @@ -57,12 +49,8 @@
<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
class="ldapFilterInputElement"
placeholder="<?php p($l->t('Edit LDAP Query'));?>"
aria-describedby="ldap_userlist_filter_instructions"
title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>">
</textarea>
<p class="hidden-visually" id="ldap_userlist_filter_instructions">
<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>
</p>
</p>
<p>
<div class="ldapWizardInfo invisible">&nbsp;</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/user_ldap/templates/renewpassword.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
placeholder="<?php echo $l->t('New password');?>"
data-typetoggle="#personal-show" autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
</p>

<input type="submit" id="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Renew password')); ?>"/>
<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Renew password')); ?>"/>

<?php if (!empty($_['invalidpassword'])) { ?>
<p class="warning">
Expand Down
Loading