From 3ab8632d3bd82306b8b82f652da329af4fdd4333 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 27 May 2021 19:20:07 +0000
Subject: update mail widgets to not require include message and minor fixes

---
 view/tpl/mail_conv.tpl    | 6 ++++--
 view/tpl/message_side.tpl | 2 ++
 view/tpl/msg-header.tpl   | 5 +++--
 view/tpl/prv_message.tpl  | 3 +++
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index b0497fe99..adc7734ec 100644
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -24,9 +24,11 @@
 				<i class="fa fa-cog"></i>
 			</button>
 			<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
-				{{if $mail.can_recall}}
+				{{** if $mail.can_recall}}
 				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
-				{{/if}}
+				{{/if **}}
+				<a class="dropdown-item" href="mail/{{$mail.id}}/download" id="mail-conv-download-icon-{{$mail.id}}"><i class="fa fa-fw fa-download"></i>&nbsp;{{$mail.download}}</a>
+				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
 				{{if $mail.can_recall}}
 				<div class="dropdown-divider"></div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 2ac61bf76..a45d1d177 100644
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -4,6 +4,8 @@
 		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
 		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
 		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
+{{**
 		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
+**}}
 	</ul>
 </div>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index e8542b087..d49303453 100644
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -1,3 +1,4 @@
+{{**
 <script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script>
 <script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script>
 <script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script>
@@ -73,9 +74,9 @@
 	function addmailtext(data) {
 		var currentText = $("#prvmail-text").val();
 		$("#prvmail-text").val(currentText + data);
-	}	
+	}
 
 
 
 </script>
-
+**}}
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b8c81539d..ea7de0b4c 100644
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,3 +1,5 @@
+{{**
+
 {{if $new}}
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
@@ -105,3 +107,4 @@
 	</div>
 </div>
 {{/if}}
+**}}
-- 
cgit v1.2.3