diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-12 19:50:55 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 15:09:12 +0200 |
| commit | 4fbee37752f8b854a98f60f4f7befc09f33e604c (patch) | |
| tree | da1091768f3857b0ab30626be6757509cf6f7128 /phpBB | |
| parent | 66f7d45603417df7619323977de62aebce0bf676 (diff) | |
| download | forums-4fbee37752f8b854a98f60f4f7befc09f33e604c.tar forums-4fbee37752f8b854a98f60f4f7befc09f33e604c.tar.gz forums-4fbee37752f8b854a98f60f4f7befc09f33e604c.tar.bz2 forums-4fbee37752f8b854a98f60f4f7befc09f33e604c.tar.xz forums-4fbee37752f8b854a98f60f4f7befc09f33e604c.zip | |
[feature/new-tz-handling] Move timezone option into its own template file
This should make it much easier for extensions to change the handling of the timezone selection
PHPBB3-9558
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/timezone_option.html | 22 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_prefs_personal.html | 21 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_register.html | 11 |
3 files changed, 25 insertions, 29 deletions
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html new file mode 100644 index 0000000000..6a6a937977 --- /dev/null +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -0,0 +1,22 @@ +<dl> + <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);"> + <option value="">{L_SELECT_CURRENT_TIME}</option> + {S_TZ_DATE_OPTIONS} + </select> + <a id="tz_select_date_suggest" style="display: none;" href="javascript: phpbb_preselect_tz_select(true, '');">{L_TIMEZONE_DATE_SUGGESTION}</a> + </dd> + <!-- ENDIF --> + <dd> + <select name="tz" id="timezone" class="autowidth tz_select"> + <option value="">{L_SELECT_TIMEZONE}</option> + {S_TZ_OPTIONS} + </select> + + <script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script> + <script type="text/javascript">phpbb_enable_tz_dates();</script> + <script type="text/javascript">phpbb_preselect_tz_select(<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->, '{L_TIMEZONE_DATE_SUGGESTION}');</script> + </dd> +</dl> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index c798b1a1f2..29c01e03b9 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -73,22 +73,7 @@ <dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd> </dl> <!-- ENDIF --> - <dl> - <dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt> - <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);"> - <option value="">{L_SELECT_CURRENT_TIME}</option> - {S_TZ_DATE_OPTIONS} - </select> - <a id="tz_select_date_suggest" style="display: none;" href="javascript: phpbb_preselect_tz_select(true, '');">{L_TIMEZONE_DATE_SUGGESTION}</a> - </dd> - <dd> - <select name="tz" id="timezone" class="autowidth tz_select"> - <option value="">{L_SELECT_TIMEZONE}</option> - {S_TZ_OPTIONS} - </select> - </dd> - </dl> + <!-- INCLUDE timezone_option.html --> <dl> <dt><label for="dateformat">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> <dd> @@ -146,8 +131,4 @@ // ]]> </script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script> -<script type="text/javascript">phpbb_enable_tz_dates();</script> -<script type="text/javascript">phpbb_preselect_tz_select(false, '{L_TIMEZONE_DATE_SUGGESTION}');</script> - <!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 95e125fdea..994356efe6 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -53,15 +53,8 @@ <dt><label for="lang">{L_LANGUAGE}:</label></dt> <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd> </dl> - <dl> - <dt><label for="tz">{L_TIMEZONE}:</label></dt> - <dd> - <select name="tz" id="tz" tabindex="7" class="autowidth tz_select"> - <option value="">{L_SELECT_TIMEZONE}</option> - {S_TZ_OPTIONS} - </select> - </dd> - </dl> + + <!-- INCLUDE timezone_option.html --> <!-- IF .profile_fields --> <dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl> |