diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 6ca94ecd7f4..22de721dae2 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -58,7 +58,7 @@ If you need to manage your meetings, you should install the CRM module. 'installable': True, 'application': True, 'auto_install': False, - 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], + 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index cc9e2190633..e7b09046a21 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -1,6 +1,6 @@ - + @@ -78,9 +78,9 @@
${object.location or ''} % if object.location : - + (View Map) - + % endif
@@ -90,7 +90,7 @@
What :
- +
${object.description or ''}
@@ -113,19 +113,19 @@ - +
- Accept | - Declined + Accept + Decline
-
+
--
Sent by ${object.user_id.name} from ${object.user_id.company_id.name}. View this meeting detail directly in OpenERP.
diff --git a/addons/base_calendar/static/src/css/base_calender.css b/addons/base_calendar/static/src/css/base_calender.css index 099bfdcc054..d215ff45253 100644 --- a/addons/base_calendar/static/src/css/base_calender.css +++ b/addons/base_calendar/static/src/css/base_calender.css @@ -1,15 +1,18 @@ .openerp .oe_invitation , .text-core .text-tag .oe_invitation{ - width : 16px; - height : 16px; + width : 13px; + height : 13px; margin-bottom : -4px; display : inline-block; } .openerp .needs-action , .tentative,.text-core .text-tag .custom-edit, .text-core .text-tag .tentative { background : url(/web/static/src/img/icons/gtk-normal.png) no-repeat; + background-size : 11px 11px; } .openerp .accepted , .text-core .text-tag .accepted { background : url(/web/static/src/img/icons/gtk-yes.png) no-repeat; + background-size : 11px 11px; } .openerp .declined , .text-core .text-tag .declined { background : url(/web/static/src/img/icons/gtk-no.png) no-repeat; + background-size : 11px 11px; }