mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates

Browse Source 
PHPBB3-9558
This commit is contained in:
Joas Schilling
2012-06-19 19:08:53 +02:00
parent 7b4f9765f8
commit dcd7d96296
4 changed files with 26 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
phpBB/adm/style/timezone.js
View File

@@ -1,35 +1,11 @@
/**
* Hide the optgroups that are not the selected timezone
*
* @param bool keep_selection Shall we keep the value selected, or shall the user be forced to repick one.
*/
function phpbb_switch_tz_date(keep_selection)
{
$('#timezone > optgroup').css("display", "none");
$("#timezone > optgroup[label='" + $('#tz_date').val() + "']").css("display", "block");
(function($) { // Avoid conflicts with other libraries
if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1)
{
// If there is only one timezone for the selected date, we just select that automatically.
$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr("selected", true);
keep_selection = true;
}
$('#tz_date').change(function() {
phpbb.timezone_switch_date(false);
});
if (typeof keep_selection !== 'undefined')
{
if (!keep_selection)
{
$('#timezone > option:first').attr("selected", true);
}
}
}
$(document).ready(
phpbb.timezone_enable_date_selection
);
/**
* Display the date/time select
*/
function phpbb_enable_tz_dates()
{
$('#tz_select_date').css("display", "block");
}
phpbb_enable_tz_dates();
})(jQuery); // Avoid conflicts with other libraries

2
phpBB/adm/style/timezone_option.html
View File

@@ -2,7 +2,7 @@
<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
<!-- IF S_TZ_DATE_OPTIONS -->
<dd id="tz_select_date" style="display: none;">
<select name="tz_date" id="tz_date" class="autowidth tz_select" onchange="phpbb_switch_tz_date(false);">
<select name="tz_date" id="tz_date" class="autowidth tz_select">
<option value="">{L_SELECT_CURRENT_TIME}</option>
{S_TZ_DATE_OPTIONS}
</select>