diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index 501e5566e60..5cc674fcf45 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -37,7 +37,7 @@ This is a complete document management system. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['knowledge'], + 'depends': ['knowledge', 'mail'], 'data': [ 'security/document_security.xml', 'document_view.xml', diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index c0edf0dc9b8..b735d2ce4a4 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -235,7 +235,6 @@ - @@ -244,6 +243,7 @@ ir.actions.act_window ir.attachment form + kanban,form

Click to create a new document. diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index e2d1deb028b..2ed5f338825 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -89,5 +89,33 @@ + + ir.attachment kanban + ir.attachment + + + + + + + +

+
+ +
bb
+
+
+ +
aa
+
+
+ + + +
+ + + + - \ No newline at end of file + diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 614077b65a2..5a51bce04d9 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -318,7 +318,7 @@ .openerp .oe_mail .oe_msg_composer .oe_recipients input{ vertical-align: middle; } -.openerp .oe_mail .oe_attachment{ +.oe_attachment{ display: inline-block; width: 100px; margin: 4px 2px; @@ -328,7 +328,7 @@ text-align: center; vertical-align: top; } -.openerp .oe_mail .oe_attachment .oe_name{ +.oe_attachment .oe_name{ display: inline-block; max-width: 100%; padding: 1px 3px; @@ -341,10 +341,10 @@ border-radius: 3px; } -.openerp .oe_mail .oe_attachment.oe_preview{ +.oe_attachment.oe_preview{ background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAJ0lEQVQYV2MsLS39z4AGLCws0IUYGIeCwrVr12J45sSJE5ieGQIKAbuZKf/EMCs7AAAAAElFTkSuQmCC ); } -.openerp .oe_mail .oe_attachment .oe_progress_bar{ +.oe_attachment .oe_progress_bar{ display: none; position: absolute; top: 18px; @@ -364,7 +364,7 @@ -o-animation: oe_mail_attach_loading_anim 0.75s infinite linear; animation: oe_mail_attach_loading_anim 0.75s infinite linear; } -.openerp .oe_mail .oe_attachment.oe_uploading .oe_progress_bar{ +.oe_attachment.oe_uploading .oe_progress_bar{ display: block; } @-webkit-keyframes oe_mail_attach_loading_anim{ @@ -387,7 +387,7 @@ 50% { background: #009123 } 100% { background: #4BBD00 } } -.openerp .oe_mail .oe_attachment.oe_preview .oe_name{ +.oe_attachment.oe_preview .oe_name{ position: absolute; bottom: 0px; margin: 3px; @@ -405,14 +405,14 @@ -o-transition: opacity 0.2s linear; transition: opacity 0.2s linear; } -.openerp .oe_mail .oe_attachment.oe_preview:hover .oe_name{ +.oe_attachment.oe_preview:hover .oe_name{ opacity: 1; -webkit-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear; -o-transition: opacity 0.2s linear; transition: opacity 0.2s linear; } -.openerp .oe_mail .oe_attachment img{ +.oe_attachment img{ position: absolute; width: 48px; height: 48px; @@ -420,7 +420,7 @@ left: 50%; margin-left: -24px; } -.openerp .oe_mail .oe_attachment.oe_preview img{ +.oe_attachment.oe_preview img{ display: block; position: relative; margin:0px; diff --git a/addons/project/project.py b/addons/project/project.py index 96b1c84b94c..9dcf069a856 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -223,7 +223,7 @@ class project(osv.osv): 'res_model': 'ir.attachment', 'type': 'ir.actions.act_window', 'view_id': False, - 'view_mode': 'tree,form', + 'view_mode': 'kanban,form', 'view_type': 'form', 'limit': 80, 'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)