From 0c51d3c487cef0f2caaa20f5f4f86bd5a424eecf Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 24 Jul 2019 20:57:27 +0200 Subject: [PATCH] make shift calendar printable --- includes/pages/user_shifts.php | 7 ++++--- includes/view/ShiftCalendarShiftRenderer.php | 4 ++-- resources/assets/themes/base.less | 6 ++++++ resources/views/pages/user-shifts.html | 12 +++++++----- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index b5d975c2..4c9e536e 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -252,7 +252,8 @@ function view_user_shifts() [ button( 'javascript: checkOwnTypes(\'selection_types\', ' . json_encode($ownTypes) . ')', - __('Own') + __('Own'), + 'hidden-print' ), ] ), @@ -324,8 +325,8 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons } $buttons = []; - $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', __('All')); - $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', __('None')); + $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', __('All'), 'hidden-print'); + $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', __('None'), 'hidden-print'); $buttons = array_merge($buttons, $additionalButtons); $html .= buttons($buttons); diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php index 89f66275..933db27c 100644 --- a/includes/view/ShiftCalendarShiftRenderer.php +++ b/includes/view/ShiftCalendarShiftRenderer.php @@ -190,7 +190,7 @@ class ShiftCalendarShiftRenderer . ' ' . button( shift_entry_create_link($shift, $angeltype), - __('Sign up'), 'btn-xs btn-primary' + __('Sign up'), 'btn-xs btn-primary hidden-print' ); break; @@ -258,7 +258,7 @@ class ShiftCalendarShiftRenderer { $header_buttons = ''; if (auth()->can('admin_shifts')) { - $header_buttons = '
' . table_buttons([ + $header_buttons = '
' . table_buttons([ button( page_link_to('user_shifts', ['edit_shift' => $shift['SID']]), glyph('edit'), diff --git a/resources/assets/themes/base.less b/resources/assets/themes/base.less index 493cfbc2..1ca7e3ef 100644 --- a/resources/assets/themes/base.less +++ b/resources/assets/themes/base.less @@ -296,3 +296,9 @@ table a > .icon-icon_angel { padding-left: 15px; } } + +@media print { + a[href]:after { + content: ""; + } +} \ No newline at end of file diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html index 9ce0fcc6..9ac501da 100644 --- a/resources/views/pages/user-shifts.html +++ b/resources/views/pages/user-shifts.html @@ -28,7 +28,7 @@
-
+ -
+
%buttons%
-
+
-
%filled_select%
-
+

%task_notice%

@@ -78,4 +78,6 @@ %shifts_table% +
%ical_text% +
\ No newline at end of file