From b2e5b5c44db9683e17034d72d810c0b21211dac2 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Thu, 28 Dec 2017 14:17:42 +0100
Subject: Prevent empty string after $tokens = explode(' ', $search);

---
 includes/pages/admin_arrive.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'includes/pages')

diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php
index 48e2c91f..e925bfd4 100644
--- a/includes/pages/admin_arrive.php
+++ b/includes/pages/admin_arrive.php
@@ -21,6 +21,7 @@ function admin_arrive()
 
     if ($request->has('search')) {
         $search = strip_request_item('search');
+        $search = trim($search);
     }
 
     if ($request->has('reset') && preg_match('/^\d+$/', $request->input('reset'))) {
-- 
cgit v1.2.3-54-g00ecf


From 2e1c2cf3b53831b83285d48b50bbef605402ab8a Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Mon, 22 Jan 2018 20:45:31 +0100
Subject: remove br between shift filter checkboxes

---
 includes/pages/user_shifts.php | 2 +-
 public/css/theme0.css          | 3 +++
 public/css/theme1.css          | 3 +++
 public/css/theme2.css          | 3 +++
 public/css/theme3.css          | 3 +++
 public/css/theme4.css          | 3 +++
 public/css/theme5.css          | 3 +++
 public/css/theme6.css          | 3 +++
 themes/base.less               | 4 ++++
 9 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'includes/pages')

diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 81b405b1..f3ffd501 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -332,7 +332,7 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons
             . (in_array($i['id'], $selected) ? ' checked="checked"' : '')
             . ' > ' . $i['name'] . '</label>'
             . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph('lock'))
-            . '</div><br />';
+            . '</div>';
     }
     $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
     $html .= implode("\n", $htmlItems);
diff --git a/public/css/theme0.css b/public/css/theme0.css
index 109ddba2..1393cd63 100644
--- a/public/css/theme0.css
+++ b/public/css/theme0.css
@@ -6818,6 +6818,9 @@ body {
 .panel-danger .panel-heading a {
   color: #a94442;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/public/css/theme1.css b/public/css/theme1.css
index 2402f379..d443d81e 100644
--- a/public/css/theme1.css
+++ b/public/css/theme1.css
@@ -6841,6 +6841,9 @@ body {
 .panel-danger .panel-heading a {
   color: #ffffff;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/public/css/theme2.css b/public/css/theme2.css
index 0005da64..6aba33e1 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -6818,6 +6818,9 @@ body {
 .panel-danger .panel-heading a {
   color: #694374;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/public/css/theme3.css b/public/css/theme3.css
index 0cd661d7..b1509c6f 100644
--- a/public/css/theme3.css
+++ b/public/css/theme3.css
@@ -6827,6 +6827,9 @@ body {
 .panel-danger .panel-heading a {
   color: #da1639;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/public/css/theme4.css b/public/css/theme4.css
index df18c657..c68b0238 100644
--- a/public/css/theme4.css
+++ b/public/css/theme4.css
@@ -6841,6 +6841,9 @@ body {
 .panel-danger .panel-heading a {
   color: #ffffff;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/public/css/theme5.css b/public/css/theme5.css
index 717c8999..95e9b848 100644
--- a/public/css/theme5.css
+++ b/public/css/theme5.css
@@ -6821,6 +6821,9 @@ body {
 .panel-danger .panel-heading a {
   color: #331400;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/public/css/theme6.css b/public/css/theme6.css
index 96b5ac9a..dff2de34 100644
--- a/public/css/theme6.css
+++ b/public/css/theme6.css
@@ -6845,6 +6845,9 @@ body {
 .panel-danger .panel-heading a {
   color: #ffffff;
 }
+.selection .checkbox {
+  display: block;
+}
 .shift-calendar {
   display: flex;
   flex-direction: row;
diff --git a/themes/base.less b/themes/base.less
index 37558071..beddc39d 100644
--- a/themes/base.less
+++ b/themes/base.less
@@ -100,6 +100,10 @@ body {
   color: @panel-danger-text;
 }
 
+.selection .checkbox {
+	display: block;
+}
+
 .shift-calendar {
   display: flex;
   flex-direction: row;
-- 
cgit v1.2.3-54-g00ecf