summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Albo <gabriel@albo.com.br>2014-11-12 11:56:01 +0100
committerGabriel Albo <gabriel@albo.com.br>2014-11-12 11:56:58 +0100
commitd510e3ba01bfd69578f824e61d0760555fd8cd1d (patch)
tree7819d2c5d36fa3d2f590e174ded723e6a63fc39c
parent45f1104cbc733b184dfb7426ebbed61cd0f8f260 (diff)
Fixing functional test failure on 'trash/delete this message' step. Adding attachment icon to mail list
-rw-r--r--service/test/functional/features/steps/mail_view.py2
-rw-r--r--web-ui/app/templates/mails/single.hbs4
2 files changed, 4 insertions, 2 deletions
diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py
index a7586931..0c37d089 100644
--- a/service/test/functional/features/steps/mail_view.py
+++ b/service/test/functional/features/steps/mail_view.py
@@ -95,7 +95,7 @@ def impl(context):
@then('I choose to trash')
def impl(context):
context.browser.execute_script("$('button#view-more-actions').click()")
- click_button(context, 'Trash this message', 'span')
+ click_button(context, 'Delete this message', 'span')
@then('I see the mail has a cc and a bcc recipient')
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs
index baf6251c..32ddb869 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/app/templates/mails/single.hbs
@@ -3,7 +3,9 @@
</span>
<span>
<a href="/#/{{ tag }}/mail/{{ ident }}">
- <span class="received-date">{{ header.formattedDate }}</span>
+ <span class="received-date">{{ header.formattedDate }}
+ <br><i class="fa fa-paperclip icon-flip-horizontal" style="right:5px;position:absolute;font-size:initial;margin: 5px 5px 0 0;"></i>
+ </span>
<div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
<div class="subject-and-tags">