summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Philipp Litza <janphilipp@litza.de>2012-12-27 22:49:10 +0100
committerJan-Philipp Litza <janphilipp@litza.de>2012-12-27 22:49:10 +0100
commitdd5ca95975d368d3fb1bbf9cca422222049242aa (patch)
tree1c0ac67ae2380ab5f0b299a87c79124c7da223cd
parent13747c62fd9575ac1ed764c3dc33d34459321840 (diff)
fixes for last commit
-rw-r--r--includes/pages/user_shifts.php6
-rw-r--r--public/css/base.css4
2 files changed, 7 insertions, 3 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 9ed566f8..bc2e392d 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -60,9 +60,9 @@ function user_shifts() {
// Benötigte Engeltypen vom Raum
$needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`");
foreach ($needed_angel_types_source as $type) {
- if($type['count'] != "")
+ if($type['count'] != "")
$needed_angel_types[$type['id']] =$type['count'];
- }
+ }
// Benötigte Engeltypen von der Schicht
$needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`");
@@ -384,7 +384,7 @@ function view_user_shifts() {
}
}
}
- $shifts_table="<table id=\"shifts\" style=\"background-color: #fff\"><colgroup><col><col span=\"100\"></colgroup><thead><tr><th>-</th>";
+ $shifts_table="<table id=\"shifts\"><thead><tr><th>-</th>";
foreach($myrooms as $room) {
$rid=$room["id"];
$colspan=1;
diff --git a/public/css/base.css b/public/css/base.css
index b6e75ac1..6bcb95d1 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -108,6 +108,10 @@ table {
display: block;
}
+#shifts {
+ background-color: #fff;
+}
+
table.scrollable {
max-width: 100%;
overflow-x: scroll;