summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php5
-rw-r--r--application/layouts/default.phtml3
-rw-r--r--application/views/scripts/event/index.phtml36
3 files changed, 21 insertions, 23 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 6b9946b..93819c0 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -625,7 +625,7 @@ class EventController extends Zend_Controller_Action
foreach ($eventList as $event){
if($event->getPbs_poolID() == $poolID) {
- if($event->getCategory() == 1){$color= 'green' AND $textColor = 'white' AND $category= 'Lecture';}
+ if($event->getCategory() == 1){$color = 'green' AND $textColor = 'white' AND $category= 'Lecture';}
else if ($event->getCategory() == 2){$color = 'yellow' AND $textColor = 'black' AND $category = 'Maintenance';}
else if ($event->getCategory() == 3){$color = 'blue' AND $textColor = 'white' AND $category = 'Boot';}
else if ($event->getCategory() == 4){$color = 'red' AND $textColor = 'white' AND $category = 'Shutdown';}
@@ -643,10 +643,11 @@ class EventController extends Zend_Controller_Action
'bootosID' => $event->getPbs_bootosID(),
'allDay' => false,
'color' => $color,
- 'textColor' => $textColor,
+ 'textColor' => $textColor,
'borderColor' => $color,
'selected' => false,
'repeat' => $event->getRepeat(),
+ 'opacity' => 1,
)
);
}
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml
index 138ca5b..c3a6006 100644
--- a/application/layouts/default.phtml
+++ b/application/layouts/default.phtml
@@ -23,7 +23,8 @@ echo $this->headScript()."\n";
src='/media/js/jquery-ui-timepicker-addon.js'></script>
<script type="text/javascript" src='/media/js/script.js'></script>
<!-- files for calendar -->
-<script type='text/javascript' src='/media/js/fullcalendar.min.js'></script>
+<!-- <script type='text/javascript' src='/media/js/fullcalendar.min.js'></script> -->
+<script type='text/javascript' src='/media/js/fullcalendar.js'></script>
<script type="text/javascript"
src='/media/js/jquery.qtip-1.0.0-rc3.min.js'></script>
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index a276ecb..3bb0fe3 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -48,21 +48,15 @@ var selectedEvent = null; // keydown variable
}
- function setOpacity(type) {
- //alert(type);
-
+ function setOpacity(type, value) {
var events = $('#calendar').fullCalendar( 'clientEvents' , function(event) {
if(event.category == type) {
- return true;}
+ event.opacity = value;
+ }
return false;
});
- /*for( var i in events ) {
- alert(events[i].title);
- }*/
- //$('#calendar').fullCalendar( 'rerenderEvents' );
+ $('#calendar').fullCalendar( 'rerenderEvents' );
}
-
-
// fetch all poolevents of the selected #poolselectbox value
function fetchPoolEvents(element) {
@@ -75,6 +69,7 @@ var selectedEvent = null; // keydown variable
$(document).keydown(function (e) {
if (e.keyCode == 8 || e.keyCode == 46 && selectedEvent.selected == true) {
if(selectedEvent.repeat == 0) {
+
// dialog for deleting selected event
$(function() {
$( "#eventDeleteDialog" ).dialog({
@@ -180,8 +175,9 @@ var selectedEvent = null; // keydown variable
*event.dblclick(alert('test'););
*$('#calendar').dblclick(function() { self.location = "/event/edit/eventID/" + event.id;});
*/
+ $(this).css('opacity', .5);
- eventSelected(event);
+ //eventSelected(event);
},
@@ -332,7 +328,7 @@ var selectedEvent = null; // keydown variable
show: 'mouseover',
hide: 'mouseout'
});
- */
+ */
if (view.name == 'agendaWeek') {
@@ -373,8 +369,8 @@ var selectedEvent = null; // keydown variable
} else {
if($(this).hasClass("fc-state-active")) {
$(this).removeClass("fc-state-active");
- setOpacity('Lecture');
- } else {$(this).addClass("fc-state-active");}
+ setOpacity('Lecture', '.5');
+ } else {$(this).addClass("fc-state-active"); setOpacity('Lecture', '1');}
}
});
$("#maintenance").click(function(){
@@ -383,8 +379,8 @@ var selectedEvent = null; // keydown variable
} else {
if($(this).hasClass("fc-state-active")) {
$(this).removeClass("fc-state-active");
- setOpacity('Maintenance');
- } else {$(this).addClass("fc-state-active");}
+ setOpacity('Maintenance', '.5');
+ } else {$(this).addClass("fc-state-active"); setOpacity('Maintenance', '1');}
}
});
$("#boot").click(function(){
@@ -393,8 +389,8 @@ var selectedEvent = null; // keydown variable
} else {
if($(this).hasClass("fc-state-active")) {
$(this).removeClass("fc-state-active");
- setOpacity('Boot');
- } else {$(this).addClass("fc-state-active");}
+ setOpacity('Boot', '.5');
+ } else {$(this).addClass("fc-state-active"); setOpacity('Boot', '1');}
}
});
$("#shutdown").click(function(){
@@ -403,8 +399,8 @@ var selectedEvent = null; // keydown variable
} else {
if($(this).hasClass("fc-state-active")) {
$(this).removeClass("fc-state-active");
- setOpacity('Shutdown');
- } else {$(this).addClass("fc-state-active");}
+ setOpacity('Shutdown', '.5');
+ } else {$(this).addClass("fc-state-active"); setOpacity('Shutdown', '1');}
}
});