summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-08-01 16:15:07 +0200
committerSebastian Wagner2011-08-01 16:15:07 +0200
commitc473a9cbafaaa330d3ebfab0593256f1b0471c2e (patch)
treee0ebb6c3f9d9cac2c4397470bccedee036c67f25
parentsome calendar changes (diff)
downloadpoolctrl-c473a9cbafaaa330d3ebfab0593256f1b0471c2e.tar.gz
poolctrl-c473a9cbafaaa330d3ebfab0593256f1b0471c2e.tar.xz
poolctrl-c473a9cbafaaa330d3ebfab0593256f1b0471c2e.zip
addEvent on calendarclick
-rw-r--r--application/views/scripts/event/index.phtml16
-rw-r--r--gearman/controllerWorker/ControllerWorker/Boot.java2
2 files changed, 3 insertions, 15 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 5f44908..e94ebd9 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -76,20 +76,8 @@ $(document).ready(function() {iniCalendar();});
events: "calendarEvents.php",
- select: function(start, end, allDay) {
- var title = prompt('Event Title:');
- if (title) {
- calendar.fullCalendar('renderEvent',
- {
- title: title,
- start: start,
- end: end,
- allDay: allDay
- },
- true // make the event "stick"
- );
- }
- calendar.fullCalendar('unselect');
+ dayClick: function(date, allDay, jsEvent, view) {
+ self.location="/event/add/";
},
eventClick: function(event, element) {
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 1d79366..800b2c6 100644
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -154,7 +154,7 @@ public class Boot extends Thread {
String result = ByteUtils.fromUTF8Bytes(wolJobRes
.getResults());
- if (result.equals("Magic packet send.")) {
+ if (result.equals("Magic packet send")) {
System.out
.println(macAddress + "Magic packet send");
status.put(clientID, 5); // magic packet send