diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 12:21:25 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 12:21:25 -0500 |
| commit | b07ae3fe59c336c7880d5af40166a1a2413fede0 (patch) | |
| tree | c2fa37b6bad3d94d5a9f3fe9d8d7be64812bb92e /phpBB/styles | |
| parent | 4f947ebb47e4236c4bc3e2474eb49069d67d91e1 (diff) | |
| parent | 0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549 (diff) | |
| download | forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar.gz forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar.bz2 forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar.xz forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.zip | |
Merge PR #1053 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
Conflicts:
phpBB/includes/ucp/ucp_prefs.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_prefs_personal.html | 12 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 4382e891fd..50ade02acd 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -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> </dd> </dl> - <dl> - <dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt> - <dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd> - </dl> - <!-- IF S_STYLE_OPTIONS --> + <!-- IF S_MORE_LANGUAGES --> + <dl> + <dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt> + <dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd> + </dl> + <!-- ENDIF --> + <!-- IF S_STYLE_OPTIONS and S_MORE_STYLES --> <dl> <dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt> <dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd> diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html index 5a169763fb..9ebc045608 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html @@ -61,11 +61,13 @@ <td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}{L_COLON}</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> <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> +<!-- IF S_MORE_LANGUAGES --> <tr> <td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}{L_COLON}</b></td> <td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td> </tr> -<!-- IF S_STYLE_OPTIONS --> +<!-- ENDIF --> +<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES --> <tr> <td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}{L_COLON}</b></td> <td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td> |