diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 77763db976cf471972c3bde2bd5463201593c1cd..8bd5f4acc29469a14edd14310d5684c9f53eee29 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -37,6 +37,10 @@
#oneweekview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
#fourweeksview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;overflow: hidden;}
#onemonthview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
+#listview {margin: 0; padding: 10px; background: #EEEEEE;}
+#listview #more_before, #listview #more_after {border: 1px solid #1a1a1a; width:25em;padding: 3px;text-align: center;}
+#listview #events {width:25em;padding: 4px;}
+#listview #events .day {width:auto;padding-left:10px;border-bottom: 2px solid #EEEEEE;text-align:left;}
#fourweeksview .calw{vertical-align: middle;text-align: center;width: 50px;}
#sysbox{display: none;}
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index a4c3f2c53aa6f53671a55359f5c62e11adfc845b..928b1e0628258cbcff819bbc81c6dc5bd00508ca 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -183,14 +183,14 @@ Calendar={
this.updateView();
},
updateDate:function(direction){
- if(direction == "forward") {
+ if(direction == 'forward' && this.current.forward) {
this.current.forward();
if(Calendar.Date.current.getMonth() == 11){
this.loadEvents(Calendar.Date.current.getFullYear() + 1);
}
this.updateView();
}
- if(direction == "backward") {
+ if(direction == 'backward' && this.current.backward) {
this.current.backward();
if(Calendar.Date.current.getMonth() == 0){
this.loadEvents(Calendar.Date.current.getFullYear() - 1);
@@ -220,21 +220,28 @@ Calendar={
}
});
},
- createEventsForDate:function(date, week){
+ getEventsForDate:function(date){
var day = date.getDate();
var month = date.getMonth();
var year = date.getFullYear();
if( typeof (this.events[year]) == "undefined") {
- return;
+ this.loadEvents(year);
+ return false;
}
if( typeof (this.events[year][month]) == "undefined") {
- return;
+ return false;
}
if( typeof (this.events[year][month][day]) == "undefined") {
+ return false;
+ }
+ return this.events[year][month][day];
+ },
+ createEventsForDate:function(date, week){
+ events = this.getEventsForDate(date);
+ if (!events) {
return;
}
var weekday = (date.getDay()+6)%7;
- events = this.events[year][month][day];
if( typeof (events["allday"]) != "undefined") {
var eventnumber = 1;
var eventcontainer = this.current.getEventContainer(week, weekday, "allday");
@@ -597,21 +604,62 @@ Calendar={
},
},
List:{
- forward:function(){
- Calendar.Date.forward_day();
- },
- backward:function(){
- Calendar.Date.backward_day();
- },
removeEvents:function(){
- $("#listview").html("");
+ this.eventContainer = $('#listview #events').html('');
+ this.startdate = new Date();
+ this.enddate = new Date();
+ this.enddate.setDate(this.enddate.getDate());
},
renderCal:function(){
- $("#datecontrol_date").val(Calendar.UI.formatDayShort() + Calendar.space + Calendar.Date.current.getDate() + Calendar.space + Calendar.UI.formatMonthShort() + Calendar.space + Calendar.Date.current.getFullYear());
+ var today = new Date();
+ $('#datecontrol_date').val(this.formatDate(Calendar.Date.current));
},
showEvents:function(){
+ this.renderMoreBefore();
+ this.renderMoreAfter();
+ },
+ formatDate:function(date){
+ return Calendar.UI.formatDayShort(date.getDay())
+ + Calendar.space
+ + date.getDate()
+ + Calendar.space
+ + Calendar.UI.formatMonthShort(date.getMonth())
+ + Calendar.space
+ + date.getFullYear();
+ },
+ createDay:function(date) {
+ return $(document.createElement('div'))
+ .addClass('day')
+ .html(this.formatDate(date));
+ },
+ renderMoreBefore:function(){
+ var date = Calendar.UI.List.startdate;
+ for(var i = 0; i <= 13; i++) {
+ if (Calendar.UI.getEventsForDate(date)) {
+ Calendar.UI.List.dayContainer=Calendar.UI.List.createDay(date);
+ Calendar.UI.createEventsForDate(date, 0);
+ Calendar.UI.List.eventContainer.prepend(Calendar.UI.List.dayContainer);
+ }
+ date.setDate(date.getDate()-1);
+ }
+ var start = Calendar.UI.List.formatDate(date);
+ $('#listview #more_before').html(String(Calendar.UI.more_before).replace('{startdate}', start));
+ },
+ renderMoreAfter:function(){
+ var date = Calendar.UI.List.enddate;
+ for(var i = 0; i <= 13; i++) {
+ if (Calendar.UI.getEventsForDate(date)) {
+ Calendar.UI.List.dayContainer=Calendar.UI.List.createDay(date);
+ Calendar.UI.createEventsForDate(date, 0);
+ Calendar.UI.List.eventContainer.append(Calendar.UI.List.dayContainer);
+ }
+ date.setDate(date.getDate()+1);
+ }
+ var end = Calendar.UI.List.formatDate(date);
+ $('#listview #more_after').html(String(Calendar.UI.more_after).replace('{enddate}', end));
},
getEventContainer:function(week, weekday, when){
+ return this.dayContainer;
},
createEventLabel:function(event){
var time = '';
@@ -624,6 +672,10 @@ Calendar={
}
}
}
+$(document).ready(function(){
+ $('#listview #more_before').click(Calendar.UI.List.renderMoreBefore);
+ $('#listview #more_after').click(Calendar.UI.List.renderMoreAfter);
+});
//event vars
Calendar.UI.loadEvents(Calendar.Date.current.getFullYear());
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 0961390b212cfc6f67fd1b212a5f09f9fcf120c1..768c1a6486a886c0a17a22e6b9da3be44899856f 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -35,6 +35,8 @@ $weekdays = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'satur
Calendar.UI.monthshort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
Calendar.UI.cw_label = "<?php echo $l->t("Week");?>";
Calendar.UI.cws_label = "<?php echo $l->t("Weeks");?>";
+ Calendar.UI.more_before = String('<?php echo $l->t('More before {startdate}') ?>');
+ Calendar.UI.more_after = String('<?php echo $l->t('More after {enddate}') ?>');
</script>
<div id="sysbox"></div>
<div id="controls">
@@ -153,7 +155,9 @@ $weekdays = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'satur
</table>
</div>
<div id="listview">
-
+ <div id="more_before"></div>
+ <div id="events"></div>
+ <div id="more_after"></div>
</div>
</div>
<!-- Dialogs -->