summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 17:22:31 +0200
committerBjörn Geiger2011-09-08 17:22:31 +0200
commit70f126db239b52af9aa7a5dce1a157553db9077c (patch)
tree94052b475734c1ecbb2f0dff85388137107ac7cb
parentimmediate events (diff)
parentadd some functions (diff)
downloadpoolctrl-70f126db239b52af9aa7a5dce1a157553db9077c.tar.gz
poolctrl-70f126db239b52af9aa7a5dce1a157553db9077c.tar.xz
poolctrl-70f126db239b52af9aa7a5dce1a157553db9077c.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rw-r--r--application/views/scripts/event/index.phtml44
-rw-r--r--public/media/css/fullcalendar.css5
2 files changed, 19 insertions, 30 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 536c857..3a9e8a9 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -32,6 +32,18 @@ var selected = true;
}
}
+ function pressKey(event) {
+ $(document).keydown(function (e) {
+ if (e.keyCode == 8 || e.keyCode == 46) {
+ if (confirm("Are you sure to delete " + event.title + " ?")) {
+ self.location="/event/delete/eventID/" + event.id;
+ $('#calendar').fullCalendar( 'removeEvents', event.id );
+ $('#calendar').fullCalendar( 'rerenderEvents' );
+ }else{ self.location = "/event/"; }
+ }
+ });
+ }
+
function showCalendar() {
$("#calendar").show();
}
@@ -107,36 +119,12 @@ var selected = true;
eventClick: function( event, jsEvent, view ) {
$('#calendar').dblclick(function() { self.location = "/event/edit/eventID/" + event.id;});
- //$('#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 + " ?")) {
- self.location="/event/delete/eventID/" + event.id;
- $('#calendar').fullCalendar( 'removeEvents', event.id );
- $('#calendar').fullCalendar( 'rerenderEvents' );
- }else{ self.location = "/event/"; }
- }
- });
+ eventSelected(event);
+ pressKey(event);
+
return false;
-
- /*
- *
- * TO DO: Selection eines Events per Klick sichtbar machen
- *
- if(event.color == 'red') {
- event.color = 'rgb(112,0,0)';
- }else if(event.color == 'green') {
- event.color = 'rgb(0,90,0)';
- }else if(event.color == 'yellow') {
- event.color = '';
- }else if(event.color == 'blue') {
- event.color = 'rgb(0,0,112)';
- }*/
+
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
diff --git a/public/media/css/fullcalendar.css b/public/media/css/fullcalendar.css
index 3a3ee5b..7dbf9bc 100644
--- a/public/media/css/fullcalendar.css
+++ b/public/media/css/fullcalendar.css
@@ -57,6 +57,7 @@ html .fc,
.fc-header-title {
display: inline-block;
vertical-align: top;
+ font-size: x-small;
}
.fc-header-title h2 {
@@ -261,7 +262,7 @@ html .fc,
.fc-event {
border-style: solid;
border-width: 0;
- font-size: .85em;
+ font-size: 0.85em;
cursor: default;
}
@@ -289,7 +290,7 @@ a.fc-event {
width: 100%;
height: 100%;
border-style: solid;
- border-width: 0;
+ border-width: 2px;
overflow: hidden;
}