Mohammed Shekha(Open ERP) has proposed merging
lp:~openerp-dev/openobject-client-web/6.0-bug-16744-msh into
lp:openobject-client-web/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-16744-msh/+merge/71190
Hello,
Calendar view has the code for the more button when limit of meeting reach at
certain level, but it was not visible because the text on calendar view
container overlap it, so changed the code accordingly so that more button
should be visible, as i changed the css to white-space: nowrap so title of
meeting in container will not be completely visible so that's set title of the
meeting as a tooltip and also changed the js file to show only five meeting in
event container.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-16744-msh/+merge/71190
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-client-web/6.0-bug-16744-msh.
=== modified file 'addons/view_calendar/static/css/calendar.css'
--- addons/view_calendar/static/css/calendar.css 2010-12-16 07:23:41 +0000
+++ addons/view_calendar/static/css/calendar.css 2011-08-11 12:17:25 +0000
@@ -118,7 +118,7 @@
padding: 2px;
font-weight: 600;
line-height: 1em;
- white-space: pre-wrap;
+ white-space: nowrap;
overflow: hidden;
cursor: pointer;
border-radius: 5px;
=== modified file 'addons/view_calendar/static/javascript/calendar_month.js'
--- addons/view_calendar/static/javascript/calendar_month.js 2011-02-03 11:17:11 +0000
+++ addons/view_calendar/static/javascript/calendar_month.js 2011-08-11 12:17:25 +0000
@@ -525,11 +525,11 @@
if (container.events.length > 0) {
e = container.events[container.events.length - 1];
- if (e.row > 5) {
+ if (e.row > 4) {
appendChildNodes(element, DIV({'class': 'calEventInfo'},
MochiKit.DOM.A({'href':'javascript: void(0)',
'onclick': "getCalendar('" + dt + "', 'day')"},
- '+ (' + (e.row - 5) + ') more...')));
+ '+ (' + (e.row - 3) + ') more...')));
}
}
}
@@ -614,7 +614,7 @@
adjust : function() {
- if (this.row > 5) {
+ if (this.row > 4) {
hideElement(this.element);
return;
}
=== modified file 'addons/view_calendar/widgets/templates/month.mako'
--- addons/view_calendar/widgets/templates/month.mako 2010-12-02 17:08:21 +0000
+++ addons/view_calendar/widgets/templates/month.mako 2011-08-11 12:17:25 +0000
@@ -52,7 +52,7 @@
nDaySpan="${evt.dayspan}"
dtStart="${str(evt.starts)}"
dtEnd="${str(evt.ends)}"
- title="${evt.description}"
+ title="${evt.title}"
nCreationDate="${evt.create_date}"
nCreationId="${evt.create_uid}"
nWriteDate="${evt.write_date}"
@@ -65,7 +65,7 @@
nDaySpan="${evt.dayspan}"
dtStart="${str(evt.starts)}"
dtEnd="${str(evt.ends)}"
- title="${evt.description}"
+ title="${evt.title}"
nCreationDate="${evt.create_date}"
nCreationId="${evt.create_uid}"
nWriteDate="${evt.write_date}"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
