summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/forms/EventAdd.php3
-rw-r--r--application/views/scripts/event/index.phtml20
2 files changed, 16 insertions, 7 deletions
diff --git a/application/forms/EventAdd.php b/application/forms/EventAdd.php
index 828c68d..b803873 100644
--- a/application/forms/EventAdd.php
+++ b/application/forms/EventAdd.php
@@ -48,9 +48,6 @@ class Application_Form_EventAdd extends Zend_Form
{
$this->setName('EventAdd');
$this->setMethod('post');
-
- $evstart = $this->getRequest()->getParam('evstart');
- var_dump($evstart);
$this->addElement('text', 'title', array(
'filters' => array('StringTrim'),
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index fec85a4..ec180dd 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -60,7 +60,7 @@ var lastview;
var calendar = $('#calendar').fullCalendar({
header: {
- default: 'week',
+ default: 'week',
left: 'title',
center: 'prev,next today',
right: 'agendaWeek,agendaDay'
@@ -76,6 +76,7 @@ var lastview;
allowCalEventOverlap: false,
overlapEventsSeparate: false,
slotMinutes: 30,
+ defaultEventMinutes: 5,
events: "/event/eventlist",
@@ -152,15 +153,26 @@ var lastview;
eventRender: function(event, element, view) {
if (view.name == 'agendaWeek') {
element.qtip({
- content: 'Note: ' + event.note + '\n' +
- 'Participants: ' + event.participants
+ content:
+ 'Title: ' + event.title + '<br/>' +
+ 'Type: ' + event.category + '<br/>' +
+ 'Note: ' + event.note + '<br/>' +
+ 'Participants: ' + event.participants
});
}
if (view.name == 'agendaDay') {
//alert(options.slotMinutes);
//options['slotMinutes'] = 10;
//opt.slotMinutes = 10;
- element.find('.fc-event-title').append("<br/> Note: " + event.note + "<br/> Participants: " + event.participants);
+ //slotMinutes: 5,
+ element.qtip({
+ content:
+ 'Title: ' + event.title + '<br/>' +
+ 'Type: ' + event.category + '<br/>' +
+ 'Note: ' + event.note + '<br/>' +
+ 'Participants: ' + event.participants
+ });
+ element.find('.fc-event-title').append("<br/> Type: " + event.category + "<br/> Note: " + event.note + "<br/> Participants: " + event.participants);
}
},