summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event/index.phtml
diff options
context:
space:
mode:
Diffstat (limited to 'application/views/scripts/event/index.phtml')
-rwxr-xr-xapplication/views/scripts/event/index.phtml8
1 files changed, 4 insertions, 4 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b85b17d..38ccf92 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -383,11 +383,11 @@ var dayClick = false;
// get conflicts-HTML Element
var cell = document.getElementById("conflicts");
var cfcell = document.getElementById("cfevents");
- var cf_ = document.getElementById("cf_");
// get conflicts
var returndata = jQuery.parseJSON(data);
// get conflict free events
var cfevents = returndata.cfevents;
+
//initialize eventNotDroppableDialog Dialog
$(function() {
@@ -397,7 +397,7 @@ var dayClick = false;
modal: true,
title: 'Resizing of ' + event.title + ' is not possible!',
buttons: {
- "Resolve Conflicts": function() {
+ "Resize Conflict-Free Events": function() {
$(this).dialog("close");
self.location="/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents;
},
@@ -523,9 +523,9 @@ var dayClick = false;
modal: true,
title: 'Dropping of ' + event.title + ' is not possible!',
buttons: {
- "Resolve Conflicts": function() {
+ "Drop Conflict-Free Events": function() {
$(this).dialog("close");
- $.post("/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents);
+ self.location="/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents;
},
"OK": function() {
$(this).dialog("close");