diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css index cdad3ae794f..f4744b78535 100644 --- a/addons/web_calendar/static/src/css/web_calendar.css +++ b/addons/web_calendar/static/src/css/web_calendar.css @@ -227,7 +227,7 @@ position:absolute; top:44px; width:600px; - overflow-y:auto; + overflow-y:hidden; overflow-x:hidden; } @@ -350,7 +350,7 @@ cursor:pointer; } -.openerp .dhx_cal_event .dhx_title{ +.openerp .dhx_cal_event .dhx_title { height:18px; border-bottom-style:solid; border-top-style:solid; @@ -364,6 +364,10 @@ font-size: 90%; -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; } +.openerp .dhx_cal_event .dhx_title { + /* fp request: hide the title in weekly/daily views */ + display: none; +} .openerp .dhx_cal_event .dhx_body{ border-width:0 1px 1px 1px; @@ -372,6 +376,11 @@ font-size:90%; line-height:9px; } +.openerp .dhx_cal_event .dhx_body { + /* fp request: hide the title in weekly/daily views */ + -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; + padding-top: 4px; +} .openerp .dhx_resize_denied .dhx_cal_event .dhx_footer{ cursor:default; diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 9f2c8602cab..d1d80b3fd87 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -107,7 +107,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({ scheduler.config.api_date = "%Y-%m-%d %H:%i"; scheduler.config.multi_day = true; //Multi day events are not rendered in daily and weekly views scheduler.config.start_on_monday = true; - scheduler.config.time_step = 15; + scheduler.config.time_step = 30; scheduler.config.scroll_hour = 8; scheduler.config.drag_resize = true; scheduler.config.drag_create = true;