aboutsummaryrefslogtreecommitdiffstats
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
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
-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
-rw-r--r--phpBB/styles/prosilver/template/avatars.js15
-rw-r--r--phpBB/styles/prosilver/template/ucp_avatar_options.html6
-rw-r--r--phpBB/styles/subsilver2/template/avatars.js15
-rw-r--r--phpBB/styles/subsilver2/template/ucp_profile_avatar.html6
7 files changed, 8 insertions, 61 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
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 -->
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-19 17:31:46 +0000
+0000'>2011-04-1771-9404/+9386 | * - fixed header so msgfmt wont give any errorsOliver Burger2011-04-161-4/+3 | * - any.pm: make it easier for rebranding by using %s magicAhmad Samir2011-04-0771-780/+1142 | | | | | - update po/pot files * - s/Ldap/LDAP/ in the po/pot files manually so as not to fuzzy the strings ↵Ahmad Samir2011-04-0771-174/+174 | | | | unnecessarily * - s/can not/cannot/ manually in the po/pot files so as not the make the stringsAhmad Samir2011-04-0771-923/+923 | | | | | unnecessarily fuzzy (from Thierry Vignaud) * - revert 's,/boot partition,separate /boot partition,', .po/pot files shouldn'tAhmad Samir2011-04-0571-214/+214 | | | | | | be changed this way as this changes the meaning of the string and translators need to adapt the .po files themselves * - 's!Just select your tv card parameters!Just select your TV card parameters!'Ahmad Samir2011-04-0471-72/+72 | * - s/api/API/Ahmad Samir2011-04-0471-171/+171 | * - perl -pi -e 's!trouble shoot!troubleshoot!'Ahmad Samir2011-04-0471-143/+143 | * - perl -pi -e 's!you can pick one in the above list!you can pick one from ↵Ahmad Samir2011-04-0471-71/+71 | | | | the above list!' * - perl -pi -e 's!For this, create a partition!To accomplish this, create a ↵Ahmad Samir2011-04-0471-71/+71 | | | | partition!' * - perl -pi -e 's!"Search new servers"!"Search for new servers"!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!Something bad is happening on your drive!Something bad is ↵Ahmad Samir2011-04-0471-71/+71 | | | | happening on your hard disk drive!' * - perl -pi -e 's!"Activate ethernet cards promiscuity check."!"Activate ↵Ahmad Samir2011-04-0471-71/+71 | | | | Ethernet cards promiscuity check."!' * - perl -pi -e 's!Posix!POSIX!'Ahmad Samir2011-04-0471-87/+87 | * - perl -pi -e 's!Hard drive!Hard disk drive!' (except install/steps_list.pm)Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!need to reboot before the modification can take ↵Ahmad Samir2011-04-0471-142/+142 | | | | | | | place"!"need to reboot before the modification can take effect"!' - perl -pi -e 's!"You need to reboot for the partition table modifications to take place"!"You need to reboot for the partition table modifications to take effect"!' * - perl -pi -e 's!"All data on this partition should be backed-up"!"All data ↵Ahmad Samir2011-04-04