Skip to content

Commit fc547de

Browse files
blizzzblizzz
authored
Merge pull request #37285 from nextcloud/revert-37274-backport/37244/stable25
Revert "[stable25] Replace custom tooltips with native ones and add description to all e…"
2 parents 240e659 + 36cd51d commit fc547de

7 files changed

Lines changed: 26 additions & 98 deletions

File tree

‎apps/user_ldap/js/wizard/view.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ OCA = OCA || {};
354354
this.$settings.tabs({});
355355
$('#ldapSettings button:not(.icon-default-style):not(.ui-multiselect)').button();
356356
$('#ldapSettings').tabs({ beforeActivate: this.onTabChange });
357+
$('#ldapSettings :input').tooltip({placement: "right", container: "body", trigger: "hover"});
357358

358359
this.initControls();
359360
this.disableTabs();

‎apps/user_ldap/templates/part.wizard-groupfilter.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,13 @@
2727
<p class="ldapManyGroupsSupport hidden">
2828
<label></label>
2929
<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
30-
aria-describedby="ldapGroupListAvailable_instructions"
3130
title="<?php p($l->t('Available groups'));?>"></select>
32-
<p class="hidden-visually" id="ldapGroupListAvailable_instructions">
33-
<?php p($l->t('Available groups'));?>
34-
</p>
3531
<span class="buttonSpan">
3632
<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
3733
<button class="ldapGroupListDeselect" type="button">&lt;</button>
3834
</span>
3935
<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
40-
aria-describedby="ldapGroupListSelected_instructions"
4136
title="<?php p($l->t('Selected groups'));?>"></select>
42-
<p class="hidden-visually" id="ldapGroupListSelected_instructions">
43-
<?php p($l->t('Selected groups'));?>
44-
</p>
4537
</p>
4638
<p>
4739
<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
@@ -53,13 +45,8 @@
5345
<p id="rawGroupFilterContainer" class="invisible">
5446
<textarea type="text" id="ldap_group_filter" name="ldap_group_filter"
5547
placeholder="<?php p($l->t('Edit LDAP Query'));?>"
56-
aria-describedby="rawGroupFilterContainer_instructions"
5748
title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()]));?>">
5849
</textarea>
59-
<p class="hidden-visually" id="rawGroupFilterContainer_instructions">
60-
<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()]));?>
61-
</p>
62-
6350
</p>
6451
<p>
6552
<div class="ldapWizardInfo invisible">&nbsp;</div>

‎apps/user_ldap/templates/part.wizard-loginfilter.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@
99
</label>
1010

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

2420
<input type="checkbox" id="ldap_loginfilter_email"
2521
title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>"
26-
aria-describedby="ldap_loginfilter_email_instructions"
2722
name="ldap_loginfilter_email" value="1" />
28-
<p class="hidden-visually" id="ldap_loginfilter_email_instructions">
29-
<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>
30-
</p>
3123
</p>
3224
<p>
3325
<label for="ldap_loginfilter_attributes">
@@ -49,12 +41,8 @@
4941
<textarea type="text" id="ldap_login_filter" name="ldap_login_filter"
5042
class="ldapFilterInputElement"
5143
placeholder="<?php p($l->t('Edit LDAP Query'));?>"
52-
aria-describedby="ldap_login_filter_instructions"
5344
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"'));?>">
5445
</textarea>
55-
<p class="hidden-visually" id="ldap_login_filter_instructions">
56-
<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"'));?>
57-
</p>
5846
</p>
5947
<p>
6048
<div class="ldapWizardInfo invisible">&nbsp;</div>
@@ -63,11 +51,7 @@ class="ldapFilterInputElement"
6351
<input type="text" id="ldap_test_loginname" name="ldap_test_loginname"
6452
placeholder="<?php p($l->t('Test Loginname'));?>"
6553
class="ldapVerifyInput"
66-
aria-describedby="ldap_test_loginname_instructions"
67-
title="<?php p($l->t('Attempts to receive a DN for the given loginname and the current login filter'));?>"/>
68-
<p class="hidden-visually" id="ldap_test_loginname_instructions">
69-
<?php p($l->t('Attempts to receive a DN for the given loginname and the current login filter'));?>
70-
</p>
54+
title="Attempts to receive a DN for the given loginname and the current login filter"/>
7155
<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled">
7256
<?php p($l->t('Verify settings'));?>
7357
</button>

‎apps/user_ldap/templates/part.wizard-server.php‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,15 @@
1313
?>
1414
</select>
1515
<button type="button" id="ldap_action_add_configuration"
16-
aria-describedby="ldap_action_add_configuration_instructions"
1716
name="ldap_action_add_configuration" class="icon-add icon-default-style"
1817
title="<?php p($l->t('Add a new configuration'));?>">&nbsp;</button>
19-
<p class="hidden-visually" id="ldap_action_add_configuration_instructions">
20-
<?php p($l->t('Add a new configuration'));?>
21-
</p>
2218
<button type="button" id="ldap_action_copy_configuration"
2319
name="ldap_action_copy_configuration"
24-
aria-describedby="ldap_action_copy_configuration_instructions"
2520
class="ldapIconCopy icon-default-style"
2621
title="<?php p($l->t('Copy current configuration into new directory binding'));?>">&nbsp;</button>
27-
<p class="hidden-visually" id="ldap_action_copy_configuration_instructions">
28-
<?php p($l->t('Copy current configuration into new directory binding'));?>
29-
</p>
3022
<button type="button" id="ldap_action_delete_configuration"
31-
aria-describedby="ldap_action_delete_configuration_instructions"
3223
name="ldap_action_delete_configuration" class="icon-delete icon-default-style"
3324
title="<?php p($l->t('Delete the current configuration'));?>">&nbsp;</button>
34-
<p class="hidden-visually" id="ldap_action_delete_configuration_instructions">
35-
<?php p($l->t('Delete the current configuration'));?>
36-
</p>
3725
</p>
3826

