diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:48:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:48:10 +0200 |
| commit | 6cd7abe2557336a88db0220603c83743f1291642 (patch) | |
| tree | 7c9e18e9ab43653e166739b9392c2f8234ade889 /phpBB/styles/subsilver2 | |
| parent | 9aee2ed03995aca1d0348681bcb68d0042801d3a (diff) | |
| parent | e233f0af3615070a003a49bf055ae9fa582cc899 (diff) | |
| download | forums-6cd7abe2557336a88db0220603c83743f1291642.tar forums-6cd7abe2557336a88db0220603c83743f1291642.tar.gz forums-6cd7abe2557336a88db0220603c83743f1291642.tar.bz2 forums-6cd7abe2557336a88db0220603c83743f1291642.tar.xz forums-6cd7abe2557336a88db0220603c83743f1291642.zip | |
Merge pull request #2420 from prototech/ticket/9388
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.
* prototech/ticket/9388:
[ticket/9388] Use "togglable" instead of "toggable"
[ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
[ticket/9388] Reopen <fieldset> after auth templates.
[ticket/9388] Fix unit tests.
[ticket/9388] Use the new toggle function for the avatar type <select>.
[ticket/9388] Display only the settings for the selected search backend.
[ticket/9388] Display only the settings for the auth method that's selected.
[ticket/9388] Add support for making <select> options able to toggle settings.
Diffstat (limited to 'phpBB/styles/subsilver2')
| -rw-r--r-- | phpBB/styles/subsilver2/template/avatars.js | 15 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 6 |
2 files changed, 2 insertions, 19 deletions
diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js deleted file mode 100644 index 146aca94d3..0000000000 --- a/phpBB/styles/subsilver2/template/avatars.js +++ /dev/null @@ -1,15 +0,0 @@ -(function($) { // Avoid conflicts with other libraries - -"use strict"; - -function avatarHide() { - $('.[class^="avatar_option_"]').hide(); - - var selected = $('#avatar_driver').val(); - $('.avatar_option_' + selected).show(); -} - -avatarHide(); -$('#avatar_driver').bind('change', avatarHide); - -})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 60a816d00a..07b3edb498 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -27,10 +27,10 @@ <tr> <td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td> <td class="row2"> - <select name="avatar_driver" id="avatar_driver"> + <select name="avatar_driver" id="avatar_driver" data-togglable-settings="true"> <option value="">{L_NO_AVATAR_CATEGORY}</option> <!-- BEGIN avatar_drivers --> - <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option> + <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting=".avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option> <!-- END avatar_drivers --> </select></td> </tr> @@ -48,6 +48,4 @@ </tr> </table> -<!-- INCLUDEJS avatars.js --> - <!-- INCLUDE ucp_footer.html --> |