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

[IMP] Upgrade fullCal library from 1.6.1 with the last 1.6.4 

bzr revid: jke@openerp.com-20131107135519-kmcmaoz969dhnrh2
This commit is contained in:
jke-openerp 2013-11-07 14:55:19 +01:00
parent e6baeb0ff1
commit 956c1efe05
4 changed files with 6084 additions and 5320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web_calendar/__openerp__.py
View File

@ -10,7 +10,7 @@ OpenERP Web Calendar view.
'depends': ['web'], 'depends': ['web'],
'js': [ 'js': [
'static/lib/fullcalendar/js/fullcalendar.js', 'static/lib/fullcalendar/js/fullcalendar.js',
'static/lib/fullcalendar/js/gcal.js', #'static/lib/fullcalendar/js/gcal.js',
'static/src/js/*.js' 'static/src/js/*.js'
], ],
'css': [ 'css': [

35
addons/web_calendar/static/lib/fullcalendar/css/fullcalendar.css
View File

@ -1,5 +1,5 @@
/*! /*!
* FullCalendar v1.6.1 Stylesheet * FullCalendar v1.6.4 Stylesheet
* Docs & License: http://arshaw.com/fullcalendar/ * Docs & License: http://arshaw.com/fullcalendar/
* (c) 2013 Adam Shaw * (c) 2013 Adam Shaw
*/ */
@ -102,10 +102,11 @@ html .fc,
.fc-content { .fc-content {
clear: both; clear: both;
zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */
} }
.fc-view { .fc-view {
width: 100%; /* needed for view switching (when view is absolute) */ width: 100%;
overflow: hidden; overflow: hidden;
} }
@ -250,10 +251,19 @@ html .fc,
/* Global Event Styles /* Global Event Styles
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-event-container > * {
z-index: 8;
}
.fc-event-container > .ui-draggable-dragging,
.fc-event-container > .ui-resizable-resizing {
z-index: 9;
}
.fc-event { .fc-event {
border: 1px solid #3a87ad; /* default BORDER color */ border: 1px solid #3a87ad; /* default BORDER color */
background-color: #3a87ad; /* default BACKGROUND color */ background-color: #3a87ad; /* default BACKGROUND color */
color: #fff; /* default TEXT color */ color: #fff; /* default TEXT color */
font-size: .85em; font-size: .85em;
cursor: default; cursor: default;
@ -577,3 +587,22 @@ table.fc-border-separate {
} }
@media print {
/* Events
-----------------------------------------------------*/
.fc-event {
background: #fff !important;
color: #000 !important;
}
/* for vertical events */
.fc-event-bg {
display: none !important;
}
.fc-event .ui-resizable-handle {
display: none !important;
}
}

11365
addons/web_calendar/static/lib/fullcalendar/js/fullcalendar.js
View File

File diff suppressed because it is too large Load Diff

2
addons/web_calendar/static/src/js/fullcalendar.js
View File

@ -403,6 +403,8 @@ openerp.web_calendar = function(instance) {
color_key = color_key[0]; color_key = color_key[0];
} }
r.color = this.get_color(color_key); r.color = this.get_color(color_key);
r.backgroundColor = this.get_color(color_key);
console.log(r.backgroundColor)
} }
return r; return r;
}, },