diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/layout.html | 22 | ||||
| -rw-r--r-- | templates/maintenance.html | 19 | ||||
| -rw-r--r-- | templates/user_shifts.html | 17 |
3 files changed, 18 insertions, 40 deletions
diff --git a/templates/layout.html b/templates/layout.html index 12a91086..832bdcf3 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,14 +1,11 @@ <!DOCTYPE html> -<html> +<html lang="%locale%"> <head> <title>%title% - Engelsystem</title> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="stylesheet" type="text/css" href="css/theme%theme%.css"/> - <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css"/> - <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.7.1/css/bootstrap-datepicker3.min.css"/> - <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script> - <script type="text/javascript" src="vendor/jquery-ui.min.js"></script> + <link rel="stylesheet" type="text/css" href="%start_page_url%assets/theme%theme%.css"/> + <script type="text/javascript" src="%start_page_url%assets/vendor.js"></script> %atom_link% </head> <body> @@ -45,18 +42,5 @@ </div> </div> </div> -<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script> -<script type="text/javascript" src="vendor/bootstrap-datepicker-1.7.1/js/bootstrap-datepicker.min.js"></script> -<script type="text/javascript" src="vendor/bootstrap-datepicker-1.7.1/locales/bootstrap-datepicker.de.min.js"></script> -<script type="text/javascript" src="vendor/Chart.min.js"></script> -<script type="text/javascript" src="js/forms.js"></script> -<script type="text/javascript" src="vendor/moment-with-locales.min.js"></script> -<script type="text/javascript"> - $(function () { - moment.locale("%locale%"); - }); -</script> -<script type="text/javascript" src="js/moment-countdown.js"></script> -<script type="text/javascript" src="js/sticky-headers.js"></script> </body> </html> diff --git a/templates/maintenance.html b/templates/maintenance.html index bd73bd74..f7ab5772 100644 --- a/templates/maintenance.html +++ b/templates/maintenance.html @@ -4,11 +4,8 @@ <title>Maintenance - Engelsystem</title> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="stylesheet" type="text/css" href="css/theme0.css"/> - <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css"/> - <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css"/> - <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script> - <script type="text/javascript" src="vendor/jquery-ui.min.js"></script> + <link rel="stylesheet" type="text/css" href="assets/theme0.css"/> + <script type="text/javascript" src="assets/vendor.js"></script> </head> <body> <div class="navbar navbar-default navbar-fixed-top"> @@ -70,17 +67,5 @@ </div> </div> </div> -<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script> -<script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js"></script> -<script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js"></script> -<script type="text/javascript" src="vendor/Chart.min.js"></script> -<script type="text/javascript" src="js/forms.js"></script> -<script type="text/javascript" src="vendor/moment-with-locales.min.js"></script> -<script type="text/javascript"> - $(function () { - moment.locale("en_US.UTF-8"); - }); -</script> -<script type="text/javascript" src="js/moment-countdown.js"></script> </body> </html> 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> |