diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-19 12:04:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-19 12:04:22 +0000 |
| commit | 456586475b14cd70be9fee003006b1c149537857 (patch) | |
| tree | ad42ed380c553c38ee54db034bce407873d4b4b3 /phpBB/styles/subsilver2 | |
| parent | e242a73a6f060ccb8378b1183b0d73af2e81c552 (diff) | |
| download | forums-456586475b14cd70be9fee003006b1c149537857.tar forums-456586475b14cd70be9fee003006b1c149537857.tar.gz forums-456586475b14cd70be9fee003006b1c149537857.tar.bz2 forums-456586475b14cd70be9fee003006b1c149537857.tar.xz forums-456586475b14cd70be9fee003006b1c149537857.zip | |
oh my god - what did he do? Adding attachment display to post/topic review, queue, reports, post details, mcp topic view... fixing other tiny things along the line.
git-svn-id: file:///svn/phpbb/trunk@7642 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subsilver2')
| -rw-r--r-- | phpBB/styles/subsilver2/template/bbcode.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_ban.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_header.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_post.html | 30 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_topic.html | 19 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/posting_review.html | 21 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/posting_topic_review.html | 22 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_header.html | 8 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_history.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/theme/stylesheet.css | 64 |
10 files changed, 128 insertions, 52 deletions
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" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </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>» <!-- 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> </td> <td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b> </td> <td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td> - <td valign="top" nowrap="nowrap"> <!-- 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"> <!-- 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>» <!-- 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; |
