summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebastian wagner2011-09-12 17:03:13 +0200
committersebastian wagner2011-09-12 17:03:13 +0200
commit3dd6bcef8a3b2cacf4c2dd0bab3954b072178329 (patch)
tree8f41c09e2d1e565eac69ded1d1e3f6dc2a128808
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-3dd6bcef8a3b2cacf4c2dd0bab3954b072178329.tar.gz
poolctrl-3dd6bcef8a3b2cacf4c2dd0bab3954b072178329.tar.xz
poolctrl-3dd6bcef8a3b2cacf4c2dd0bab3954b072178329.zip
some changes
-rwxr-xr-xapplication/controllers/EventController.php2
-rwxr-xr-xapplication/views/scripts/event/index.phtml11
-rwxr-xr-xpublic/media/js/fullcalendar.js2
3 files changed, 10 insertions, 5 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 95f0389..12b2f74 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -348,7 +348,7 @@ class EventController extends Zend_Controller_Action
$params = $this->getRequest()->getParams();
$this->view->params = $params;
$this->view->addForm = $addForm;
- $this->view->poolSelectBoxVal = $this->poolVal;
+ //$this->view->poolSelectBoxVal = $this->poolVal;
}
public function deleteAction()
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 9c1b2a5..097f6ad 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -36,7 +36,7 @@ var clickTmp = true;
eventColor.color = event.borderColor;
event.borderColor = 'black';
$('#calendar').fullCalendar("rerenderEvents");
- $('#calendar').unbind('eventClick');
+ //$('#calendar').unbind('eventClick');
}
// change view to addEvent
@@ -183,7 +183,8 @@ var clickTmp = true;
allowCalEventOverlap: false,
overlapEventsSeparate: false,
slotMinutes: 30,
- defaultEventMinutes: 30,
+ defaultEventMinutes: 20,
+
dayClick: function( date, allDay, jsEvent, view ) {
selectedDate = date;
@@ -384,6 +385,12 @@ var clickTmp = true;
eventRender: function(event, element, view) {
+ //element.resizable = false;
+ if(event.category == 'Boot' || event.category == 'Shutdown') {
+ element.removeClass('ui-resizable-resizing')
+ }
+
+
/*
* no need for this
*
diff --git a/public/media/js/fullcalendar.js b/public/media/js/fullcalendar.js
index 2152451..4b8c7d4 100755
--- a/public/media/js/fullcalendar.js
+++ b/public/media/js/fullcalendar.js
@@ -26,8 +26,6 @@ var defaults = {
},
weekends: true,
- // editing
- // editable: false,
// disableDragging: false,
// disableResizing: false,