summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 17:50:51 +0200
committerBjörn Geiger2011-09-08 17:50:51 +0200
commit60e126d60dad126cb70d7620ee5650a51c58fba3 (patch)
treeb90ea18e33af7e1d116cd2bd1dc2a0501a84d879 /application
parentkleine KOrrekturen (diff)
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-60e126d60dad126cb70d7620ee5650a51c58fba3.tar.gz
poolctrl-60e126d60dad126cb70d7620ee5650a51c58fba3.tar.xz
poolctrl-60e126d60dad126cb70d7620ee5650a51c58fba3.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php2
-rw-r--r--application/views/scripts/event/index.phtml9
2 files changed, 3 insertions, 8 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index ed1b08e..152fb07 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -510,7 +510,7 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- //$this->_redirect('/event/');
+ $this->_redirect('/event/');
}
} else {
$this->getRequest()->setParam('title', $event->getTitle());
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 3a9e8a9..b63bb10 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -4,7 +4,7 @@
</head>
<h1>Pool Control</h1>
-<?php echo $this->formButton('addEvent', 'Add Event', array(
+<!-- <?php echo $this->formButton('addEvent', 'Add Event', array(
'onclick' => 'self.location="/event/add/"',
'class' => 'addbutton'))
?>
@@ -17,7 +17,7 @@
echo "<option value='" . $p->getID() . "'>" . $p->getTitle() . "</option>";
}
} else echo '<option> No Pools </option>';?>
-</select></form>
+</select></form> -->
<div id='calendar' style='margin: 3em 0; font-size: 13px'></div>
@@ -132,17 +132,12 @@ var selected = true;
if (!confirm("Are you sure to add an Event from " + startDate + " to " + endDate + " ?")) {
$('#calendar').fullCalendar( 'unselect' );
}else {
- //var startDate = $.fullCalendar.formatDate(startDate, 'MM/dd/yyyy hh:mm');
- //var endDate = $.fullCalendar.formatDate(endDate, 'MM/dd/yyyy hh:mm');
self.location="/event/add/evstart/" + startDate + "/evend/" + endDate;
}
},
eventResize: function( event, dayDelta, minuteDelta, revertFunc ) {
-
- var length;
- var min = minuteDelta;
if (minuteDelta > 0) { length = 'longer';
}else{ length = 'shorter'; }