odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Simon Lejeune 2014-09-08 14:08:40 +02:00
parent 74aa7406bf
commit bce4e227b5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/calendar/static/src/js/base_calendar.js
View File

@ -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;

2
addons/calendar/static/src/xml/base_calendar.xml
View File

@ -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>