makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10841] Modifying style and language selectors in UCP

Browse source 
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
This commit is contained in:
Senky 2012-05-16 23:02:20 +02:00 • committed by Oleg Pudeyev
parent 819206a336
commit af064cdaad
3 changed files with 62 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/includes/ucp/ucp_prefs.php
View file

@ -134,6 +134,33 @@ class ucp_prefs
} }
$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>'; $dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
// check for count of installed languages
$sql = 'SELECT lang_id
FROM ' . LANG_TABLE;
$result = $db->sql_query($sql);
if( $db->sql_affectedrows() > 1 )
{
$s_more_languages = true;
}
else
{
$s_more_languages = false;
}
// check for count of installed and active styles
$sql = 'SELECT style_id
FROM ' . STYLES_TABLE . '
WHERE style_active = 1';
$result = $db->sql_query($sql);
if( $db->sql_affectedrows() > 1 )
{
$s_more_styles = true;
}
else
{
$s_more_styles = false;
}
$template->assign_vars(array( $template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
@ -155,6 +182,9 @@ class ucp_prefs
'DEFAULT_DATEFORMAT' => $config['default_dateformat'], 'DEFAULT_DATEFORMAT' => $config['default_dateformat'],
'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']), 'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']),
'S_MORE_LANGUAGES' => $s_more_languages,
'S_MORE_STYLES' => $s_more_styles,
'S_LANG_OPTIONS' => language_select($data['lang']), 'S_LANG_OPTIONS' => language_select($data['lang']),
'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']),
'S_TZ_OPTIONS' => tz_select($data['tz'], true), 'S_TZ_OPTIONS' => tz_select($data['tz'], true),

12
phpBB/styles/prosilver/template/ucp_prefs_personal.html
View file

@ -63,11 +63,13 @@
<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> <label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
</dd> </dd>
</dl> </dl>
<dl> <!-- IF S_MORE_LANGUAGES -->
<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt> <dl>
<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd> <dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
</dl> <dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
<!-- IF S_STYLE_OPTIONS --> </dl>
<!-- ENDIF -->
<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
<dl> <dl>
<dt><label for="style">{L_BOARD_STYLE}:</label></dt> <dt><label for="style">{L_BOARD_STYLE}:</label></dt>
<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd> <dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>

4
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
View file

@ -61,11 +61,13 @@
<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td> <td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td>
<td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td> <td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
</tr> </tr>
<!-- IF S_MORE_LANGUAGES -->
<tr> <tr>
<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td> <td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td>
<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td> <td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
</tr> </tr>
<!-- IF S_STYLE_OPTIONS --> <!-- ENDIF -->
<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
<tr> <tr>
<td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}:</b></td> <td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}:</b></td>
<td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td> <td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td>