aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/template/bbcode.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_forum.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_post.html12
-rw-r--r--phpBB/styles/prosilver/template/mcp_topic.html12
-rw-r--r--phpBB/styles/prosilver/template/posting_review.html14
-rw-r--r--phpBB/styles/prosilver/template/posting_topic_review.html22
-rw-r--r--phpBB/styles/prosilver/theme/buttons.css4
-rw-r--r--phpBB/styles/prosilver/theme/common.css4
-rw-r--r--phpBB/styles/prosilver/theme/content.css6
-rw-r--r--phpBB/styles/prosilver/theme/cp.css4
-rw-r--r--phpBB/styles/prosilver/theme/forms.css10
-rw-r--r--phpBB/styles/prosilver/theme/links.css2
-rw-r--r--phpBB/styles/subsilver2/template/bbcode.html4
-rw-r--r--phpBB/styles/subsilver2/template/mcp_ban.html6
-rw-r--r--phpBB/styles/subsilver2/template/mcp_header.html2
-rw-r--r--phpBB/styles/subsilver2/template/mcp_post.html30
-rw-r--r--phpBB/styles/subsilver2/template/mcp_topic.html19
-rw-r--r--phpBB/styles/subsilver2/template/posting_review.html21
-rw-r--r--phpBB/styles/subsilver2/template/posting_topic_review.html22
-rw-r--r--phpBB/styles/subsilver2/template/ucp_header.html8
-rw-r--r--phpBB/styles/subsilver2/template/ucp_pm_history.html4
-rw-r--r--phpBB/styles/subsilver2/theme/stylesheet.css64
22 files changed, 194 insertions, 84 deletions
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
index 8a46fbdbb3..36c314e0c0 100644
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ b/phpBB/styles/prosilver/template/bbcode.html
@@ -21,8 +21,8 @@
<!-- BEGIN b_open --><strong><!-- END b_open -->
<!-- BEGIN b_close --></strong><!-- END b_close -->
-<!-- BEGIN u_open --><u><!-- END u_open -->
-<!-- BEGIN u_close --></u><!-- END u_close -->
+<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
+<!-- BEGIN u_close --></span><!-- END u_close -->
<!-- BEGIN i_open --><em><!-- END i_open -->
<!-- BEGIN i_close --></em><!-- END i_close -->
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index d05f9401ff..17e57578ba 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -37,13 +37,13 @@
<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC});">
<dt <!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG});"<!-- ENDIF -->>
<!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a>&nbsp;&nbsp; <!-- ENDIF -->
- <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> {topicrow.ATTACH_ICON_IMG}
+ <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
<br />
<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
- {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} </dt>
+ <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} </dt>
<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {L_POSTED_ON_DATE}<br />{topicrow.LAST_POST_TIME}</span>
</dd>
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index a16396f094..dc0ea9f800 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -90,7 +90,11 @@
<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->
<hr />
- <div>{L_THIS_POST_IP}: {POST_IP} [ {POST_IPADDR} ]</div>
+ <div>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
+ <a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
+ <!-- ELSE -->
+ <!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
+ <!-- ENDIF --></div>
<!-- ENDIF -->
</div>
@@ -219,7 +223,11 @@
<div class="panel" id="ip">
<div class="inner"><span class="corners-top"><span></span></span>
- <p>{L_THIS_POST_IP}: <!-- IF U_WHOIS --><a href="{U_WHOIS}"><!-- ENDIF -->{POST_IP} [ {POST_IPADDR} ]<!-- IF U_WHOIS --></a><!-- ENDIF --></p>
+ <p>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
+ <a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
+ <!-- ELSE -->
+ <!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
+ <!-- ENDIF --></p>
<table class="table1" cellspacing="1">
<thead>
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index f27ab7f5d0..704624b993 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -110,7 +110,7 @@ onload_functions.push('subPanels()');
<div class="right-box"><a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> | {L_SELECT}: <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></div>
<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
- <p class="author"><a href="#pr{postrow.U_POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
+ <p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
<p class="rules">
@@ -120,6 +120,16 @@ onload_functions.push('subPanels()');
<!-- ENDIF -->
<div class="content" id="message_{postrow.POST_ID}">{postrow.MESSAGE}</div>
+
+ <!-- IF postrow.S_HAS_ATTACHMENTS -->
+ <dl class="attachbox">
+ <dt>{L_ATTACHMENTS}</dt>
+ <!-- BEGIN attachment -->
+ <dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>
+ <!-- END attachment -->
+ </dl>
+ <!-- ENDIF -->
+
</div>
<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html
index 6f86e83a8f..5953ea11f9 100644
--- a/phpBB/styles/prosilver/template/posting_review.html
+++ b/phpBB/styles/prosilver/template/posting_review.html
@@ -9,9 +9,17 @@
<div class="postbody">
<h3><a href="#ppr{post_review_row.POST_ID}">{post_review_row.POST_SUBJECT}</a></h3>
<p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong> {post_review_row.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {post_review_row.POST_DATE}</p>
- <div class="content">
- {post_review_row.MESSAGE}
- </div>
+ <div class="content">{post_review_row.MESSAGE}</div>
+
+ <!-- IF post_review_row.S_HAS_ATTACHMENTS -->
+ <dl class="attachbox">
+ <dt>{L_ATTACHMENTS}</dt>
+ <!-- BEGIN attachment -->
+ <dd>{post_review_row.attachment.DISPLAY_ATTACHMENT}</dd>
+ <!-- END attachment -->
+ </dl>
+ <!-- ENDIF -->
+
</div>
<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index 929ebd1c45..f3aa5d94d0 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -9,20 +9,28 @@
<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>
- <div class="postbody" id="pr{topic_review_row.U_POST_ID}">
+ <div class="postbody" id="pr{topic_review_row.POST_ID}">
<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
<ul class="profile-icons">
- <li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.U_POST_ID}, '{topic_review_row.POSTER_QUOTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
+ <li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
</ul>
<!-- ENDIF -->
<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF -->
- <h3><a href="#pr{topic_review_row.U_POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
+ <h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {topic_review_row.POST_DATE} </p>
- <div class="content">
- {topic_review_row.MESSAGE}
- </div>
+ <div class="content">{topic_review_row.MESSAGE}</div>
+
+ <!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
+ <dl class="attachbox">
+ <dt>{L_ATTACHMENTS}</dt>
+ <!-- BEGIN attachment -->
+ <dd>{topic_review_row.attachment.DISPLAY_ATTACHMENT}</dd>
+ <!-- END attachment -->
+ </dl>
+ <!-- ENDIF -->
+
<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
- <div id="message_{topic_review_row.U_POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
+ <div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
<!-- ENDIF -->
</div>
<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index cd4efc6ccc..7e402f4b16 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -76,7 +76,7 @@ a.sendemail {
}
a.sendemail:hover {
- background-position: 0px -18px;
+ background-position: 0 -18px;
}
a.fontsize {
@@ -86,7 +86,7 @@ a.fontsize {
}
a.fontsize:hover {
- background-position: 0px -20px;
+ background-position: 0 -20px;
text-decoration: none;
}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 4bbad79d84..f870a87d3c 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -74,12 +74,12 @@ p {
}
img {
- border-width: 0px;
+ border-width: 0;
}
hr {
/* Also see tweaks.css */
- border: 0px none #FFFFFF;
+ border: 0 none #FFFFFF;
border-top: 1px solid #CCCCCC;
height: 1px;
margin: 5px 0;
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 60bc15d76d..c98a874254 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -74,7 +74,7 @@ li.row:hover dd {
li.header dt, li.header dd {
line-height: 1em;
- border-left-width: 0px;
+ border-left-width: 0;
margin: 2px 0 4px 0;
color: #FFFFFF;
padding-top: 2px;
@@ -269,7 +269,7 @@ div[class].topic-actions {
}
#topicreview h2 {
- border-bottom-width: 0px;
+ border-bottom-width: 0;
}
/* Content container styles
@@ -648,7 +648,7 @@ fieldset.polls dd div {
font-family: Arial, Helvetica, sans-serif;
color: #FFFFFF;
font-weight: bold;
- padding: 0px 2px;
+ padding: 0 2px;
overflow: visible;
min-width: 2%;
}
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index ebc75c5022..fa8899bae8 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -92,7 +92,7 @@ ul.cplist {
}
#cp-main .buttons {
- margin-left: 0px;
+ margin-left: 0;
}
#cp-main ul.linklist {
@@ -402,7 +402,7 @@ ol.def-rules li {
.pm-legend {
border-left-width: 10px;
border-left-style: solid;
- border-right-width: 0px;
+ border-right-width: 0;
margin-bottom: 3px;
padding-left: 3px;
}
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 2b517cdceb..0ef5743698 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -4,7 +4,7 @@
/* General form styles
----------------------------------------*/
fieldset {
- border-width: 0px;
+ border-width: 0;
font-family: Verdana, Helvetica, Arial, sans-serif;
font-size: 1.1em;
}
@@ -76,12 +76,12 @@ fieldset dd {
/* Specific layout 1 */
fieldset.fields1 dt {
width: 10em;
- border-right-width: 0px;
+ border-right-width: 0;
}
fieldset.fields1 dd {
margin-left: 10em;
- border-left-width: 0px;
+ border-left-width: 0;
}
fieldset.fields1 {
@@ -95,12 +95,12 @@ fieldset.fields1 div {
/* Specific layout 2 */
fieldset.fields2 dt {
width: 15em;
- border-right-width: 0px;
+ border-right-width: 0;
}
fieldset.fields2 dd {
margin-left: 16em;
- border-left-width: 0px;
+ border-left-width: 0;
}
/* Form elements */
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 736e7aaeef..4c4ccd31a9 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -161,7 +161,7 @@ a.right { background: none no-repeat 95% 60%; }
a.up, a.up:link, a.up:active, a.up:visited {
padding-left: 10px;
text-decoration: none;
- border-bottom-width: 0px;
+ border-bottom-width: 0;
}
a.up:hover {
diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html
index 908dce6a38..036e7b2fd2 100644
--- a/phpBB/styles/subsilver2/template/bbcode.html
+++ b/phpBB/styles/subsilver2/template/bbcode.html
@@ -40,8 +40,8 @@
<!-- BEGIN b_open --><strong><!-- END b_open -->
<!-- BEGIN b_close --></strong><!-- END b_close -->
-<!-- BEGIN u_open --><u><!-- END u_open -->
-<!-- BEGIN u_close --></u><!-- END u_close -->
+<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
+<!-- BEGIN u_close --></span><!-- END u_close -->
<!-- BEGIN i_open --><em><!-- END i_open -->
<!-- BEGIN i_close --></em><!-- END i_close -->
diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html
index a995163f39..7441e4e71c 100644
--- a/phpBB/styles/subsilver2/template/mcp_ban.html
+++ b/phpBB/styles/subsilver2/template/mcp_ban.html
@@ -84,15 +84,15 @@
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td>
- <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td>
+ <td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td>
- <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanreason" disabled="disabled" /></td>
+ <td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanreason" disabled="disabled" /></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td>
- <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td>
+ <td class="row2"><input style="border: 0; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" />&nbsp; <input type="reset" value="{L_RESET}" class="btnlite" />&nbsp;</td>
diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html
index 043be1d089..eea9dffe58 100644
--- a/phpBB/styles/subsilver2/template/mcp_header.html
+++ b/phpBB/styles/subsilver2/template/mcp_header.html
@@ -31,7 +31,7 @@
<!-- IF l_block1.S_SELECTED -->
<td class="row1"><b class="nav">{l_block1.L_TITLE}</b>
- <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+ <ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN l_block2 -->
<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
<!-- END l_block2 -->
diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html
index c9e3a9d4e7..bd5a02fed0 100644
--- a/phpBB/styles/subsilver2/template/mcp_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_post.html
@@ -58,7 +58,13 @@
<!-- IF S_CAN_VIEWIP -->
<tr>
<td class="row1"><b class="gen">{L_THIS_POST_IP}: </b></td>
- <td class="row2"><span class="gen"><!-- IF U_WHOIS --><a href="{U_WHOIS}">{POST_IP}</a><!-- ELSE -->{POST_IP}<!-- ENDIF --> [ {POST_IPADDR} ]</span></td>
+ <td class="row2"><span class="gen">
+ <!-- IF U_WHOIS -->
+ <a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
+ <!-- ELSE -->
+ <!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
+ <!-- ENDIF -->
+ </span></td>
</tr>
<!-- ENDIF -->
<tr>
@@ -69,7 +75,27 @@
<th colspan="2" align="center">{L_PREVIEW}</th>
</tr>
<tr>
- <td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{POST_PREVIEW}</div><!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}">{EDIT_IMG}</a></div><!-- ENDIF --></td>
+ <td class="row1" colspan="2">
+ <!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}">{EDIT_IMG}</a></div><!-- ENDIF -->
+
+ <div class="postbody">{POST_PREVIEW}</div>
+
+ <!-- IF S_HAS_ATTACHMENTS -->
+ <br clear="all" /><br />
+
+ <table class="tablebg" width="100%" cellspacing="1">
+ <tr>
+ <td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
+ </tr>
+ <!-- BEGIN attachment -->
+ <tr>
+ <!-- IF attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{attachment.DISPLAY_ATTACHMENT}</td>
+ </tr>
+ <!-- END attachment -->
+ </table>
+ <!-- ENDIF -->
+
+ </td>
</tr>
<!-- IF S_POST_UNAPPROVED and S_MCP_QUEUE -->
<tr>
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 714cb75884..b73190cffa 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -96,7 +96,24 @@
<td width="100%" valign="top">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr>
- <td class="postbody" valign="top">{postrow.MESSAGE}<br /><br /></td>
+ <td valign="top">
+ <div class="postbody">{postrow.MESSAGE}</div>
+ <!-- IF postrow.S_HAS_ATTACHMENTS -->
+ <br clear="all" /><br />
+
+ <table class="tablebg" width="100%" cellspacing="1">
+ <tr>
+ <td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
+ </tr>
+ <!-- BEGIN attachment -->
+ <tr>
+ <!-- IF postrow.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{postrow.attachment.DISPLAY_ATTACHMENT}</td>
+ </tr>
+ <!-- END attachment -->
+ </table>
+ <!-- ENDIF -->
+
+ </td>
</tr>
<tr>
<td valign="bottom">
diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html
index edabe3e12c..c3a7f7aead 100644
--- a/phpBB/styles/subsilver2/template/posting_review.html
+++ b/phpBB/styles/subsilver2/template/posting_review.html
@@ -20,7 +20,7 @@
<!-- IF post_review_row.S_ROW_COUNT is even --> <tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
- <td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.U_POST_ID}"></a>
+ <td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.POST_ID}"></a>
<table width="150" cellspacing="0" cellpadding="4" border="0">
<tr>
<td align="center"><b class="postauthor">{post_review_row.POST_AUTHOR_FULL}</b></td>
@@ -47,7 +47,24 @@
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td class="postbody">{post_review_row.MESSAGE}</td>
+ <td><div class="postbody">{post_review_row.MESSAGE}</div>
+
+ <!-- IF post_review_row.S_HAS_ATTACHMENTS -->
+ <br clear="all" /><br />
+
+ <table class="tablebg" width="100%" cellspacing="1">
+ <tr>
+ <td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
+ </tr>
+ <!-- BEGIN attachment -->
+ <tr>
+ <!-- IF post_review_row.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{post_review_row.attachment.DISPLAY_ATTACHMENT}</td>
+ </tr>
+ <!-- END attachment -->
+ </table>
+ <!-- ENDIF -->
+
+ </td>
</tr>
</table>
</td>
diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html
index 63aa8a12f0..9ac6f90d9e 100644
--- a/phpBB/styles/subsilver2/template/posting_topic_review.html
+++ b/phpBB/styles/subsilver2/template/posting_topic_review.html
@@ -15,7 +15,7 @@
<!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
- <td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.U_POST_ID}"></a>
+ <td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.POST_ID}"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center"><b class="postauthor"<!-- IF topic_review_row.POST_AUTHOR_COLOUR --> style="color: {topic_review_row.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{topic_review_row.POST_AUTHOR}</b></td>
@@ -28,7 +28,7 @@
<td>&nbsp;</td>
<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
- <td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.U_POST_ID},'{topic_review_row.POSTER_QUOTE}'); return false;">{QUOTE_IMG}</a><!-- ENDIF --></td>
+ <td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.POST_ID},'{topic_review_row.POSTER_QUOTE}'); return false;">{QUOTE_IMG}</a><!-- ENDIF --></td>
</tr>
</table>
</td>
@@ -44,8 +44,24 @@
<tr>
<td>
<div class="postbody">{topic_review_row.MESSAGE}</div>
+
+ <!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
+ <br clear="all" /><br />
+
+ <table class="tablebg" width="100%" cellspacing="1">
+ <tr>
+ <td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
+ </tr>
+ <!-- BEGIN attachment -->
+ <tr>
+ <!-- IF topic_review_row.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{topic_review_row.attachment.DISPLAY_ATTACHMENT}</td>
+ </tr>
+ <!-- END attachment -->
+ </table>
+ <!-- ENDIF -->
+
<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
- <div id="message_{topic_review_row.U_POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
+ <div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
<!-- ENDIF -->
</td>
</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html
index ffbf1199e0..6ade3a5745 100644
--- a/phpBB/styles/subsilver2/template/ucp_header.html
+++ b/phpBB/styles/subsilver2/template/ucp_header.html
@@ -63,7 +63,7 @@
<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed separately) -->
<!-- BEGIN !folder -->
<!-- IF folder.S_FIRST_ROW -->
- <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+ <ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- ENDIF -->
<!-- IF folder.S_CUR_FOLDER -->
@@ -80,7 +80,7 @@
<!-- ENDIF -->
- <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+ <ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN l_block2 -->
<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
<!-- END l_block2 -->
@@ -125,7 +125,7 @@
<b class="genmed" style="color:green">{L_FRIENDS_ONLINE}</b>
- <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+ <ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN friends_online -->
<li>{friends_online.USERNAME_FULL}
<!-- IF S_SHOW_PM_BOX -->
@@ -141,7 +141,7 @@
<b class="genmed" style="color:red">{L_FRIENDS_OFFLINE}</b>
- <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+ <ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN friends_offline -->
<li>{friends_offline.USERNAME_FULL}
<!-- IF S_SHOW_PM_BOX -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html
index e9e77863a0..1bcd042d03 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_history.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html
@@ -13,7 +13,7 @@
</tr>
<!-- BEGIN history_row -->
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
- <td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.U_POST_ID}"></a>
+ <td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.MSG_ID}"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center" colspan="2"><span class="postauthor">{history_row.MESSAGE_AUTHOR_FULL}</span></td>
@@ -32,7 +32,7 @@
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td><div id="message_{history_row.U_POST_ID}"><div class="postbody">{history_row.MESSAGE}</div></div></td>
+ <td><div id="message_{history_row.MSG_ID}"><div class="postbody">{history_row.MESSAGE}</div></div></td>
</tr>
</table>
</td>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 43a7b227c8..a2d8829f9a 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -78,9 +78,9 @@ body {
#findbar {
width: 100%;
- margin: 0px;
- padding: 0px;
- border: 0px;
+ margin: 0;
+ padding: 0;
+ border: 0;
}
.forumrules {
@@ -129,7 +129,7 @@ h3 {
}
h4 {
- margin: 0px;
+ margin: 0;
font-size: 1.1em;
font-weight: bold;
}
@@ -139,7 +139,7 @@ p {
}
p.moderators {
- margin: 0px;
+ margin: 0;
float: left;
color: black;
font-weight: bold;
@@ -150,7 +150,7 @@ p.moderators {
}
p.linkmcp {
- margin: 0px;
+ margin: 0;
float: right;
white-space: nowrap;
}
@@ -160,7 +160,7 @@ p.linkmcp {
}
p.breadcrumbs {
- margin: 0px;
+ margin: 0;
float: left;
color: black;
font-weight: bold;
@@ -173,7 +173,7 @@ p.breadcrumbs {
}
p.datetime {
- margin: 0px;
+ margin: 0;
float: right;
white-space: nowrap;
font-size: 1em;
@@ -189,7 +189,7 @@ p.searchbar {
}
p.searchbarreg {
- margin: 0px;
+ margin: 0;
float: right;
white-space: nowrap;
}
@@ -203,15 +203,15 @@ p.forumdesc {
}
p.topicauthor {
- margin: 1px 0px;
+ margin: 1px 0;
}
p.topicdetails {
- margin: 1px 0px;
+ margin: 1px 0;
}
.postreported, .postreported a:visited, .postreported a:hover, .postreported a:link, .postreported a:active {
- margin: 1px 0px;
+ margin: 1px 0;
color: red;
font-weight:bold;
}
@@ -252,7 +252,7 @@ p.topicdetails {
}
.nav {
- margin: 0px;
+ margin: 0;
color: black;
font-weight: bold;
}
@@ -326,9 +326,9 @@ td.profile {
.catdiv {
height: 28px;
- margin: 0px;
- padding: 0px;
- border: 0px;
+ margin: 0;
+ padding: 0;
+ border: 0;
background: white url('./images/cellpic2.jpg') repeat-y scroll top left;
}
.rtl .catdiv {
@@ -337,9 +337,9 @@ td.profile {
.cat {
height: 28px;
- margin: 0px;
- padding: 0px;
- border: 0px;
+ margin: 0;
+ padding: 0;
+ border: 0;
background-color: #C7D0D7;
background-image: url('./images/cellpic1.gif');
text-indent: 4px;
@@ -381,7 +381,7 @@ td.profile {
hr {
height: 1px;
- border-width: 0px;
+ border-width: 0;
background-color: #D1D7DC;
color: #D1D7DC;
}
@@ -417,7 +417,7 @@ a.forumlink {
}
a.topictitle {
- margin: 1px 0px;
+ margin: 1px 0;
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-weight: bold;
font-size: 1.2em;
@@ -442,9 +442,9 @@ th a:hover {
/* Form Elements
------------ */
form {
- margin: 0px;
- padding: 0px;
- border: 0px;
+ margin: 0;
+ padding: 0;
+ border: 0;
}
input {
@@ -541,9 +541,9 @@ input.radio {
/* BBCode
------------ */
.quotetitle, .attachtitle {
- margin: 10px 5px 0px 5px;
+ margin: 10px 5px 0 5px;
padding: 4px;
- border-width: 1px 1px 0px 1px;
+ border-width: 1px 1px 0 1px;
border-style: solid;
border-color: #A9B8C2;
color: #333333;
@@ -557,10 +557,10 @@ input.radio {
}
.quotecontent, .attachcontent {
- margin: 0px 5px 10px 5px;
+ margin: 0 5px 10px 5px;
padding: 5px;
border-color: #A9B8C2;
- border-width: 0px 1px 1px 1px;
+ border-width: 0 1px 1px 1px;
border-style: solid;
font-weight: normal;
font-size: 1em;
@@ -575,9 +575,9 @@ input.radio {
}
.codetitle {
- margin: 10px 5px 0px 5px;
+ margin: 10px 5px 0 5px;
padding: 2px 4px;
- border-width: 1px 1px 0px 1px;
+ border-width: 1px 1px 0 1px;
border-style: solid;
border-color: #A9B8C2;
color: #333333;
@@ -588,10 +588,10 @@ input.radio {
.codecontent {
direction: ltr;
- margin: 0px 5px 10px 5px;
+ margin: 0 5px 10px 5px;
padding: 5px;
border-color: #A9B8C2;
- border-width: 0px 1px 1px 1px;
+ border-width: 0 1px 1px 1px;
border-style: solid;
font-weight: normal;
color: #006600;