Merge pull request #367 from glauco/master

Issue #363 [Luiz, Glauco] Trash Icon is not appearing for mails in Inbox anymore

4 files changed, 32 insertions, 4 deletions

diff --git a/web-ui/app/js/mail_list/ui/mail_item_factory.js b/web-ui/app/js/mail_list/ui/mail_item_factory.js
index 87a883b0..3c815401 100644
--- a/web-ui/app/js/mail_list/ui/mail_item_factory.js
+++ b/web-ui/app/js/mail_list/ui/mail_item_factory.js
@@ -26,12 +26,14 @@ define(
 
     var MAIL_ITEM_TYPE = {
       'drafts': DraftItem,
-      'sent': SentItem
+      'sent': SentItem,
+      'trash': GenericMailItem
     };
 
     var TEMPLATE_TYPE = {
       'drafts': 'draft',
-      'sent': 'sent'
+      'sent': 'sent',
+      'trash': 'trash'
     };
 
     var createAndAttach = function (nodeToAttachTo, mail, currentMailIdent, currentTag, isChecked) {
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index 470c6e51..64e269ca 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -41,7 +41,8 @@ define(['hbs/templates'], function (templates) {
       fullView: window.Pixelated['app/templates/mails/full_view.hbs'],
       mailActions: window.Pixelated['app/templates/mails/mail_actions.hbs'],
       draft: window.Pixelated['app/templates/mails/draft.hbs'],
-      sent: window.Pixelated['app/templates/mails/sent.hbs']
+      sent: window.Pixelated['app/templates/mails/sent.hbs'],
+      trash: window.Pixelated['app/templates/mails/trash.hbs']
     },
     mailActions: {
       actionsBox: window.Pixelated['app/templates/mail_actions/actions_box.hbs'],
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs
index a74c9606..90023713 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/app/templates/mails/single.hbs
@@ -12,7 +12,6 @@
     </span>
     <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
     <div class="subject-and-tags">
-      <i class="fa fa-trash-o"></i>
       {{ header.subject }}
     </div>
     <div class="subject-and-tags">
diff --git a/web-ui/app/templates/mails/trash.hbs b/web-ui/app/templates/mails/trash.hbs
new file mode 100644
index 00000000..a74c9606
--- /dev/null
+++ b/web-ui/app/templates/mails/trash.hbs
@@ -0,0 +1,26 @@
+<span>
+  <input type="checkbox" {{#if isChecked }}checked="true"{{/if}} />
+</span>
+<span>
+  <a href="/#/{{ tag }}/mail/{{ ident }}">
+    <span class="received-date">{{ header.formattedDate }}
+      {{#if attachments}}
+        <div class="attachment-indicator">
+          <i class="fa fa-paperclip"></i>
+        </div>
+      {{/if}}
+    </span>
+    <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
+    <div class="subject-and-tags">
+      <i class="fa fa-trash-o"></i>
+      {{ header.subject }}
+    </div>
+    <div class="subject-and-tags">
+      <ul class="tags">
+        {{#each tagsForListView }}
+            <li class="tag" data-tag="{{this}}">{{ this }}</li>
+        {{/each }}
+      </ul>
+    </div>
+  </a>
+</span>