diff options
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_message_footer.html | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 838bcda09a..c21d4b0213 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -98,7 +98,7 @@ <!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF --> <!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF --> - <!-- IF not S_UNREAD --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}: <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF --> + <!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}: <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF --> <input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" /> <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> <input type="hidden" name="p" value="{MSG_ID}" /> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html index 61d3c8300e..b65ab40129 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html @@ -18,12 +18,14 @@ </td> <td align="{S_CONTENT_FLOW_END}" nowrap="nowrap"> <!-- IF S_VIEW_MESSAGE --> - <form name="movepm" method="post" action="{S_PM_ACTION}" style="margin:0px"> - <input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" /> - <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> - <input type="hidden" name="p" value="{MSG_ID}" /> - <select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select> <input class="btnlite" type="submit" name="move_pm" value="{L_MOVE_TO_FOLDER}" /> - </form> + <!-- IF not S_SPECIAL_FOLDER --> + <form name="movepm" method="post" action="{S_PM_ACTION}" style="margin:0px"> + <input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" /> + <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> + <input type="hidden" name="p" value="{MSG_ID}" /> + <select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select> <input class="btnlite" type="submit" name="move_pm" value="{L_MOVE_TO_FOLDER}" /> + </form> + <!-- ENDIF --> <!-- ELSE --> <form name="sortmsg" method="post" action="{S_PM_ACTION}" style="margin:0px"> <span class="gensmall">{L_DISPLAY_MESSAGES}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /> |
