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

fixes for the last commit

This commit is contained in:
Jan-Philipp Litza 2012-12-12 00:45:29 +01:00
parent a007a23d75
commit 910af3eaf7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/update.d/17_translations.php
View File

@ -21,11 +21,11 @@ $res = mysql_query("INSERT IGNORE INTO `Sprache` (`TextID`, `Sprache`, `Text`) V
('tasks', 'DE', 'Aufgaben'), ('tasks', 'DE', 'Aufgaben'),
('tasks', 'EN', 'tasks'), ('tasks', 'EN', 'tasks'),
('occupancy', 'DE', 'Belegung'), ('occupancy', 'DE', 'Belegung'),
('occupancy' ,'EN', 'occupancy') ('occupancy' ,'EN', 'occupancy'),
('all', 'DE', 'alle'), ('all', 'DE', 'alle'),
('all', 'EN', 'all'), ('all', 'EN', 'all'),
('none', 'DE', 'keine'), ('none', 'DE', 'keine'),
('none', 'EN', 'none') ('none', 'EN', 'none'),
('entries', 'DE', 'Einträge'), ('entries', 'DE', 'Einträge'),
('entries', 'EN', 'entries'), ('entries', 'EN', 'entries'),
('time', 'DE', 'Zeit'), ('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', '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.'), ('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', 'DE', 'austragen'),
('sign_off', 'EN', 'sign off'), ('sign_off', 'EN', 'sign off');");
;");
if(mysql_affected_rows() > 0) if(mysql_affected_rows() > 0)
$applied = true; $applied = true;

2
includes/pages/user_myshifts.php
View File

@ -94,7 +94,7 @@ function user_myshifts() {
'intro' => sprintf(Get_Text('pub_myshifts_intro'), $LETZTES_AUSTRAGEN), 'intro' => sprintf(Get_Text('pub_myshifts_intro'), $LETZTES_AUSTRAGEN),
'shifts' => $html, 'shifts' => $html,
'msg' => $msg, '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_absolute('ical') . '&key=' . $shifts_user['ical_key'],
page_link_to('user_myshifts') . '&reset'), page_link_to('user_myshifts') . '&reset'),
)); ));

5
includes/pages/user_shifts.php
View File

@ -399,10 +399,11 @@ function view_user_shifts() {
return msg() . template_render('../templates/user_shifts.html', array ( return msg() . template_render('../templates/user_shifts.html', array (
'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", ucfirst(Get_Text("rooms"))), '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"))), '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"))), '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, '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")), 'header1' => ucfirst(Get_Text("time")) . "/" . ucfirst(Get_Text("room")),
'header2' => ucfirst(Get_Text("entries")), 'header2' => ucfirst(Get_Text("entries")),
'filter' => ucfirst(Get_Text("to_filter")), 'filter' => ucfirst(Get_Text("to_filter")),

1
templates/user_shifts.html
View File

@ -5,6 +5,7 @@
%type_select% %type_select%
%day_select% %day_select%
%filled_select% %filled_select%
<div>%task_notice%</div>
<input class="button" type="submit" style="width: 100%;" value="%filter%"> <input class="button" type="submit" style="width: 100%;" value="%filter%">
</fieldset> </fieldset>
</form> </form>