aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-06-08 10:11:43 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-06-08 10:11:43 +0000
commita3c5562a0d8674c0a513d25855b082c726b26f5b (patch)
tree264b22653f3f5474d986c6663cfab9c27756655e
parent0c57363fbc8769ef3e0774a9a03878553540bf9a (diff)
downloadforums-a3c5562a0d8674c0a513d25855b082c726b26f5b.tar
forums-a3c5562a0d8674c0a513d25855b082c726b26f5b.tar.gz
forums-a3c5562a0d8674c0a513d25855b082c726b26f5b.tar.bz2
forums-a3c5562a0d8674c0a513d25855b082c726b26f5b.tar.xz
forums-a3c5562a0d8674c0a513d25855b082c726b26f5b.zip
Fix Bugs #38555, #45505, #45785 and #45865 - Various XHTML mistakes in prosilver and subsilver2.
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9562 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/styles/prosilver/template/memberlist_im.html5
-rw-r--r--phpBB/styles/prosilver/template/posting_preview.html10
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_im.html2
-rw-r--r--phpBB/styles/subsilver2/template/search_results.html2
-rw-r--r--phpBB/styles/subsilver2/template/viewtopic_body.html11
6 files changed, 19 insertions, 12 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 878ae3d23f..6a456b3b94 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -93,6 +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>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Feature] Backported 3.2 captcha plugins.</li>
<li>[Feature] Introduced new ACM plugins:
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 9bb1f90a58..a99d487f4f 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -7,7 +7,7 @@
<div class="panel bg2">
<div class="inner"><span class="corners-top"><span></span></span>
-
+
<p>{L_SEND_IM_EXPLAIN}</p>
<fieldset>
@@ -81,9 +81,10 @@
<span class="corners-bottom"><span></span></span></div>
</div>
-<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
</form>
+<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
+
<script type="text/javascript">
// <![CDATA[
diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html
index 7ea1fb063d..82227c23b0 100644
--- a/phpBB/styles/prosilver/template/posting_preview.html
+++ b/phpBB/styles/prosilver/template/posting_preview.html
@@ -1,4 +1,4 @@
-<div class="post bg2" id="preview">
+<div class="post <!-- IF S_PRIVMSGS -->pm<!-- ELSE -->bg2<!-- ENDIF -->" id="preview">
<div class="inner"><span class="corners-top"><span></span></span>
<!-- IF S_HAS_POLL_OPTIONS -->
@@ -19,16 +19,16 @@
<span class="corners-bottom"><span></span></span></div>
</div>
-<div class="post <!-- IF S_PRIVMSGS --> pm<!-- ELSE --> bg2<!-- ENDIF -->">
+<div class="post bg2">
<div class="inner"><span class="corners-top"><span></span></span>
<!-- ENDIF -->
<div class="postbody">
<h3>{L_PREVIEW}: {PREVIEW_SUBJECT}</h3>
-
+
<div class="content">{PREVIEW_MESSAGE}</div>
-
+
<!-- IF .attachment -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
@@ -37,7 +37,7 @@
<!-- END attachment -->
</dl>
<!-- ENDIF -->
-
+
<!-- IF PREVIEW_SIGNATURE --><div class="signature">{PREVIEW_SIGNATURE}</div><!-- ENDIF -->
</div>
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index acbe1fec2f..1acdaafd4b 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -131,9 +131,9 @@
<!-- ENDIF -->
</table>
- <a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
{S_FORM_TOKEN}
</form>
+<a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
<!-- INCLUDE simple_footer.html --> \ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html
index d277b51db9..a6c30f97b2 100644
--- a/phpBB/styles/subsilver2/template/search_results.html
+++ b/phpBB/styles/subsilver2/template/search_results.html
@@ -8,7 +8,7 @@
</tr>
<tr>
<td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}: <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td>
- <td align="{S_CONTENT_FLOW_END}"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td>
+ <td align="{S_CONTENT_FLOW_END}"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input class="post" type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td>
</tr>
</table>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index b177a15250..f243c37371 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -118,9 +118,9 @@
<!-- ENDIF -->
</table>
{S_HIDDEN_FIELDS}
-
+
</form>
-
+
</td>
</tr>
<!-- ENDIF -->
@@ -155,7 +155,7 @@
</table>
</td>
</tr>
-
+
<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td valign="top" class="profile">
@@ -180,6 +180,11 @@
<td>{postrow.POSTER_AVATAR}</td>
</tr>
<!-- ENDIF -->
+ <!-- IF not (postrow.ONLINE_IMG or postrow.RANK_TITLE or postrow.RANK_IMG or postrow.POSTER_AVATAR) -->
+ <tr>
+ <td></td>
+ </tr>
+ <!-- ENDIF -->
</table>
<span class="postdetails">