Author: nathangray
New Revision: 55765
URL: http://svn.stylite.de/viewvc/egroupware?rev=55765&view=rev
Log:
Calendar planner view shows event title instead of timespan for events > 8 hours
Modified:
trunk/calendar/js/et2_widget_event.js
trunk/calendar/templates/default/app.css
trunk/calendar/templates/pixelegg/app.css
— trunk/calendar/js/et2_widget_event.js (original)
+++ trunk/calendar/js/et2_widget_event.js Mon Apr 18 21:03:35 2016
@@ -402,9 +402,17 @@
}
visible_lines = Math.max(1,visible_lines);
-
this.div.toggleClass('calendar_calEventSmall',visible_lines < 4);
-
this.div
-
.attr('data-visible_lines', visible_lines);
-
if(this.getParent() && this.getParent().instanceOf(et2_calendar_daycol))
-
{
-
this.div.toggleClass('calendar_calEventSmall',visible_lines < 4);
-
this.div
-
.attr('data-visible_lines', visible_lines);
-
}
-
else if (this.getParent() && this.getParent().instanceOf(et2_calendar_planner_row))
-
{
-
// Less than 8 hours is small
-
this.div.toggleClass('calendar_calEventSmall',this.options.value.end_m - this.options.value.start_m < 480);
-
}
if(this.body.height() > this.div.height() - this.title.height() && visible_lines >= 4)
— trunk/calendar/templates/default/app.css (original)
+++ trunk/calendar/templates/default/app.css Mon Apr 18 21:03:35 2016
@@ -815,6 +815,12 @@
.calendar_calEventSmall .calendar_calEventBody {
padding-top: 4em;
}
+.calendar_plannerRowWidget .calendar_calEvent:not(.calendar_calEventSmall) .calendar_calTimespan {
- display: none;
+}
+.calendar_plannerRowWidget .calendar_calEvent:not(.calendar_calEventSmall) .calendar_calEventHeader .calendar_calEventTitle {
- display: inline;
+}
/* Events as displayed in a list, not sized by time */
.calendar_calTimeGridList .calendar_calTimeGridScroll {
— trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Mon Apr 18 21:03:35 2016
@@ -792,6 +792,12 @@
.calendar_calTimeGrid:not(.calendar_calTimeGridList) .calendar_calEventSmall .calendar_calEventBody {
padding-top: 4em;
}
+.calendar_plannerRowWidget .calendar_calEvent:not(.calendar_calEventSmall) .calendar_calTimespan {
- display: none;
+}
+.calendar_plannerRowWidget .calendar_calEvent:not(.calendar_calEventSmall) .calendar_calEventHeader .calendar_calEventTitle {
- display: inline;
+}
/* Events as displayed in a list, not sized by time /
.calendar_calTimeGridList .calendar_calTimeGridScroll {
overflow-y: hidden;
@@ -2532,3 +2538,5 @@
#calendar_merge {
margin: 9px 0 0 0;
}
+/ ########################################################################################
+/* * Calendar END */
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs