aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-06 18:19:05 -0700
committerCesar G <prototech91@gmail.com>2014-05-08 08:35:38 -0700
commit1836b0130362dafba294f0fbd87a9c1d2fb181b9 (patch)
treea4110c5f5a5888f26a2b740d8b611dcf1b92a5eb /phpBB/adm
parente378037516903ed612c88e8ad0138ec956077b58 (diff)
downloadforums-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/adm')
-rw-r--r--phpBB/adm/style/acp_groups.html6
-rw-r--r--phpBB/adm/style/acp_users_avatar.html6
-rw-r--r--phpBB/adm/style/avatars.js15
3 files changed, 4 insertions, 23 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 72f4f2b239..0641398185 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -114,10 +114,10 @@
</dl>
<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>
@@ -139,8 +139,6 @@
</fieldset>
</form>
- <!-- INCLUDEJS avatars.js -->
-
<!-- ELSEIF S_LIST -->
<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 0a72bb0b62..ba0b896e6c 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -13,10 +13,10 @@
<legend>{L_AVATAR_SELECT}</legend>
<dl>
<dt><label>{L_AVATAR_TYPE}</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>
@@ -35,5 +35,3 @@
{S_FORM_TOKEN}
</fieldset>
</form>
-
- <!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
deleted file mode 100644
index 26ea24c0db..0000000000
--- a/phpBB/adm/style/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