Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/css/theme0.css
#	public/css/theme1.css
#	public/css/theme2.css
#	public/css/theme3.css
#	public/css/theme4.css
#	public/css/theme5.css
#	public/css/theme6.css

README.md

@@ -27,14 +27,15 @@ To report bugs use [engelsystem/issues](https://github.com/engelsystem/engelsyst
     composer dump-autoload --optimize
     ```
     to install the engelsystem
- * The webserver must have write access to the 'import' directory and read access for all other directories
+ * The webserver must have write access to the ```import``` directory and read access for all other directories
- * The webserver must point to the public directory.
+ * The webserver must point to the ```public``` directory.
+ * The webserver must read the ```.htaccess``` file and ```mod_rewrite``` must be enabled
 
  * Recommended: Directory Listing should be disabled.
  * There must a be MySQL database created with a user who has full rights to that database.
- * It must be created by the db/install.sql and db/update.sql files.
+ * It must be created by the ```db/install.sql``` and ```db/update.sql``` files.
- * If necessary, create a config/config.php to override values from config/config.default.php.
+ * If necessary, create a ```config/config.php``` to override values from ```config/config.default.php```.
- * In the browser, login with credentials admin:asdfasdf and change the password.
+ * In the browser, login with credentials ```admin```:```asdfasdf``` and change the password.
 
 Engelsystem can now be used.
 

includes/controller/shifts_controller.php

@@ -345,32 +345,6 @@ function shift_next_controller()
     redirect(page_link_to('user_shifts'));
 }
 
-/**
- * Export all shifts using api-key.
- */
-function shifts_json_export_all_controller()
-{
-    $api_key = config('api_key');
-    $request = request();
-
-    if (empty($api_key)) {
-        engelsystem_error('Config contains empty apikey.');
-    }
-
-    if (!$request->has('api_key')) {
-        engelsystem_error('Missing parameter api_key.');
-    }
-
-    if ($request->input('api_key') != $api_key) {
-        engelsystem_error('Invalid api_key.');
-    }
-
-    $shifts_source = Shifts();
-
-    header('Content-Type: application/json; charset=utf-8');
-    raw_output(json_encode($shifts_source));
-}
-
 /**
  * Export filtered shifts via JSON.
  * (Like iCal Export or shifts view)

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'))) {

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);

locale/de_DE.UTF-8/LC_MESSAGES/default.po

@@ -2696,8 +2696,8 @@ msgstr "Nächste Schicht %c"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:302
 #, php-format
-msgid "Shift starts %c"
+msgid "Shift started %c"
-msgstr "Schicht startet %c"
+msgstr "Schicht startete %c"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:307
 #, php-format

templates/user_shifts.html

@@ -60,13 +60,22 @@
                 </div>
             </div>
         </div>
-        <div class="col-md-2">%room_select%</div>
+        <div class="col-md-6">
-        <div class="col-md-2">%type_select%</div>
+            <button class="btn btn-info btn-sm" style="margin-top: 20px; margin-bottom:10px" type="button" data-toggle="collapse" 
-        <div class="col-md-2">%filled_select%</div>
+              data-target="#collapseRoomSelect" aria-expanded="false"
+              aria-controls="collapseRoomSelect">
+                collapse/show filters
+            </button>
+            <div class="collapse in row" id="collapseRoomSelect">
+                <div class="col-xs-4 col-xxs-12">%room_select%</div>
+                <div class="col-xs-4 col-xxs-12">%type_select%</div>
+                <div class="col-xs-4 col-xxs-12">%filled_select%</div>
+                <div class="col-sm-12"><p>%task_notice%</p></div>
+            </div>
+        </div>
     </div>
     <div class="row">
         <div class="col-md-12">
-            <div><p>%task_notice%</p></div>
             <input class="btn btn-primary" type="submit" style="width:75%; margin-bottom: 20px" value="%filter%">
         </div>
     </div>

themes/base.less

@@ -100,6 +100,10 @@ body {
   color: @panel-danger-text;
 }
 
+.selection .checkbox {
+	display: block;
+}
+
 .shift-calendar {
   display: flex;
   flex-direction: row;
@@ -247,3 +251,15 @@ body {
     transform: rotate(0deg) translateY(0px);
   }
 }
+
+@media (max-width: 525px) {
+  .col-xxs-12 {
+    float: none;
+    width: 100%;
+
+    position: relative; left: 0; right: 0;
+    min-height: 1px;
+    padding-right: 15px;
+    padding-left: 15px;
+  }
+}