iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix js var names

This commit is contained in:
msquare 2016-11-15 21:42:43 +01:00
parent 3e5316e0c1
commit 54f3253c32
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/shifts_controller.php
View File

@ -212,7 +212,7 @@ function shift_controller() {
return [
$shift['name'],
Shift_view($shift, $shifttype, $room, $angeltypes, $user_shifts, $shift_signup_state)
Shift_view($shift, $shifttype, $room, $angeltypes, $shift_signup_state)
];
}

2
includes/view/Shifts_view.php
View File

@ -28,7 +28,7 @@ function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null,
return '';
}
function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts, ShiftSignupState $shift_signup_state) {
function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupState $shift_signup_state) {
global $privileges;
$shift_admin = in_array('admin_shifts', $privileges);

10
public/js/shift-calendar.js
View File

@ -3,12 +3,12 @@
*/
$(document).ready(
function() {
var time_lanes = $(".shift-calendar .time");
var timeLanes = $(".shift-calendar .time");
var headers = $(".shift-calendar .header");
var top_reference = $(".container-fluid .row");
var topReference = $(".container-fluid .row");
var top = headers.offset().top;
var left = 15;
time_lanes.css({
timeLanes.css({
"position" : "relative",
"z-index" : 1000
});
@ -18,12 +18,12 @@ $(document).ready(
});
$(window).scroll(
function() {
time_lanes.css({
timeLanes.css({
"left" : Math.max(0, $(window).scrollLeft() - left) + "px"
});
headers.css({
"top" : Math.max(0, $(window).scrollTop() - top
+ top_reference.offset().top)
+ topReference.offset().top)
+ "px"
});
});