diff options
| author | marudor <marudor@marudor.de> | 2018-02-08 22:57:41 +0100 |
|---|---|---|
| committer | marudor <marudor@marudor.de> | 2018-02-08 22:57:41 +0100 |
| commit | 71b41847e6247471abb957b5859605d9f92fb77e (patch) | |
| tree | 4b5fa812949a4f91b2ed347d9320c9143633f99a /templates | |
| parent | 7af09433def2fda9ec47b12823b16e3392b5f6cf (diff) | |
| parent | 6dbec2e2fb64ad8a2f9ae1c9271a401e097a989f (diff) | |
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
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/user_shifts.html | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/templates/user_shifts.html b/templates/user_shifts.html index e137210c..2fdade29 100644 --- a/templates/user_shifts.html +++ b/templates/user_shifts.html @@ -60,13 +60,22 @@ </div> </div> </div> - <div class="col-md-2">%room_select%</div> - <div class="col-md-2">%type_select%</div> - <div class="col-md-2">%filled_select%</div> + <div class="col-md-6"> + <button class="btn btn-info btn-sm" style="margin-top: 20px; margin-bottom:10px" type="button" data-toggle="collapse" + 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> |