upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Update calendar event label creation

Browse source
This commit is contained in:
Bart Visscher 2011-09-03 14:05:20 +02:00
parent 471b543c8f
commit 2e2bdb449f
3 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/calendar/css/style.css
View file

@ -47,6 +47,7 @@
.dateinfo {height: 20px;width: 100%; overflow: hidden; margin-top: 0; padding: 0; font-size: 12px;background: #F7F7F7;}
.events {width: 100%; margin: 0; padding: 0;}
.calendar_row {height: 20px; text-align: center;background: #ffffff;}
#oneweekview .calendar_row {width: 13.5%;}
.calendar_time {height: 20px; width: 50px; text-align:right;background: #ffffff;}
.day {text-align: center; background: #ffffff; margin: 0; padding: 0; vertical-align: top; width: 14%; height: 22%;}
.weekend .events{text-align: center;margin: 0; padding: 0;vertical-align: top;background: #F3F3F3; width: 100%; }

77
apps/calendar/js/calendar.js
View file

@ -245,8 +245,7 @@ Calendar={
var eventnumber = 1;
var eventcontainer = this.current.getEventContainer(week, weekday, "allday");
while( typeof (events["allday"][eventnumber]) != "undefined") {
var newp = this.current.createEventBox(events, week, weekday, "allday", eventnumber);
eventcontainer.append(newp);
this.addEventLabel(eventcontainer, events['allday'][eventnumber]);
eventnumber++;
}
}
@ -255,13 +254,18 @@ Calendar={
var eventnumber = 1;
var eventcontainer = this.current.getEventContainer(week, weekday, time);
while( typeof (events[time][eventnumber]) != "undefined") {
var newp = this.current.createEventBox(events, week, weekday, time, eventnumber);
eventcontainer.append(newp);
this.addEventLabel(eventcontainer, events[time][eventnumber]);
eventnumber++;
}
}
}
},
addEventLabel:function(eventcontainer, event){
var event_holder = this.current.createEventLabel(event)
.addClass('event')
.data('event_info', event);
eventcontainer.append(event_holder);
},
OneDay:{
forward:function(){
Calendar.Date.forward_day();
@ -294,12 +298,13 @@ Calendar={
getEventContainer:function(week, weekday, when){
return $("#onedayview ." + when);
},
createEventBox:function(day_events, week, weekday, when, eventnumber){
var newp = document.createElement("p");
newp.id = "onedayview_" + when + "_" + eventnumber;
newp.className = "onedayview_event";
newp.innerHTML = day_events[when][eventnumber]["description"];
return newp;
createEventLabel:function(event){
var time = '';
if (!event['allday']){
time = '<strong>' + event['startdate'][3] + ':' + event['startdate'][4] + ' - ' + event['enddate'][3] + ':' + event['enddate'][4] + '</strong> ';
}
return $(document.createElement('p'))
.html(time + event['description'])
},
},
OneWeek:{
@ -352,12 +357,13 @@ Calendar={
getEventContainer:function(week, weekday, when){
return $("#oneweekview ." + Calendar.UI.weekdays[weekday] + "." + when);
},
createEventBox:function(day_events, week, weekday, when, eventnumber){
var newp = document.createElement("p");
newp.id = "oneweekview_" + Calendar.UI.weekdays[weekday] + "_" + when + "_" + eventnumber;
newp.className = "oneweekview_event";
newp.innerHTML = day_events[when][eventnumber]["description"];
return newp;
createEventLabel:function(event){
var time = '';
if (!event['allday']){
time = '<strong>' + event['startdate'][3] + ':' + event['startdate'][4] + ' - ' + event['enddate'][3] + ':' + event['enddate'][4] + '</strong> ';
}
return $(document.createElement('p'))
.html(time + event['description'])
},
generateDates:function(){
var generate_dayofweek = oc_cal_dayofweek;
@ -485,12 +491,13 @@ Calendar={
getEventContainer:function(week, weekday, when){
return $("#fourweeksview .week_" + week + " .day." + Calendar.UI.weekdays[weekday] + " .events");
},
createEventBox:function(day_events, week, weekday, when, eventnumber){
var newp = document.createElement("p");
newp.id = "fourweeksview_" + Calendar.UI.weekdays[weekday] + "_" + week + "_" + when + "_" + eventnumber;
newp.className = "fourweeksview_event";
newp.innerHTML = day_events[when][eventnumber]["description"];
return newp;
createEventLabel:function(event){
var time = '';
if (!event['allday']){
time = '<strong>' + event['startdate'][3] + ':' + event['startdate'][4] + '</strong> ';
}
return $(document.createElement('p'))
.html(time + event['description'])
},
generateDates:function(){
var generate_dayofweek = oc_cal_dayofweek;
@ -628,12 +635,13 @@ Calendar={
getEventContainer:function(week, weekday, when){
return $("#onemonthview .week_" + week + " .day." + Calendar.UI.weekdays[weekday] + " .events");
},
createEventBox:function(day_events, week, weekday, when, eventnumber){
var newp = document.createElement("p");
newp.id = "onemonthview_" + Calendar.UI.weekdays[weekday] + "_" + week + "_" + when + "_" + eventnumber;
newp.className = "onemonthview_event";
newp.innerHTML = day_events[when][eventnumber]["description"];
return newp;
createEventLabel:function(event){
var time = '';
if (!event['allday']){
time = '<strong>' + event['startdate'][3] + ':' + event['startdate'][4] + '</strong> ';
}
return $(document.createElement('p'))
.html(time + event['description'])
},
generateDates:function(){
var generate_dayofweek = oc_cal_dayofweek;
@ -718,12 +726,13 @@ Calendar={
},
getEventContainer:function(week, weekday, when){
},
createEventBox:function(day_events, week, weekday, when, eventnumber){
var newp = document.createElement("p");
newp.id = "listview_" + Calendar.UI.weekdays[weekday] + "_" + when + "_" + eventnumber;
newp.className = "listview_event";
newp.innerHTML = day_events[when][eventnumber]["description"];
return newp;
createEventLabel:function(event){
var time = '';
if (!event['allday']){
time = event['startdate'][3] + ':' + event['startdate'][4] + ' - ' + event['enddate'][3] + ':' + event['enddate'][4] + ' ';
}
return $(document.createElement('p'))
.html(time + event['description'])
},
}
}

8
apps/calendar/templates/part.getcal.php
View file

@ -26,9 +26,13 @@ foreach($events as $event)
{
$return_event[$prop] = $event[$prop];
}
$return_event['startdate'] = $start_dt->format('Y-m-d H:i');
$return_event['enddate'] = $end_dt->format('Y-m-d H:i');
$return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
$return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
$return_event['description'] = $event['summary'];
if ($hour == 'allday')
{
$return_event['allday'] = true;
}
if (isset($return_events[$year][$month][$day][$hour]))
{
$return_events[$year][$month][$day][$hour][] = $return_event;