3927
<div class="hostPortCombinator">
@@ -42,13 +30,9 @@ class="ldapIconCopy icon-default-style"
4230
<div class="table">
4331
<input type="text" class="host" id="ldap_host"
4432
name="ldap_host"
45-
aria-describedby="ldap_host_instructions"
4633
placeholder="<?php p($l->t('Host'));?>"
4734
title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
4835
/>
49-
<p class="hidden-visually" id="ldap_host_instructions">
50-
<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>
51-
</p>
5236
<span class="hostPortCombinatorSpan">
5337
<input type="number" id="ldap_port" name="ldap_port"
5438
placeholder="<?php p($l->t('Port'));?>" />
@@ -63,25 +47,17 @@ class="ldapIconCopy icon-default-style"
6347
<div class="tablerow">
6448
<input type="text" id="ldap_dn" name="ldap_dn"
6549
class="tablecell"
66-
aria-describedby="ldap_dn_instructions"
6750
placeholder="<?php p($l->t('User DN'));?>" autocomplete="off"
6851
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.'));?>"
6952
/>
70-
<p class="hidden-visually" id="ldap_dn_instructions">
71-
<?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.'));?>
72-
</p>
7353
</div>
7454

7555
<div class="tablerow">
7656
<input type="password" id="ldap_agent_password"
7757
class="tablecell" name="ldap_agent_password"
78-
aria-describedby="ldap_agent_password_instructions"
7958
placeholder="<?php p($l->t('Password'));?>" autocomplete="off"
8059
title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>"
8160
/>
82-
<p class="hidden-visually" id="ldap_agent_password_instructions">
83-
<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>
84-
</p>
8561
<button class="ldapSaveAgentCredentials" name="ldapSaveAgentCredentials" type="button">
8662
<?php p($l->t('Save Credentials'));?>
8763
</button>
@@ -91,13 +67,9 @@ class="tablecell" name="ldap_agent_password"
9167
<div class="tablerow">
9268
<textarea id="ldap_base" name="ldap_base"
9369
class="tablecell"
94-
aria-describedby="ldap_base_instructions"
9570
placeholder="<?php p($l->t('One Base DN per line'));?>"
9671
title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>">
9772
</textarea>
98-
<p class="hidden-visually" id="ldap_base_instructions">
99-
<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>
100-
</p>
10173
<button class="ldapDetectBase" name="ldapDetectBase" type="button">
10274
<?php p($l->t('Detect Base DN'));?>
10375
</button>
@@ -109,12 +81,8 @@ class="tablecell"
10981
<div class="tablerow left">
11082
<input type="checkbox" id="ldap_experienced_admin" value="1"
11183
name="ldap_experienced_admin" class="tablecell"
112-
aria-describedby="ldap_experienced_admin_instructions"
11384
title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
11485
/>
115-
<p class="hidden-visually" id="ldap_experienced_admin_instructions">
116-
<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>
117-
</p>
11886
<label for="ldap_experienced_admin" class="tablecell">
11987
<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
12088
</label>

‎apps/user_ldap/templates/part.wizard-userfilter.php‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,13 @@
3030
<p class="ldapManyGroupsSupport hidden">
3131
<label></label>
3232
<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
33-
aria-describedby="ldapGroupListAvailable_instructions"
3433
title="<?php p($l->t('Available groups'));?>"></select>
35-
<p class="hidden-visually" id="ldapGroupListAvailable_instructions">
36-
<?php p($l->t('Available groups'));?>
37-
</p>
3834
<span class="buttonSpan">
3935
<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
4036
<button class="ldapGroupListDeselect" type="button">&lt;</button>
4137
</span>
4238
<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
43-
aria-describedby="ldapGroupListSelected_instructions"
4439
title="<?php p($l->t('Selected groups'));?>"></select>
45-
<p class="hidden-visually" id="ldapGroupListSelected_instructions">
46-
<?php p($l->t('Selected groups'));?>
47-
</p>
4840
</p>
4941
<p>
5042
<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
@@ -57,12 +49,8 @@
5749
<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
5850
class="ldapFilterInputElement"
5951
placeholder="<?php p($l->t('Edit LDAP Query'));?>"
60-
aria-describedby="ldap_userlist_filter_instructions"
6152
title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>">
6253
</textarea>
63-
<p class="hidden-visually" id="ldap_userlist_filter_instructions">
64-
<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>
65-
</p>
6654
</p>
6755
<p>
6856
<div class="ldapWizardInfo invisible">&nbsp;</div>

‎apps/user_ldap/templates/renewpassword.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
placeholder="<?php echo $l->t('New password');?>"
4242
data-typetoggle="#personal-show" autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
4343
</p>
44-
45-
<input type="submit" id="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Renew password')); ?>"/>
44+
45+
<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Renew password')); ?>"/>
4646

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

0 commit comments

Comments
 (0)