diff options
| author | Cesar G <prototech91@gmail.com> | 2014-05-06 18:19:05 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-05-08 08:35:38 -0700 |
| commit | 1836b0130362dafba294f0fbd87a9c1d2fb181b9 (patch) | |
| tree | a4110c5f5a5888f26a2b740d8b611dcf1b92a5eb /phpBB/styles | |
| parent | e378037516903ed612c88e8ad0138ec956077b58 (diff) | |
| download | forums-1836b0130362dafba294f0fbd87a9c1d2fb181b9.tar forums-1836b0130362dafba294f0fbd87a9c1d2fb181b9.tar.gz forums-1836b0130362dafba294f0fbd87a9c1d2fb181b9.tar.bz2 forums-1836b0130362dafba294f0fbd87a9c1d2fb181b9.tar.xz forums-1836b0130362dafba294f0fbd87a9c1d2fb181b9.zip | |
[ticket/9388] Use the new toggle function for the avatar type <select>.
PHPBB3-9388
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/avatars.js | 15 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_avatar_options.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/avatars.js | 15 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 6 |
4 files changed, 4 insertions, 38 deletions
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js deleted file mode 100644 index 26ea24c0db..0000000000 --- a/phpBB/styles/prosilver/template/avatars.js +++ /dev/null @@ -1,15 +0,0 @@ -(function($) { // Avoid conflicts with other libraries - -"use strict"; - -function avatarHide() { - $('#avatar_options > div').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/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 072f235eb1..63e1fe3336 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -16,10 +16,10 @@ <fieldset> <dl> <dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> - <dd><select name="avatar_driver" id="avatar_driver"> + <dd><select name="avatar_driver" id="avatar_driver" data-toggable-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></dd> </dl> @@ -46,5 +46,3 @@ <!-- ENDIF --> </div> </div> - -<!-- INCLUDEJS avatars.js --> 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..11eb537b5c 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-toggable-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 --> |