summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-24 13:08:08 +0200
committerBjörn Geiger2011-10-24 13:08:08 +0200
commit529ebaea168dfd96ddc4f623f8a2487ca3f7224f (patch)
tree9d7da96190a4e86dc07c743f5cabdb973708a708
parentverschiedenes (diff)
parentrunning icons fix (diff)
downloadpoolctrl-529ebaea168dfd96ddc4f623f8a2487ca3f7224f.tar.gz
poolctrl-529ebaea168dfd96ddc4f623f8a2487ca3f7224f.tar.xz
poolctrl-529ebaea168dfd96ddc4f623f8a2487ca3f7224f.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rwxr-xr-xapplication/views/scripts/event/index.phtml13
-rwxr-xr-xpublic/media/css/fullcalendar.css4
2 files changed, 7 insertions, 10 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 8908de7..83e4032 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -651,23 +651,24 @@ var dayClick = false;
},
eventRender: function(event, element, view) {
+
+ var eventTmp = element.attr("id", "evID_" + event.id);
// add running icons and handle editing of events
if(event.running == 0) {
// event will take place soon
- element.addClass("fc-event-time-0");
- //$('.fc-event-time').css('background','url(/media/img/down.png) top right no-repeat');
+ $(element).children().children(":first-child").addClass("fc-event-time-0");
} else if(event.running == 1) {
// event is running
- element.addClass("fc-event-time-1");
+ $(element).children().children(":first-child").addClass("fc-event-time-1");
event.editable = false;
} else if(event.running == 2) {
// event successfully
- element.addClass("fc-event-time-2");
+ $(element).children().children(":first-child").addClass("fc-event-time-2");
event.editable = false;
} else if(event.running == 3) {
// event failed
- element.addClass("fc-event-time-3");
+ $(element).children().children(":first-child").addClass("fc-event-time-3");
event.editable = false;
}
@@ -699,7 +700,7 @@ var dayClick = false;
if (view.name == 'agendaDay') {
element.find('.fc-event-title').append("<br/> Type: " + event.category + "<br/> Note: " + event.note + "<br/> Participants: " + event.participants);
}
- },
+ }
});
diff --git a/public/media/css/fullcalendar.css b/public/media/css/fullcalendar.css
index ac2feee..dc7b322 100755
--- a/public/media/css/fullcalendar.css
+++ b/public/media/css/fullcalendar.css
@@ -301,22 +301,18 @@ a.fc-event {
}
.fc-event-time-0 {
- padding: 0 1px;
background: url(/media/img/down.png) top right no-repeat;
}
.fc-event-time-1 {
- padding: 0 1px;
background: url(/media/img/play.gif) top right no-repeat;
}
.fc-event-time-2 {
- padding: 0 1px;
background: url(/media/img/default.png) top right no-repeat;
}
.fc-event-time-3 {
- padding: 0 1px;
background: url(/media/img/delete.png) top right no-repeat;
}