summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-08 16:11:58 +0200
committerSebastian Wagner2011-09-08 16:11:58 +0200
commita76c4d11a921ce4061afd703f8a8fc709c49d8dd (patch)
treee24b9a11a7ebda85e5a75487641194b1c7ff6f17 /application
parentselection and addEvent fix (diff)
downloadpoolctrl-a76c4d11a921ce4061afd703f8a8fc709c49d8dd.tar.gz
poolctrl-a76c4d11a921ce4061afd703f8a8fc709c49d8dd.tar.xz
poolctrl-a76c4d11a921ce4061afd703f8a8fc709c49d8dd.zip
clean up
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php1
-rw-r--r--application/views/scripts/event/index.phtml14
2 files changed, 13 insertions, 2 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 3ecd6d7..5f8ea47 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -595,6 +595,7 @@ class EventController extends Zend_Controller_Action
'allDay' => false,
'color' => $color,
'textColor' => $textColor,
+ 'borderColor' => $color,
)
);
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 2ca3194..eb62604 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -25,6 +25,12 @@
$(document).ready(function() {iniCalendar();});
var lastview;
+var selected = true;
+
+ function eventSelected(event) {
+ if (selected) { event.borderColor = 'black';
+ }
+ }
function showCalendar() {
$("#calendar").show();
@@ -101,8 +107,12 @@ var lastview;
eventClick: function( event, jsEvent, view ) {
$('#calendar').dblclick(function() { self.location = "/event/edit/eventID/" + event.id;});
- $('#calendar').unbind(event);
-
+ //$('#calendar').unbind(event);
+
+ //eventSelected(event);
+ event.borderColor = 'black';
+ alert(event.borderColor);
+
$(document).keydown(function (e) {
if (e.keyCode == 8 || e.keyCode == 46) {
if (confirm("Are you sure to delete " + event.title + " ?")) {