From 910af3eaf725845f19c134805433533220113ae4 Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Wed, 12 Dec 2012 00:45:29 +0100
Subject: fixes for the last commit

---
 db/update.d/17_translations.php  | 7 +++----
 includes/pages/user_myshifts.php | 2 +-
 includes/pages/user_shifts.php   | 5 +++--
 templates/user_shifts.html       | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/db/update.d/17_translations.php b/db/update.d/17_translations.php
index 05b520d3..962b6052 100644
--- a/db/update.d/17_translations.php
+++ b/db/update.d/17_translations.php
@@ -21,11 +21,11 @@ $res = mysql_query("INSERT IGNORE INTO `Sprache` (`TextID`, `Sprache`, `Text`) V
 ('tasks', 'DE', 'Aufgaben'),
 ('tasks', 'EN', 'tasks'),
 ('occupancy', 'DE', 'Belegung'),
-('occupancy' ,'EN', 'occupancy')
+('occupancy' ,'EN', 'occupancy'),
 ('all', 'DE', 'alle'),
 ('all', 'EN', 'all'),
 ('none', 'DE', 'keine'),
-('none', 'EN', 'none')
+('none', 'EN', 'none'),
 ('entries', 'DE', 'Einträge'),
 ('entries', 'EN', 'entries'),
 ('time', 'DE', 'Zeit'),
@@ -53,8 +53,7 @@ $res = mysql_query("INSERT IGNORE INTO `Sprache` (`TextID`, `Sprache`, `Text`) V
 ('pub_myshifts_too_late', 'DE', 'Es ist zu spät um sich aus der Schicht auszutragen. Frage ggf. den Schichtkoordinator, ob er dich austragen kann.'),
 ('pub_myshifts_too_late', 'EN', 'It\'s too late to sign yourself off the shift. If neccessary, as the dispatcher to do so.'),
 ('sign_off', 'DE', 'austragen'),
-('sign_off', 'EN', 'sign off'),
-;");
+('sign_off', 'EN', 'sign off');");
 
 if(mysql_affected_rows() > 0)
     $applied = true;
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index a4022666..390b3b01 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -94,7 +94,7 @@ function user_myshifts() {
 		'intro' => sprintf(Get_Text('pub_myshifts_intro'), $LETZTES_AUSTRAGEN),
 		'shifts' => $html,
 		'msg' => $msg,
-		'ical_text' => sprintf(Get_Text('pub_schichtplan_ical_text'),
+		'ical_text' => sprintf(Get_Text('inc_schicht_ical_text'),
 			page_link_to_absolute('ical') . '&key=' . $shifts_user['ical_key'],
 			page_link_to('user_myshifts') . '&reset'),
 ));
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 59168436..d5751756 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -399,10 +399,11 @@ function view_user_shifts() {
   return msg() . template_render('../templates/user_shifts.html', array (
     'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", ucfirst(Get_Text("rooms"))),
     'day_select' => make_select($days, $_SESSION['user_shifts']['days'], "days", ucfirst(Get_Text("days"))),
-    'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", ucfirst(Get_Text("tasks"))) . Get_Text("pub_schichtplan_tasks_notice"),
+    'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", ucfirst(Get_Text("tasks")) . '<sup>1</sup>'),
     'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", ucfirst(Get_Text("occupancy"))),
+    'task_notice' => '<sup>1</sup>' . Get_Text("pub_schichtplan_tasks_notice"),
     'shifts_table' => $shifts_table,
-    'ical_text' => sprintf(Get_Text('pub_schichtplan_ical_text'), make_user_shifts_ical_link($user['ical_key']), page_link_to('user_myshifts') . '&reset'),
+    'ical_text' => sprintf(Get_Text('inc_schicht_ical_text'), make_user_shifts_ical_link($user['ical_key']), page_link_to('user_myshifts') . '&reset'),
     'header1' => ucfirst(Get_Text("time")) . "/" . ucfirst(Get_Text("room")),
     'header2' => ucfirst(Get_Text("entries")),
     'filter' => ucfirst(Get_Text("to_filter")),
diff --git a/templates/user_shifts.html b/templates/user_shifts.html
index 8bd42e45..b035d23b 100644
--- a/templates/user_shifts.html
+++ b/templates/user_shifts.html
@@ -5,6 +5,7 @@
 %type_select%
 %day_select%
 %filled_select%
+<div>%task_notice%</div>
 <input class="button" type="submit" style="width: 100%;" value="%filter%">
 </fieldset>
 </form>
-- 
cgit v1.2.3-54-g00ecf