summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
authorkujiu <kujiu@users.noreply.github.com>2018-07-04 09:55:52 +0200
committerGitHub <noreply@github.com>2018-07-04 09:55:52 +0200
commitf90cf060a3cfeb37a67bec83264c0aaab8892b56 (patch)
treefb92375b6d60293cdb49fe2e61fc20bddcd30940 /addons/mail
parentad0f8fd0b7a468538dfb3bb8c08743913b886e78 (diff)
[FIX] Syntax of icons (#25577)
Description of the issue/feature this PR addresses: Accessibility improvements forbids the use of the syntax `<i class="fa fa-check"/> Some text` to create a labelled icon. But, by this, some fonts are changed. Desired behavior after PR is merged: The old syntax can be used.
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/static/src/xml/activity.xml10
-rw-r--r--addons/mail/static/src/xml/discuss.xml16
-rw-r--r--addons/mail/static/src/xml/followers.xml10
-rw-r--r--addons/mail/static/src/xml/systray.xml9
-rw-r--r--addons/mail/static/src/xml/web_kanban_activity.xml2
-rw-r--r--addons/mail/wizard/mail_resend_message_views.xml2
6 files changed, 29 insertions, 20 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index d96db53ac41..5ed86b37614 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -3,8 +3,8 @@
<t t-name="mail.activity_items">
<div class="o_thread_date_separator o_border_dashed" data-toggle="collapse" data-target="#o_chatter_planned_activities">
<a href="#" role="button" class="o_thread_date btn">
- <span class="fa fa-fw fa-caret-down">
- Planned activities</span>
+ <i class="fa fa-fw fa-caret-down"/>
+ Planned activities
<small class="o_chatter_planned_activities_summary ml8">
<span class="label img-circle label-danger"><t t-esc="nbOverdueActivities"/></span>
<span class="label img-circle label-warning"><t t-esc="nbTodayActivities"/></span>
@@ -56,13 +56,13 @@
</div>
<div class="o_thread_message_tools btn-group">
<a role="button" href="#" class="btn btn-link btn-success text-muted btn-sm o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
- <span class="fa fa-check">Mark Done</span>
+ <i class="fa fa-check"/> Mark Done
</a>
<a role="button" href="#" class="btn btn-link btn-default text-muted btn-sm o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
- <span class="fa fa-pencil">Edit</span>
+ <i class="fa fa-pencil"/> Edit
</a>
<a role="button" href="#" class="btn btn-link btn-sm btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
- <span class="fa fa-times">Cancel</span>
+ <i class="fa fa-times"/> Cancel
</a>
</div>
</div>
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml
index 493d3c918aa..ff5d7d1d66a 100644
--- a/addons/mail/static/src/xml/discuss.xml
+++ b/addons/mail/static/src/xml/discuss.xml
@@ -30,13 +30,13 @@
<div class="o_mail_discuss_sidebar">
<div t-attf-class="o_mail_discuss_title_main o_mail_discuss_item #{(activeThreadID === 'mailbox_inbox') ? 'o_active': ''}"
data-thread-id="mailbox_inbox">
- <span class="o_thread_name fa fa-inbox mr8">Inbox</span>
+ <span class="o_channel_name"><i class="fa fa-inbox mr8"/>Inbox</span>
<t t-set="counter" t-value="needactionCounter"/>
<t t-call="mail.discuss.SidebarCounter"/>
</div>
<div t-attf-class="o_mail_discuss_title_main o_mail_mailbox_title_starred o_mail_discuss_item #{(activeThreadID === 'mailbox_starred') ? 'o_active': ''}"
data-thread-id="mailbox_starred">
- <span class="o_thread_name fa fa-star-o mr8">Starred</span>
+ <span class="o_channel_name"><i class="fa fa-star-o mr8"/>Starred</span>
<t t-set="counter" t-value="starredCounter"/>
<t t-call="mail.discuss.SidebarCounter"/>
</div>
@@ -218,16 +218,20 @@
<div class="o_mail_discuss_content"/>
<div class="o_mail_mobile_tabs">
<div class="o_mail_mobile_tab" data-type="mailbox_inbox">
- <span class="o_tab_title fa fa-inbox">Inbox</span>
+ <span class="fa fa-inbox"/>
+ <span class="o_tab_title">Inbox</span>
</div>
<div class="o_mail_mobile_tab" data-type="dm">
- <span class="o_tab_title fa fa-user">Chat</span>
+ <span class="fa fa-user"/>
+ <span class="o_tab_title">Chat</span>
</div>
<div class="o_mail_mobile_tab" data-type="public">
- <span class="o_tab_title fa fa-users">Channels</span>
+ <span class="fa fa-users"/>
+ <span class="o_tab_title">Channels</span>
</div>
<div class="o_mail_mobile_tab" data-type="private">
- <span class="o_tab_title fa fa-eye-slash">Private Channels</span>
+ <span class="fa fa-eye-slash"/>
+ <span class="o_tab_title">Private Channels</span>
</div>
</div>
</div>
diff --git a/addons/mail/static/src/xml/followers.xml b/addons/mail/static/src/xml/followers.xml
index 89df5c48b2c..ae002a3c8ee 100644
--- a/addons/mail/static/src/xml/followers.xml
+++ b/addons/mail/static/src/xml/followers.xml
@@ -18,8 +18,10 @@
<div class="btn-group btn-group-sm o_subtypes_list">
<button class="btn btn-sm btn-link o_followers_follow_button o_followers_notfollow">
<span class="o_follow">Follow</span>
- <span class="fa fa-times o_followers_unfollow"> Unfollow</span>
- <span class="fa fa-check o_followers_following"> Following</span>
+ <span class="fa fa-times o_followers_unfollow"/>
+ <span class="o_followers_unfollow"> Unfollow</span>
+ <span class="fa fa-check o_followers_following"/>
+ <span class="o_followers_following"> Following</span>
</button><button class="btn btn-sm btn-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="fa fa-bell" role="img" aria-label="Alarm menu" title="Alarm menu"/>
</button>
@@ -85,8 +87,8 @@
</li>
</t>
<t t-name="mail.Followers.subtypes.warning">
- <span class="text-warning" role="alert">
- <span class="fa fa-warning"> Be careful with channels following internal notifications</span>
+ <span class="text-warning">
+ <i class="fa fa-warning"/> Be careful with channels following internal notifications
</span>
</t>
diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml
index ae1d7f2879f..7f3d56d955d 100644
--- a/addons/mail/static/src/xml/systray.xml
+++ b/addons/mail/static/src/xml/systray.xml
@@ -27,13 +27,16 @@
<li role="menuitem" t-if="widget.isMobile()">
<div class="o_mail_mobile_tabs">
<div class="o_mail_mobile_tab o_filter_button active">
- <span class="o_tab_title fa fa-envelope">All</span>
+ <span class="fa fa-envelope"/>
+ <span class="o_tab_title">All</span>
</div>
<div class="o_mail_mobile_tab o_filter_button" data-filter='chat'>
- <span class="o_tab_title fa fa-user">Chat</span>
+ <span class="fa fa-user"/>
+ <span class="o_tab_title">Chat</span>
</div>
<div class="o_mail_mobile_tab o_filter_button" data-filter='channels'>
- <span class="o_tab_title fa fa-users">Channels</span>
+ <span class="fa fa-users"/>
+ <span class="o_tab_title">Channels</span>
</div>
</div>
</li>
diff --git a/addons/mail/static/src/xml/web_kanban_activity.xml b/addons/mail/static/src/xml/web_kanban_activity.xml
index 4493e4b9903..c3148f13e95 100644
--- a/addons/mail/static/src/xml/web_kanban_activity.xml
+++ b/addons/mail/static/src/xml/web_kanban_activity.xml
@@ -54,7 +54,7 @@
</li>
<li role="menuitem" class="o_schedule_activity text-center">
<a role="button" class="btn btn-link btn-block">
- <strong class="fa fa-plus fa-fw">Schedule an activity</strong>
+ <i class="fa fa-plus fa-fw"></i><strong>Schedule an activity</strong>
</a>
</li>
</t>
diff --git a/addons/mail/wizard/mail_resend_message_views.xml b/addons/mail/wizard/mail_resend_message_views.xml
index d377e0d7ae6..970b56636b5 100644
--- a/addons/mail/wizard/mail_resend_message_views.xml
+++ b/addons/mail/wizard/mail_resend_message_views.xml
@@ -20,7 +20,7 @@
<field name="resend" widget="boolean_toggle"/>
</tree>
</field>
- <p attrs="{'invisible':[('has_cancel', '==', False)]}"> <span class="fa fa-info-circle"> Caution: It won't be possible to send this mail again to the recipients you did not select.</span></p>
+ <p attrs="{'invisible':[('has_cancel', '==', False)]}"> <span class="fa fa-info-circle"/> Caution: It won't be possible to send this mail again to the recipients you did not select.</p>
<footer>
<button string="Resend to selected" name="resend_mail_action" type="object" class="btn-primary o_mail_send"/>
<button string="Ignore all failures" name="cancel_mail_action" type="object" class="btn-default" />