aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-08-04 14:15:13 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-08-04 14:15:13 +0000
commit6cd6a907c7d8503896a46f710bb75370f1abcf43 (patch)
tree2ccec67b2d266917b7125fbb857dcea0f41f3e3a /phpBB/styles/prosilver
parent0e98a3aee813b4f83b1021d8204b38ba7fd319f0 (diff)
downloadforums-6cd6a907c7d8503896a46f710bb75370f1abcf43.tar
forums-6cd6a907c7d8503896a46f710bb75370f1abcf43.tar.gz
forums-6cd6a907c7d8503896a46f710bb75370f1abcf43.tar.bz2
forums-6cd6a907c7d8503896a46f710bb75370f1abcf43.tar.xz
forums-6cd6a907c7d8503896a46f710bb75370f1abcf43.zip
Separate PM Reply and PM Reply to all in prosilver.
Style changes by dhn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/prosilver')
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_message_header.html24
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_viewfolder.html2
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_viewmessage.html10
-rw-r--r--phpBB/styles/prosilver/theme/colours.css6
-rw-r--r--phpBB/styles/prosilver/theme/cp.css28
5 files changed, 57 insertions, 13 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index f9eb1cc102..ee56d61808 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -1,22 +1,30 @@
<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
-<form id="viewfolder" method="post" action="{S_PM_ACTION}">
-
-<div class="panel">
+<div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
-
+
<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
+ <form method="post" action="{U_PM_ACTION}" id="reply-form">
+
<div class="buttons">
- <!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
+ <!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
</div>
+
+ <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
+ <div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">&raquo; {L_REPLY_TO_ALL}</a></div>
+ <!-- ENDIF -->
+
+ <input type="hidden" name="action" value="" id="reply-action" />
+
+ </form>
<!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
- <ul class="linklist">
+ <ul class="linklist pm-return-to">
<li class="rightside pagination">
<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
@@ -26,3 +34,7 @@
</li>
</ul>
<!-- ENDIF -->
+ </div>
+</div>
+
+<form id="viewfolder" method="post" action="{S_PM_ACTION}">
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 1b7e52480a..05d213f2ed 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -2,9 +2,9 @@
<!-- IF not PROMPT -->
<!-- INCLUDE ucp_pm_message_header.html -->
+ <div class="panel pm-panel-message"><div>
<!-- ENDIF -->
-
<!-- IF PROMPT -->
<h2>{L_EXPORT_AS_CSV}</h2>
<form id="viewfolder" method="post" action="{S_PM_ACTION}">
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 059ae4703a..df0cf25e82 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -1,20 +1,18 @@
-<!-- INCLUDE ucp_header.html -->
+ <!-- INCLUDE ucp_header.html -->
<!-- INCLUDE ucp_pm_message_header.html -->
- <span class="corners-bottom"><span></span></span></div>
-</div>
<!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
- <fieldset class="display-options clearfix">
+ <fieldset class="display-options clearfix bg1 pm-message-nav">
<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
</fieldset>
<!-- ENDIF -->
-<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
- <div class="inner"><span class="corners-top"><span></span></span>
+<div id="post-{MESSAGE_ID}" class="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
+<div>
<div class="postbody">
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 28749dc0c4..7929bbefe4 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -868,6 +868,12 @@ dl.mini dt {
color: #000000 !important;
}
+/* PM panel adjustments */
+.pm-panel-header,
+#cp-main .pm-message-nav {
+ border-bottom-color: #A4B3BF;
+}
+
/* PM marking colours */
.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
border-left-color: #BC2A4D;
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index fa8899bae8..1e0edc616f 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -348,6 +348,34 @@ dl.mini dd {
line-height: 2.5em;
}
+/* PM panel adjustments */
+.pm-panel-header {
+ margin: 0;
+ padding-bottom: 10px;
+ border-bottom: 1px dashed #A4B3BF;
+}
+
+.reply-all {
+ display: block;
+ padding-top: 4px;
+ clear: both;
+ float: left;
+}
+
+.pm-panel-message {
+ padding-top: 10px;
+}
+
+.pm-return-to {
+ padding-top: 23px;
+}
+
+#cp-main .pm-message-nav {
+ margin: 0;
+ padding: 2px 10px 5px 10px;
+ border-bottom: 1px dashed #A4B3BF;
+}
+
/* PM Message history */
.current {
color: #999999;
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-07 07:23:22 +0000