diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php index 31a66707..bf716813 100644 --- a/includes/pages/admin_arrive.php +++ b/includes/pages/admin_arrive.php @@ -115,27 +115,36 @@ function admin_arrive() ]); if ($usr->state->arrival_date) { - $day = $usr->state->arrival_date->format(__('Y-m-d')); + $day = $usr->state->arrival_date->format('Y-m-d'); if (!isset($arrival_count_at_day[$day])) { - $arrival_count_at_day[$day] = 0; + $arrival_count_at_day[$day] = [ + 'day' => $usr->state->arrival_date, + 'count' => 0, + ]; } - $arrival_count_at_day[$day]++; + $arrival_count_at_day[$day]['count']++; } if ($usr->personalData->planned_arrival_date) { - $day = $usr->personalData->planned_arrival_date->format(__('Y-m-d')); + $day = $usr->personalData->planned_arrival_date->format('Y-m-d'); if (!isset($planned_arrival_count_at_day[$day])) { - $planned_arrival_count_at_day[$day] = 0; + $planned_arrival_count_at_day[$day] = [ + 'day' => $usr->personalData->planned_arrival_date, + 'count' => 0, + ]; } - $planned_arrival_count_at_day[$day]++; + $planned_arrival_count_at_day[$day]['count']++; } if ($usr->personalData->planned_departure_date && $usr->state->arrived) { - $day = $usr->personalData->planned_departure_date->format(__('Y-m-d')); + $day = $usr->personalData->planned_departure_date->format('Y-m-d'); if (!isset($planned_departure_count_at_day[$day])) { - $planned_departure_count_at_day[$day] = 0; + $planned_departure_count_at_day[$day] = [ + 'day' => $usr->personalData->planned_departure_date, + 'count' => 0, + ]; } - $planned_departure_count_at_day[$day]++; + $planned_departure_count_at_day[$day]['count']++; } $users_matched[] = $usr; @@ -147,33 +156,33 @@ function admin_arrive() $arrival_at_day = []; $arrival_sum = 0; - foreach ($arrival_count_at_day as $day => $count) { - $arrival_sum += $count; + foreach ($arrival_count_at_day as $day => $entry) { + $arrival_sum += $entry['count']; $arrival_at_day[$day] = [ - 'day' => $day, - 'count' => $count, + 'day' => $entry['day']->format(__('Y-m-d')), + 'count' => $entry['count'], 'sum' => $arrival_sum, ]; } $planned_arrival_at_day = []; $planned_arrival_sum = 0; - foreach ($planned_arrival_count_at_day as $day => $count) { - $planned_arrival_sum += $count; + foreach ($planned_arrival_count_at_day as $day => $entry) { + $planned_arrival_sum += $entry['count']; $planned_arrival_at_day[$day] = [ - 'day' => $day, - 'count' => $count, + 'day' => $entry['day']->format(__('Y-m-d')), + 'count' => $entry['count'], 'sum' => $planned_arrival_sum, ]; } $planned_departure_at_day = []; $planned_departure_sum = 0; - foreach ($planned_departure_count_at_day as $day => $count) { - $planned_departure_sum += $count; + foreach ($planned_departure_count_at_day as $day => $entry) { + $planned_departure_sum += $entry['count']; $planned_departure_at_day[$day] = [ - 'day' => $day, - 'count' => $count, + 'day' => $entry['day']->format(__('Y-m-d')), + 'count' => $entry['count'], 'sum' => $planned_departure_sum, ]; } diff --git a/resources/assets/themes/theme16.scss b/resources/assets/themes/theme16.scss index f30e3f26..2986f032 100644 --- a/resources/assets/themes/theme16.scss +++ b/resources/assets/themes/theme16.scss @@ -52,6 +52,8 @@ $input-bg: $gray-darker; $input-bg-disabled: lighten($gray-lighter, 15%); $input-group-addon-bg: $gray-lighter; +$form-check-input-border: 1px solid $gray; + //== changed Pagination $pagination-hover-color: $gray-lighter; @@ -115,6 +117,15 @@ $pagination-disabled-border-color: $gray-dark; // Specials =================================================================== +.bg-primary, +.bg-success, +.bg-danger, +.bg-warning, +.bg-info, +.bg-light { + color: $gray-darker; +} + .navbar { background: rgba(0, 0, 0, 0.7); backdrop-filter: blur(6px); diff --git a/resources/assets/themes/theme16/License-OFL.txt b/resources/assets/themes/theme16/License-OFL.txt index 8c54d913..79d0f2fe 100644 --- a/resources/assets/themes/theme16/License-OFL.txt +++ b/resources/assets/themes/theme16/License-OFL.txt @@ -1,93 +1,93 @@ -Copyright 2011 The Questrial Project Authors (https://github.com/googlefonts/questrial) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. +Copyright 2011 The Questrial Project Authors (https://github.com/googlefonts/questrial) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/resources/views/pages/design.twig b/resources/views/pages/design.twig index e5686a26..8e198716 100644 --- a/resources/views/pages/design.twig +++ b/resources/views/pages/design.twig @@ -16,16 +16,6 @@ 'dark' ] %} -{% set types_color=[ - ['primary', 'light'], - ['secondary', 'light'], - ['success', 'light'], - ['danger', 'light'], - ['warning', 'dark'], - ['info', 'dark'], - ['light', 'dark'], - ['dark', 'light'], -] %} {% set types_buttons=['link']|merge(types) %} {% set shortsum='Lorem ipsum dolor…' %} {% set lipsum='Lorem ipsum dolor sit amet, consectetur adipisici elit…' %} @@ -154,8 +144,8 @@

Badges {{ m.icon('link') }}

- {% for type in types_color %} - {{ type[0]|capitalize }} + {% for type in types %} + {{ type|capitalize }} {% endfor %}