From bce4e227b5e30c3132d61e296fa0933d811a2512 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 8 Sep 2014 14:08:40 +0200
Subject: [PATCH] [FIX] Calendar: fix some display issues

* render the invitation widget inside oe_application
* override the margin of oe_right in order to display the two div on the same line
---
 addons/calendar/static/src/js/base_calendar.js   | 2 +-
 addons/calendar/static/src/xml/base_calendar.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index ee91e189359..411a5086f31 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -223,7 +223,7 @@ function reload_favorite_list(result) {
             }
         },
         open_invitation_form : function(invitation){
-            this.$el.html(QWeb.render('invitation_view', {'invitation': JSON.parse(invitation)}));
+            $('.oe_application').html(QWeb.render('invitation_view', {'invitation': JSON.parse(invitation)}));
         },
         redirect_meeting_view : function(db, action, meeting_id, view){
             var self = this;
diff --git a/addons/calendar/static/src/xml/base_calendar.xml b/addons/calendar/static/src/xml/base_calendar.xml
index 0939d65b609..31721b238ae 100644
--- a/addons/calendar/static/src/xml/base_calendar.xml
+++ b/addons/calendar/static/src/xml/base_calendar.xml
@@ -33,7 +33,7 @@
     
     <t t-name="invitation_view">
         <div class='invitation_block well' style='width:50%; margin:auto; margin-top : 30px;'>
-            <div class="oe_right"><b><t t-esc="invitation['current_attendee'].cn"/> (<t t-esc="invitation['current_attendee'].email"/>)</b></div>
+            <div class="oe_right" style="margin-left:0px"><b><t t-esc="invitation['current_attendee'].cn"/> (<t t-esc="invitation['current_attendee'].email"/>)</b></div>
             <div class="oe_left">
                 <img class="cal_inline cal_image" src='/web/binary/company_logo' />
             </div>