summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event
diff options
context:
space:
mode:
Diffstat (limited to 'application/views/scripts/event')
-rwxr-xr-xapplication/views/scripts/event/index.phtml29
1 files changed, 15 insertions, 14 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 7b8cfe7..acbca58 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -2,7 +2,7 @@
<div id='calendar'
style='margin: 3em 0; font-size: 13px'></div>
-
+
<script type="text/javascript">
$(document).ready(function() {iniCalendar();});
@@ -288,7 +288,7 @@ var dayClick = false;
},
"Edit just this Event": function() {
$(this).dialog("close");
- self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ self.location = "/event/edit/eventID/" + event.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
},
"Edit all Events": function() {
$(this).dialog("close");
@@ -302,7 +302,7 @@ var dayClick = false;
});
});
$( "#eventEditWdhDialog" ).dialog('open');
- } else self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ } else self.location = "/event/edit/eventID/" + event.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
} else if (!$.get("/event/checkright/rightShortcut/er")) {
$( "#errorRightsDialog" ).dialog('open');
} else $( "#errorEditImmediate" ).dialog('open');
@@ -865,7 +865,7 @@ var dayClick = false;
},
"Edit just this Event": function() {
$(this).dialog("close");
- self.location = "/event/edit/eventID/" + selectedEvent.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ self.location = "/event/edit/eventID/" + selectedEvent.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
},
"Edit all Events": function() {
$(this).dialog("close");
@@ -879,7 +879,7 @@ var dayClick = false;
});
});
$( "#eventEditWdhDialog" ).dialog('open');
- } else if (selectedEvent.repeat == 0 && selectedEvent.immediate == 0) self.location = "/event/edit/eventID/" + selectedEvent.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ } else if ( ( selectedEvent.repeat == 0 || selectedEvent.repeat == 2 ) && selectedEvent.immediate == 0) self.location = "/event/edit/eventID/" + selectedEvent.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
else if (!$.get("/event/checkright/rightShortcut/er")) {
$( "#errorRightsDialog" ).dialog('open');
} else $( "#errorEditImmediate" ).dialog('open');
@@ -1061,21 +1061,21 @@ selected one?</p>
<!-- eventNotDroppableDialog -->
<div id="eventNotDroppableDialog" style="display: none">
-<p>You can´t drop this Event here! There exists at least one collision between two events.</p>
+<p>You can´t drop this Event here! There exists at least one collision
+between two events.</p>
<p>Please choose another position</p>
<div id="accordion">
- <h3><a href="#">Show conflicts</a></h3>
- <div id="conflicts">
- </div>
- <h3><a href="#">Show conflict-free Events</a></h3>
- <div id="cfevents">
- </div>
+<h3><a href="#">Show conflicts</a></h3>
+<div id="conflicts"></div>
+<h3><a href="#">Show conflict-free Events</a></h3>
+<div id="cfevents"></div>
</div>
</div>
<!-- eventNotDroppableDialog2 -->
<div id="eventNotDroppableDialog2" style="display: none">
-<p>You can´t drop this Event here! There exists at least one collision between two events.</p>
+<p>You can´t drop this Event here! There exists at least one collision
+between two events.</p>
<p>Please choose another position</p>
</div>
@@ -1105,4 +1105,5 @@ selected one?</p>
</div>
<!-- add loading image -->
-<IMG id="progress" class="fc-progress" src="/media/img/loader.gif"/> \ No newline at end of file
+<IMG
+ id="progress" class="fc-progress" src="/media/img/loader.gif" />