summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/pages/user_shifts.php7
-rw-r--r--includes/view/ShiftCalendarShiftRenderer.php4
-rw-r--r--resources/assets/themes/base.less6
-rw-r--r--resources/views/pages/user-shifts.html12
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
. '</a> '
. 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 = '<div class="pull-right">' . table_buttons([
+ $header_buttons = '<div class="pull-right hidden-print">' . 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 @@
</div>
</div>
</div>
- <div class="form-group" style="margin-top: .5em">
+ <div class="form-group hidden-print" style="margin-top: .5em">
<div class="btn-group">
<a href="javascript:setDay(-1)" class="btn btn-default ">%set_yesterday%</a>
<a href="javascript:setDay()" class="btn btn-default ">%set_today%</a>
@@ -41,19 +41,19 @@
<a href="javascript:setHours(8)" class="btn btn-default ">%set_next_8h%</a>
</div>
</div>
- <div class="form-group" style="margin-top: .5em">
+ <div class="form-group hidden-print" style="margin-top: .5em">
<div class="btn-group">
%buttons%
</div>
</div>
- <div class="row">
+ <div class="row hidden-print">
<div class="col-md-12">
<input class="btn btn-primary" type="submit" style="width:100%; margin: 1em 0" value="%filter%">
</div>
</div>
</div>
<div class="col-md-6">
- <button class="btn btn-info btn-sm" style="margin-top: 20px; margin-bottom:10px" type="button"
+ <button class="btn btn-info btn-sm hidden-print" style="margin-top: 20px; margin-bottom:10px" type="button"
data-toggle="collapse"
data-target="#collapseRoomSelect" aria-expanded="false"
aria-controls="collapseRoomSelect"
@@ -66,7 +66,7 @@
<div class="col-xs-4 col-xxs-12">%type_select%</div>
<div class="col-xs-4 col-xxs-12">%filled_select%</div>
</div>
- <div class="row">
+ <div class="row hidden-print">
<div class="col-md-12" style="margin: 1em 0">
<p>%task_notice%</p>
</div>
@@ -78,4 +78,6 @@
%shifts_table%
+<div class="hidden-print">
%ical_text%
+</div> \ No newline at end of file