diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-06-12 12:29:08 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-06-12 12:29:08 +0000 |
| commit | 8f46e94294ace956d9b120791b37c1eaf2eec626 (patch) | |
| tree | 8371034502688294321d5f35dd468205ff8eda6e | |
| parent | 8959911992ccbadce7a67fe21ec411768e118191 (diff) | |
| download | forums-8f46e94294ace956d9b120791b37c1eaf2eec626.tar forums-8f46e94294ace956d9b120791b37c1eaf2eec626.tar.gz forums-8f46e94294ace956d9b120791b37c1eaf2eec626.tar.bz2 forums-8f46e94294ace956d9b120791b37c1eaf2eec626.tar.xz forums-8f46e94294ace956d9b120791b37c1eaf2eec626.zip | |
Fix bugs #25545, #26315 and #31325 - Mostly XHTML mistakes in prosilver and the ACP.
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9573 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 6 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_view.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index ccf38e49b8..a376884507 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -194,21 +194,27 @@ function switch_menu() <div id="menu"> <p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ][ <a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a> ] </p> <ul> + <!-- DEFINE $LI_USED = 0 --> <!-- BEGIN l_block1 --> <!-- IF l_block1.S_SELECTED --> <!-- BEGIN l_block2 --> <!-- IF .l_block1.l_block2.l_block3 --> <li class="header">{l_block1.l_block2.L_TITLE}</li> + <!-- DEFINE $LI_USED = 1 --> <!-- ENDIF --> <!-- BEGIN l_block3 --> <li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li> + <!-- DEFINE $LI_USED = 1 --> <!-- END l_block3 --> <!-- END l_block2 --> <!-- ENDIF --> <!-- END l_block1 --> + <!-- IF not $LI_USED --> + <li></li> + <!-- ENDIF --> </ul> </div> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c8bff5a177..fd2d1496dc 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -93,7 +93,7 @@ <li>[Fix] Correctly determine writable status of files on Windows operating system. (Bug #39035)</li> <li>[Fix] Show report button in prosilver for guests who are allowed to report posts. (Bug #45695 - Patch by bantu)</li> <li>[Fix] Correctly show private message history (Bug #46065 - Patch by bantu) - <li>[Fix] Various XHTML mistakes in prosilver and subsilver2. (Bugs #38555, #45505 - Patch by Raimon, #45785, #45865)</li> + <li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #25545 - Patch by bantu, #26315, #38555, #45505 - Patch by Raimon, #45785, #45865)</li> <li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li> <li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li> <li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215 - Patch by bantu)</li> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 23f87d6bbe..8f2e1734a4 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -66,7 +66,7 @@ <!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF --> <!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF --> <!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF --> - <!-- IF S_PROFILE_FIELD_1 --> + <!-- IF S_PROFILE_FIELD1 --> <!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> <dt>{postrow.PROFILE_FIELD1_NAME}:</dt> <dd>{postrow.PROFILE_FIELD1_VALUE}</dd> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index c0f553dfee..d1bf5fb20a 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -164,9 +164,8 @@ <a name="start_here"></a> <div id="page-body"> - <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> - <div id="message" class="rules"> + <div id="information" class="rules"> <div class="inner"><span class="corners-top"><span></span></span> <strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED} <span class="corners-bottom"><span></span></span></div> |