From 2fcb764f3e4cba372e44397395b395f3a928ad03 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 8 Oct 2004 11:13:01 +0000
Subject: - more pm updates
git-svn-id: file:///svn/phpbb/trunk@4998 89ea8834-ac86-4346-8a33-228a782c2dd0
---
.../subSilver/template/ucp_pm_message_header.html | 2 +-
.../styles/subSilver/template/ucp_pm_options.html | 29 +++++++++++++++++++---
phpBB/styles/subSilver/template/ucp_pm_popup.html | 9 ++++++-
.../subSilver/template/ucp_pm_viewfolder.html | 12 +++++++--
4 files changed, 44 insertions(+), 8 deletions(-)
(limited to 'phpBB/styles')
diff --git a/phpBB/styles/subSilver/template/ucp_pm_message_header.html b/phpBB/styles/subSilver/template/ucp_pm_message_header.html
index 24476f3770..ff2c80e5a4 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_message_header.html
@@ -17,7 +17,7 @@ function marklist(form_name, status)
<tr>
<td class="gensmall" nowrap="nowrap" align="left">
<!-- IF S_UNREAD --><b>{L_UNREAD_MESSAGES}</b><!-- ELSE -->{FOLDER_STATUS}<!-- ENDIF -->
- <td class="gensmall" nowrap="nowrap" align="right"><!-- IF U_INBOX --><a href="{U_INBOX}">{L_PM_INBOX}</a><!-- ELSE -->{L_PM_INBOX}<!-- ENDIF --> | <!-- IF U_OUTBOX --><a href="{U_OUTBOX}">{L_PM_OUTBOX}</a><!-- ELSE -->{L_PM_OUTBOX}<!-- ENDIF --> | <!-- IF U_SENTBOX --><a href="{U_SENTBOX}">{L_PM_SENTBOX}</a><!-- ELSE -->{L_PM_SENTBOX}<!-- ENDIF --> | <a href="{U_CREATE_FOLDER}">{L_CREATE_FOLDER}</a></td>
+ <td class="gensmall" nowrap="nowrap" align="right"><!-- IF not S_IN_INBOX --><a href="{U_INBOX}">{L_PM_INBOX}</a><!-- ELSE --><b>{L_PM_INBOX}</b><!-- ENDIF --> | <!-- IF not S_IN_OUTBOX --><a href="{U_OUTBOX}">{L_PM_OUTBOX}</a><!-- ELSE --><b>{L_PM_OUTBOX}</b><!-- ENDIF --> | <!-- IF not S_IN_SENTBOX --><a href="{U_SENTBOX}">{L_PM_SENTBOX}</a><!-- ELSE --><b>{L_PM_SENTBOX}</b><!-- ENDIF --> | <a href="{U_CREATE_FOLDER}">{L_CREATE_FOLDER}</a></td>
</tr>
</table>
diff --git a/phpBB/styles/subSilver/template/ucp_pm_options.html b/phpBB/styles/subSilver/template/ucp_pm_options.html
index 90ce7ccb11..8741ae7b4c 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_options.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_options.html
@@ -93,6 +93,27 @@
<div style="padding: 2px;"></div>
+<!-- IF S_FOLDER_OPTIONS -->
+<table class="tablebg" width="100%" cellspacing="1">
+ <tr>
+ <th colspan="2">{L_RENAME_FOLDER}</th>
+ </tr>
+ <tr>
+ <td class="row1" width="200"><b class="gen">{L_RENAME_FOLDER}: </b></td>
+ <td class="row1"><select name="rename_folder_id">{S_FOLDER_OPTIONS}</select></td>
+ </tr>
+ <tr>
+ <td class="row1" width="200"><b class="gen">{L_NEW_FOLDER_NAME}: </b></td>
+ <td class="row1"><input type="text" class="post" name="new_folder_name" size="30" maxlength="30" /></td>
+ </tr>
+ <tr>
+ <td class="row1" align="right" colspan="2"><input class="btnlite" style="width:150px" type="submit" name="rename_folder" value="{L_RENAME}" /></td>
+ </tr>
+</table>
+
+<div style="padding: 2px;"></div>
+<!-- ENDIF -->
+
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2">{L_ADD_FOLDER}</th>
@@ -121,20 +142,20 @@
</tr>
<tr>
<td class="row1" width="200"><b class="gen">{L_REMOVE_FOLDER}: </b></td>
- <td class="row1"><select name="removefolder">{S_FOLDER_OPTIONS}</select></td>
+ <td class="row1"><select name="remove_folder_id">{S_FOLDER_OPTIONS}</select></td>
<td class="row1"><b class="genmed">{L_AND}</b></td>
</tr>
<tr>
<td class="row2" width="200"> </td>
- <td class="row2" colspan="2"><input type="radio" name="remove_action" value="1" checked="checked" /> <span class="genmed">Move messages from removed folder to </span> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></td>
+ <td class="row2" colspan="2"><input type="radio" name="remove_action" value="1" checked="checked" /> <span class="genmed">{L_MOVE_DELETED_MESSAGES_TO} </span> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></td>
</tr>
<tr>
<td class="row2" width="200"> </td>
- <td class="row2" colspan="2"><input type="radio" name="remove_action" value="2" /> <span class="genmed">Delete all messages within removed folder</span></td>
+ <td class="row2" colspan="2"><input type="radio" name="remove_action" value="2" /> <span class="genmed">{L_DELETE_MESSAGES_IN_FOLDER}</span></td>
</tr>
<tr>
<td class="row2" width="200"> </td>
- <td class="row2" colspan="2" align="right"><input class="btnlite" style="width:150px" type="submit" name="remove" value="{L_REMOVE}" /></td>
+ <td class="row2" colspan="2" align="right"><input class="btnlite" style="width:150px" type="submit" name="remove_folder" value="{L_REMOVE}" /></td>
</tr>
</table>
diff --git a/phpBB/styles/subSilver/template/ucp_pm_popup.html b/phpBB/styles/subSilver/template/ucp_pm_popup.html
index 08314acf87..ba7421dd39 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_popup.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_popup.html
@@ -15,7 +15,14 @@ function jump_to_inbox()
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="4">
<tr>
- <td valign="top" class="row1" align="center"><br /><span class="gen">{MESSAGE}</span><br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
+ <td valign="top" class="row1" align="center">
+ <br />
+ <!-- IF S_NOT_LOGGED_IN -->
+ {L_LOGIN_CHECK_PM}
+ <!-- ELSE -->
+ {MESSAGE}<br /><br />{CLICK_TO_VIEW}
+ <!-- ENDIF -->
+ <br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
</tr>
</table>
</td>
diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html
index fc538e4266..7227377f99 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html
@@ -41,7 +41,7 @@
<!-- IF S_PM_ICONS -->
<td class="row1" width="25" align="center">{messagerow.PM_ICON_IMG}</td>
<!-- ENDIF -->
- <td class="row1">
+ <!-- IF messagerow.S_PM_DELETED --><td class="row3"><!-- ELSE --><td class="row1"><!-- ENDIF -->
<!-- IF messagerow.S_PM_REPORTED -->
<a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a>
<!-- ENDIF -->
@@ -50,7 +50,15 @@
<!-- ELSEIF messagerow.PM_IMG -->
{messagerow.PM_IMG}
<!-- ENDIF -->
- <p class="topictitle">{messagerow.ATTACH_ICON_IMG} <a href="{messagerow.U_VIEW_PM}">{messagerow.SUBJECT}</a></p></td>
+ <p class="topictitle">
+ {messagerow.ATTACH_ICON_IMG}
+ <!-- IF messagerow.S_PM_DELETED -->
+ {L_MESSAGE_REMOVED_FROM_OUTBOX}<br />
+ <a href="{messagerow.U_REMOVE_PM}" style="float:right;">{L_DELETE_MESSAGE}</a>
+ <!-- ELSE -->
+ <a href="{messagerow.U_VIEW_PM}">{messagerow.SUBJECT}</a>
+ <!-- ENDIF -->
+ </p></td>
<td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF S_SHOW_RECIPIENTS -->{messagerow.RECIPIENTS}<!-- ELSE -->{messagerow.MESSAGE_AUTHOR}<!-- ENDIF --></p></td>
<!-- IF S_UNREAD -->
<td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></p></td>
--
cgit v1.2.1