diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-09 19:08:51 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-09 19:08:51 -0600 |
| commit | d6930df7a22f47619cc4f5e705b64447060b6c32 (patch) | |
| tree | 3f051f4407522223d3430844f8d54cf4196d2c53 /phpBB/styles/prosilver | |
| parent | 3f5d938a95669e9985de5593af836b35bb25e872 (diff) | |
| parent | f60540d31f89bfd1ee8aabb2ce85fe3cd7dfe829 (diff) | |
| download | forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar.gz forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar.bz2 forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar.xz forums-d6930df7a22f47619cc4f5e705b64447060b6c32.zip | |
Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
[ticket/11303] rename attribute to timezone-preselect
[ticket/11303] remove additional brackets
[ticket/11303] use S_TZ_PRESELECT in subsilver
[ticket/11303] add S_TZ_PRESELECT template var
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/timezone.js | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/timezone_option.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/timezone.js b/phpBB/styles/prosilver/template/timezone.js index af8206d12d..5e81a0bfdf 100644 --- a/phpBB/styles/prosilver/template/timezone.js +++ b/phpBB/styles/prosilver/template/timezone.js @@ -13,7 +13,7 @@ $(document).ready( ); $(document).ready( - phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true') + phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') == 'true') ); })(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 320b9b7121..a77e82f9a1 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -6,7 +6,7 @@ <option value="">{L_SELECT_CURRENT_TIME}</option> {S_TZ_DATE_OPTIONS} </select> - <input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" /> + <input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" /> </dd> <!-- ENDIF --> <dd> |