summaryrefslogtreecommitdiffstats
path: root/application/views/scripts
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-14 13:05:21 +0200
committerBjörn Geiger2011-09-14 13:05:21 +0200
commit0f75cea859b7a12bdb42f2de65946e7b7075b5bb (patch)
treed31cdee41a26c899e38830c8f19e29cedfbec8fa /application/views/scripts
parentshow Eventreports, Datenbankänderung (diff)
parentdialog changes (diff)
downloadpoolctrl-0f75cea859b7a12bdb42f2de65946e7b7075b5bb.tar.gz
poolctrl-0f75cea859b7a12bdb42f2de65946e7b7075b5bb.tar.xz
poolctrl-0f75cea859b7a12bdb42f2de65946e7b7075b5bb.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application/views/scripts')
-rwxr-xr-xapplication/views/scripts/event/index.phtml28
1 files changed, 4 insertions, 24 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 4f19efd..251899b 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -27,6 +27,7 @@ var isDroppable = true;
var overlappStart;
var overlappEnd;
+// poolSelectVal
var poolID;
@@ -53,7 +54,6 @@ var poolID;
} else {
self.location="/event/add/" }
}
- //poolSelectBoxVal/" + $("#poolselectbox option:selected").val();
function showCalendar() {
$("#calendar").show();
@@ -202,14 +202,6 @@ var poolID;
eventMouseout: function( event, jsEvent, view ) {
},
-
- /*
- * no use for this because element.bind('dblclick') in eventRender Function
- *
- eventDblclick: function( event, jsEvent, view ) {
- self.location = "/event/edit/eventID/" + event.id;
-
- },*/
eventClick: function( event, jsEvent, view ) {
@@ -218,6 +210,7 @@ var poolID;
setTimeout(function() {clickTmp = true} , 300);
eventSelected(event);
} else {
+ // this is the dblclick
self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
}
},
@@ -255,15 +248,12 @@ var poolID;
eventResize: function( event, dayDelta, minuteDelta, revertFunc ) {
- if (minuteDelta > 0) { length = 'longer';
- }else{ length = 'shorter'; }
-
$(function() {
$( "#defaultDialog" ).dialog({
autoOpen: false,
width: 600,
modal: true,
- title: event.title + " is now " + minuteDelta + " minutes " + length,
+ title: "The End Date of " + event.title + " is now " + event.end,
buttons: {
"Cancel": function() {
$(this).dialog("close");
@@ -410,11 +400,7 @@ var poolID;
}
/*
- * no need for this
- *
- element.bind('dblclick', function(){
- self.location = "/event/edit/eventID/" + event.id;
- })
+ * qtip problem
*
element.qtip({
content:
@@ -426,12 +412,6 @@ var poolID;
hide: 'mouseout'
});
*/
-
- /*
- * TO DO: Eventhandler löschen bei eventClick, da sich sonst das qtip bindet
- */
-
- /**/
if (view.name == 'agendaWeek') {