[IMP] Improved web_calendar styling
bzr revid: fme@openerp.com-20111121161819-06ifl7vkof6kp3lu
This commit is contained in:
commit
fbbbf08bd0
|
@ -8,8 +8,9 @@
|
||||||
'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js',
|
'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js',
|
||||||
'static/src/js/calendar.js'
|
'static/src/js/calendar.js'
|
||||||
],
|
],
|
||||||
"css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css',
|
"css": [
|
||||||
'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css'
|
'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css',
|
||||||
|
'static/src/css/web_calendar.css'
|
||||||
],
|
],
|
||||||
'qweb' : [
|
'qweb' : [
|
||||||
"static/src/xml/*.xml",
|
"static/src/xml/*.xml",
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
After Width: | Height: | Size: 347 B |
Binary file not shown.
After Width: | Height: | Size: 356 B |
Binary file not shown.
After Width: | Height: | Size: 258 B |
Binary file not shown.
After Width: | Height: | Size: 260 B |
|
@ -112,6 +112,9 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
|
||||||
|
|
||||||
scheduler.init('openerp_scheduler', null, this.mode || 'month');
|
scheduler.init('openerp_scheduler', null, this.mode || 'month');
|
||||||
|
|
||||||
|
// Remove hard coded style attributes from dhtmlx scheduler
|
||||||
|
this.$element.find(".dhx_cal_navline div").removeAttr('style');
|
||||||
|
|
||||||
scheduler.detachAllEvents();
|
scheduler.detachAllEvents();
|
||||||
scheduler.attachEvent('onEventAdded', this.do_create_event);
|
scheduler.attachEvent('onEventAdded', this.do_create_event);
|
||||||
scheduler.attachEvent('onEventDeleted', this.do_delete_event);
|
scheduler.attachEvent('onEventDeleted', this.do_delete_event);
|
||||||
|
|
Loading…
Reference in New Issue