mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/raimon/10453' into develop-olympus

Browse Source 
* ticket/raimon/10453:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
This commit is contained in:
Vjacheslav Trushkin 2012-02-24 20:05:26 +02:00
commit 8cb95b3b84
6 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/styles/prosilver/template/ucp_pm_message_header.html
View File

@ -1,25 +1,22 @@
<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
<div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->">
<form id="viewfolder" method="post" action="{S_PM_ACTION}">
<div class="panel">
<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 -->
<div class="buttons">
<!-- 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>
<!-- 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>
<!-- 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 -->
<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</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 -->
<!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<ul class="linklist pm-return-to">
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<ul class="linklist">
<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 -->
@ -28,8 +25,4 @@
<!-- ENDIF -->
</li>
</ul>
<!-- ENDIF -->
</div>
</div>
<form id="viewfolder" method="post" action="{S_PM_ACTION}">
<!-- ENDIF -->

1
phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
View File

@ -2,7 +2,6 @@
<!-- IF not PROMPT -->
<!-- INCLUDE ucp_pm_message_header.html -->
<div class="panel pm-panel-message"><div>
<!-- ENDIF -->
<!-- IF PROMPT -->

11
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View File

@ -1,18 +1,21 @@
<!-- 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 bg1 pm-message-nav">
<fieldset class="display-options clearfix">
<!-- 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="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
<div>
<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 class="postbody">

13
phpBB/styles/prosilver/theme/bidi.css
View File

@ -591,6 +591,19 @@
/* PM Styles
----------------------------------------*/
/* PM panel adjustments */
.rtl .reply-all a.right {
background-position: 5% 60%;
}
.rtl .reply-all a.right:hover {
background-position: 3% 60%;
}
.rtl .reply-all {
padding-left: 5px;
}
/* Defined rules list for PM options */
.rtl ol.def-rules {
padding-right: 0;

6
phpBB/styles/prosilver/theme/colours.css
View File

@ -884,12 +884,6 @@ 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;

30
phpBB/styles/prosilver/theme/cp.css
View File

@ -349,31 +349,17 @@ dl.mini dd {
}
/* PM panel adjustments */
.pm-panel-header {
margin: 0;
padding-bottom: 10px;
border-bottom: 1px dashed #A4B3BF;
.reply-all a.left {
background-position: 3px 60%;
}
.reply-all a.left:hover {
background-position: 0px 60%;
}
.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;
font-size: 11px;
padding-top: 5px;
}
/* PM Message history */