private mail: bring additional inbox/outbox views and ajaxify single message drop

4 files changed, 5 insertions, 14 deletions

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 0a5e5a2c5..2e64de7bc 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,4 +1,4 @@
-<div class="mail-conv-outside-wrapper">
+<div id="mail-{{$mail.id}}" class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
 	</div>
@@ -9,9 +9,9 @@
 		<div class="mail-conv-body">{{$mail.body}}</div>
 		<div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" >
 			{{if $mail.can_recall}}
-			<a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a>
+			<a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a>
 			{{/if}}
-			<a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
+			<a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
 		</div>
 	</div>
 	<div class="clear"></div>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index bb89c96ec..24a87fe4a 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<a class="btn btn-xs btn-danger pull-right" href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
+		<a class="btn btn-xs btn-danger pull-right" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
 		<h2>{{$prvmsg_header}}</h2>
 
 	</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index ad042eb59..fc9b5afa8 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,5 +1,5 @@
 <li>
-	<a href="mail/{{$message.id}}" class="mail-link">
+	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="{{if $message.selected}}active{{/if}}">
 		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
 		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
 		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 954ada215..b3bb94d71 100755
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -2,18 +2,9 @@
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
 		<li><a href="{{$check.url}}"{{if $check.sel}} class="active"{{/if}}>{{$check.label}}</a></li>
-	{{*
 		<li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li>
 		<li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li>
 		<li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li>
-	*}}
 		<li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li>
 	</ul>
-	{{if $tabs}}
-	<ul class="nav nav-pills nav-stacked">
-		{{foreach $tabs as $t}}
-			<li><a href="{{$t.url}}"{{if $t.sel}} class="active"{{/if}}>{{$t.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	{{/if}}
 </div>