Merge pull request #36 from x620/9.0-mail_move_message
[PORT] 9.0-mail_move_messagepull/40/head
-
6mail_archives/static/src/js/archives.js
-
37mail_base/static/src/js/base.js
-
2mail_move_message/README.rst
-
8mail_move_message/__openerp__.py
-
14mail_move_message/controllers/main.py
-
BINmail_move_message/images/inbox.png
-
42mail_move_message/mail_move_message_models.py
-
BINmail_move_message/static/description/delete-message.png
-
BINmail_move_message/static/description/html-message-viewer.png
-
BINmail_move_message/static/description/html-message-viewer1.png
-
BINmail_move_message/static/description/html-message.png
-
BINmail_move_message/static/description/icon.png
-
BINmail_move_message/static/description/inbox-move.png
-
BINmail_move_message/static/description/inbox.png
-
20mail_move_message/static/description/index.html
-
BINmail_move_message/static/description/record-move-back.png
-
BINmail_move_message/static/description/record1.png
-
BINmail_move_message/static/description/record2.png
-
23mail_move_message/static/src/css/mail_move_message.css
-
137mail_move_message/static/src/js/mail_move_message.js
-
7mail_move_message/static/src/xml/mail_move_message_main.xml
-
6mail_sent/static/src/js/sent.js
-
8mail_to/static/src/css/mail_to.css
Before Width: 861 | Height: 628 | Size: 128 KiB After Width: 861 | Height: 628 | Size: 58 KiB |
Before Width: 1012 | Height: 546 | Size: 73 KiB After Width: 1012 | Height: 546 | Size: 39 KiB |
Before Width: 1012 | Height: 546 | Size: 62 KiB After Width: 1012 | Height: 546 | Size: 40 KiB |
Before Width: 1012 | Height: 546 | Size: 51 KiB After Width: 1012 | Height: 546 | Size: 39 KiB |
Before Width: 890 | Height: 473 | Size: 58 KiB After Width: 890 | Height: 473 | Size: 73 KiB |
Before Width: 120 | Height: 120 | Size: 3.0 KiB After Width: 149 | Height: 149 | Size: 1.5 KiB |
Before Width: 1054 | Height: 562 | Size: 85 KiB After Width: 1054 | Height: 562 | Size: 57 KiB |
Before Width: 750 | Height: 400 | Size: 69 KiB After Width: 750 | Height: 400 | Size: 54 KiB |
Before Width: 904 | Height: 482 | Size: 68 KiB After Width: 904 | Height: 482 | Size: 42 KiB |
Before Width: 1007 | Height: 537 | Size: 58 KiB After Width: 1007 | Height: 537 | Size: 32 KiB |
Before Width: 750 | Height: 400 | Size: 70 KiB After Width: 750 | Height: 400 | Size: 29 KiB |
@ -1,13 +1,20 @@ |
|||
.openerp .oe_mail .oe_msg .oe_msg_icons .oe_move.oe_moved a { |
|||
color: #ffefe; |
|||
i.oe_moved { |
|||
color: #ED6F6A; |
|||
text-shadow: 0px 1px #961b1b,0px -1px #961b1b, -1px 0px #961b1b, 1px 0px #961b1b, 0px 3px 3px rgba(0,0,0,0.1); |
|||
} |
|||
.mail_move_message { |
|||
width: 864px; |
|||
} |
|||
|
|||
.openerp .oe_mail .oe_msg .oe_msg_icons .oe_move:hover a { |
|||
color: #ffa1a1; |
|||
text-shadow: 0px 1px #ff0000,0px -1px #ff0000, -1px 0px #ff0000, 1px 0px #ff0000, 0px 3px 3px rgba(0,0,0,0.1); |
|||
.o_mail_thread .o_thread_message i.oe_move { |
|||
cursor: pointer; |
|||
opacity: 0; |
|||
padding: 4px; |
|||
} |
|||
.o_mail_thread .o_thread_message:hover i.oe_move { |
|||
opacity: 0.6; |
|||
} |
|||
|
|||
.openerp.mail_move_message{ |
|||
width: 864px; |
|||
} |
|||
.o_mail_thread .o_thread_message:hover i.oe_move:hover { |
|||
opacity: 1; |
|||
} |
@ -1,8 +1,9 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<template> |
|||
<t t-extend="mail.thread.message"> |
|||
<t t-jquery=".oe_msg_icons" t-operation="append"> |
|||
<span t-attf-class="oe_move #{widget.is_moved?'oe_moved':''}"><a title="Move to thread" class="oe_e">f</a></span> |
|||
<t t-extend="mail.ChatThread.Message"> |
|||
<t t-jquery='p.o_mail_info>span>i:first-child' t-operation="before"> |
|||
<i t-att-class="'fa fa-exchange oe_move' + (message.is_moved ? ' oe_moved' : '')" |
|||
t-att-data-message-id="message.id" title="Move to thread"/> |
|||
</t> |
|||
</t> |
|||
</template> |