Commit Graph

434 Commits

Author SHA1 Message Date
Igor Scheller f201b2f1c8 Merge branch 'feature-bootstrap5'
# Conflicts:
#	package.json
#	tests/Unit/Renderer/Twig/Extensions/GlobalsTest.php
#	webpack.config.js
#	yarn.lock
2021-08-17 14:26:28 +02:00
Igor Scheller e0eeee013e
Fix secondary color on dark themes and theme 7 secondary buttons, formatting 2021-08-16 18:02:06 +02:00
Michael Weimann 3c77ec62d0
improve navbar / cards colours 2021-08-16 18:02:05 +02:00
Michael Weimann 2da821a68d
introduce temporary bootstrap body bg fix 2021-08-16 18:02:03 +02:00
Igor Scheller 231f481537 Styling optimizations (esp. alerts) and other fixes 2021-08-09 23:32:24 +02:00
Igor Scheller a8e012be72 Make news comments deletable 2021-08-08 19:11:16 +02:00
Michael Weimann a7a79d2204
remove unused files5 2021-08-08 19:11:14 +02:00
Michael Weimann aef60086ec
add default to all cyborg variables 2021-08-08 18:56:58 +02:00
Igor Scheller 6cfeedc57a Fixed more themes and styles/types 2021-08-05 01:00:12 +02:00
Michael Weimann 2223781434
beautify design page 2021-07-29 21:05:45 +02:00
Michael Weimann c7b83975cb
init select 2 after document ready 2021-07-29 20:38:00 +02:00
Igor Scheller bd8acfcf51 Fixed some styles 2021-07-29 20:20:38 +02:00
Michael Weimann 82f640896e
migrate shift overview cards to panels
migrate shift overview cards to panels
2021-07-29 20:01:21 +02:00
Igor Scheller 91c7a19f11
Removed and replaced outdated classes and styling, use secondary buttons 2021-07-29 20:01:19 +02:00
Igor Scheller 191a3a7d48
Replaced info and calendar icons 2021-07-29 20:01:18 +02:00
Michael Weimann b68af58321
migrate datetime picker to bs5
fix bs5 time picker

fix datetime picker js error
2021-07-29 20:01:13 +02:00
Igor Scheller 63f0a08407
Fixed spacing and sizes 2021-07-29 20:01:12 +02:00
Igor Scheller 08188fa32a
Fixed shifts filter toggle and "hide on print" classes 2021-07-29 20:01:11 +02:00
Michael Weimann 4428266488
migrate panels to cards 2021-07-29 20:01:10 +02:00
Igor Scheller 3fcf5c521c
Removed row class of content to fix full with pages 2021-07-29 20:01:08 +02:00
Igor Scheller 36ba619d5a
Fixed button sizes and types 2021-07-29 20:01:06 +02:00
Igor Scheller b41a9a02d1
Use bootstrap icons instead of glyphicons 2021-07-29 20:01:05 +02:00
Michael Weimann bc97305106
migrate shift buttons to bs5 2021-07-29 20:01:04 +02:00
Michael Weimann e4898dae61
update select2 2021-07-29 20:01:03 +02:00
Michael Weimann 9b98503a80
fix overview button 2021-07-29 20:01:02 +02:00
Michael Weimann 162592df7b
migrate navbar icons 2021-07-29 20:01:00 +02:00
Michael Weimann ed93bba56d
fix sass 2021-07-29 20:00:58 +02:00
Michael Weimann 5f7fcb9018
make all themes basically working with bs5
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

migrate buttons and badges

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

upgrade bootstrap, fix devtool

remove postcss-preset-env

remove npm-run-all

add theme info to design

add theme configs for 2-15

make all themes compile

fix node env in script

refactor theme config

make all themes basically working

fix sass 3rd party warnings

replace slash div by math.div
2021-07-29 20:00:54 +02:00
Michael Weimann 9acaa03a71
migrate basic elements to bs5
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

migrate body color to bs5

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

migrate the nav menu to bs5

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

migrate to bs5 badges

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

migrate to bs5 nav pills

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

migrate the login page to bs5

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

fix the language dropdown in bs5

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-07-29 19:41:09 +02:00
Igor Scheller 46dad55065 Fixed shift time shortcuts not updating date select 2021-06-04 00:07:30 +02:00
Michael Weimann 02fa603090
migrate to scss/bs5
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-04-17 14:47:01 +02:00
Xu 1cfab91f28 wording: no self sign up allowed 2021-04-13 16:01:38 +02:00
Xu b5882fce87 some minor fixes 2021-04-12 18:43:39 +02:00
Xu 0549d81fc8 refactored themes to be less complicated: added cyborg_variables and cyborg_styles 2021-04-12 18:43:39 +02:00
Igor Scheller 30e1d41c0a EventConfig: Set time on dates 2021-04-12 17:13:48 +02:00
Igor Scheller a5757497e5 Add theme change to /design page 2021-04-12 16:42:15 +02:00
Igor Scheller 149155fbda Added email notification on new news 2021-04-12 16:15:25 +02:00
Michael Weimann 2cab0788e1 introduce PostCSS + Autoprefixer
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-04-05 11:29:19 +02:00
Xu c48664bc7d theme15: greener r2r theme 2021-04-02 12:09:07 +02:00
Benjamin Wand 5293bc7192
Theme for DiVOC R2R 2021-04-02 11:51:58 +02:00
Michael Weimann ddcc9aee7a improve mobile nav button layout
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-03-28 14:19:31 +02:00
Michael Weimann c1a5a8d50b fix mobile safari menu layout
Add extra bottom margin because mobile Safari displays a bottom bar hiding parts of the menu.

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-03-28 14:19:31 +02:00
Igor Scheller ea199f9485 FAQ: Added links 2020-12-27 17:56:36 +01:00
Igor Scheller 85044bc833 News: Add is_pinned 2020-12-27 10:59:28 +01:00
Igor Scheller b5c974b9e3 Add new questions frontend 2020-12-20 17:46:45 +01:00
Igor Scheller 857ed23548 Added FAQ 2020-12-20 17:46:45 +01:00
Igor Scheller 5cdf3889f9 Add max length for user settings 2020-12-20 17:46:45 +01:00
Igor Scheller 2745b04dc2 Added filter to dashboard 2020-12-20 17:15:24 +01:00
EdJoPaTo 0bde445aa2 translation: less misleading admin_arrive translation 2020-12-18 21:16:46 +01:00
Xu b77c163aad themes: fixed some colors mainly for code tag 2020-12-09 20:38:21 +01:00
Xu ca5a952d19 theme 13, theme 14: edited colors for code tag 2020-12-09 20:38:21 +01:00
Xu e83c839e44 design: added code tag and some new lines 2020-12-09 20:38:21 +01:00
msquare 39f96783cf review changes 2020-11-25 00:49:45 +01:00
Igor Scheller 27331b4cf6 Use twig to render profile setting page 2020-11-25 00:49:45 +01:00
msquare 0c3ff73454 new setting page layout 2020-11-25 00:49:45 +01:00
msquare d3265ef70a add password settings page 2020-11-25 00:49:45 +01:00
Igor Scheller ebab34ee67 Schedule import: Add overview 2020-11-22 16:53:07 +01:00
Igor Scheller 251f2cbfa6 OAuth: Added display name and metrics, show providers on user page 2020-11-22 14:55:29 +01:00
msquare 13501a3b84 Update additional.po
Small OAuth text changes
2020-11-22 14:55:29 +01:00
Igor Scheller 80941c2999 Login: Added OAuth support 2020-11-22 14:55:29 +01:00
Igor Scheller c57bb9395e Theme: Fixed space and line endings in font license 2020-11-22 14:55:29 +01:00
msquare 51612a68f0 change add news button to icon 2020-11-14 18:36:52 +01:00
msquare aabd98241c add teal rc3 theme 2020-11-14 18:29:15 +01:00
msquare c59bf69f0c add fonts to rc3 theme 2020-11-13 20:41:29 +01:00
msquare 8f62e5bf15 add rc3 theme (colors & background image), fix background of select2 2020-11-13 20:15:31 +01:00
Igor Scheller 620c9a02bb News: Render as markdown 2020-10-21 21:51:48 +02:00
Igor Scheller a309d873a7 News: Show preview 2020-10-21 21:51:48 +02:00
Igor Scheller 00f812fb77 Enable select2 2020-10-21 21:44:24 +02:00
Igor Scheller 3d5ce35f5e Show available vouchers in user view 2020-10-18 16:58:36 +02:00
Igor Scheller e74eb6eee4 Shifts edit: Added schedule import warning 2020-10-18 16:58:36 +02:00
msquare 4c1f080402 Small german translation changes 2020-10-18 16:55:11 +02:00
msquare 2042e8c1fe Small german translation change 2020-10-18 16:55:11 +02:00
Igor Scheller 0bbc2d219d Rename "restricted angeltype" to "Requires introduction" in the frontend
Closes #294 (Rename "restricted angeltype")
2020-10-18 16:55:11 +02:00
Allen Taylor 6c177d5173 Added timestamps for questions 2020-09-27 19:28:27 +02:00
marudor dae856e87e
chore: update dependencies, remove imports-loader 2020-09-01 11:17:05 +02:00
Igor Scheller 3bce7a16d8 .editorconfig: Fixed max_line_length 2020-06-28 19:39:29 +02:00
Igor Scheller d79d2c87bc More .editorconfig improvements 2020-06-28 19:39:29 +02:00
Igor Scheller 390db395a6 File formatting fixes 2020-06-28 19:39:29 +02:00
Igor Scheller 2899f9605e News: Show [Meeting] prefix on meeting page title 2020-06-14 13:55:08 +02:00
Igor Scheller b814cf51e4 News: Preselect "Is Meeting" when adding from Meeting overview 2020-06-14 13:55:08 +02:00
Igor Scheller e947e788f9 Rebuild logs view 2020-05-01 21:41:06 +02:00
Igor Scheller 04fe35c822 Added /design path to show template elements 2020-04-25 17:04:57 +02:00
Igor Scheller 8c0ac0f7a1 Check permissions before showing ical, atom and json export links
closes #729 (Rechtesystem ical&json)
2020-04-25 16:54:30 +02:00
Igor Scheller 795a0631cb Added application base url: Redirector now uses URLs instead of relative paths 2020-04-25 15:50:57 +02:00
Igor Scheller d323b75501 News: Rewrite 2020-04-25 15:50:57 +02:00
Igor Scheller 72f4839130 Added HasUserNotifications trait to show messages to the user 2020-04-25 15:50:57 +02:00
Igor Scheller 951755598a Removed ReplaceSmilies from news 2020-04-25 15:50:57 +02:00
Igor Scheller edf3220824 Themes: Added names, fixed warning- and disabled-forms background colors 2020-04-24 22:32:55 +02:00
Igor Scheller dfcacaa331 Renamed message send buttons
closes #702 (Sending a message and an irritating button)
2020-04-24 22:32:55 +02:00
Christian Kleinbach e4712658a4 added german date format for ticks in calender view + corresponding translation 2020-04-23 13:30:26 +02:00
Igor Scheller 6fb6c9bc25
Fixed german translation 2020-03-01 17:01:41 +01:00
digitaldonkey 2d9c722b3e Fix mobile navi 2020-01-02 03:34:55 +01:00
Michael Weimann a78659b2d4 Migrate message view 2019-12-30 01:53:20 +01:00
Igor Scheller e4a06fb457 Header: Add external links 2019-12-28 21:46:52 +01:00
Igor Scheller e1471248fe User: Add pronoun statement 2019-12-26 19:18:47 +01:00
Igor Scheller ec47d124bb Shifts overview: only scroll shifts, not whole page 2019-12-26 16:46:06 +01:00
Michael Weimann 3f13549771 Improve readability 2019-12-19 19:04:55 +01:00
msquare fb13bdcb96 fix #694: no more black hover link texts in 36c3 themes 2019-12-14 15:04:16 +01:00
cbluoss 4beb5a6986 Extended the iCal section with a collapsible card to show the current api key. 2019-12-12 18:48:26 +01:00
msquare d70d7c6436 Resolve redirect problem in schedule import 2019-12-08 12:56:47 +01:00
Igor Scheller 064a175027 Renamed GuzzleServiceProvider to HttpClientServiceProvider, fixed translation and import error 2019-12-08 02:20:51 +01:00
Igor Scheller 42721e9572 Added Schedule parsing and replaced old Fahrplan importer
Resolves #553 (Change Frab Import from xCal to XML)
Resolves #538 (Feature Request: Multi Frab Import)
2019-12-08 02:20:48 +01:00
Igor Scheller 377b390c97 Twig: Macros: Form: Use input options and primary submit button 2019-12-08 02:12:56 +01:00
Michael Weimann fd90679a7d Update de po file 2019-12-01 22:18:33 +01:00
Igor Scheller cd794fa5e8 footer.twig: Fix translation import warnings 2019-11-30 19:40:52 +01:00
Igor Scheller 15e6740e12 Twig update to > 2.11: Fixed namespaces, warnings and cleanup 2019-11-29 18:42:20 +01:00
msquare 3a6d096fff add 36c3 theme 2019-11-23 18:39:09 +01:00
Michael Weimann 9a170c82cb Add auto focus to the login fiel 2019-11-20 00:03:03 +01:00
Igor Scheller 68afc74b03 Formatting to follow PSR-12 2019-11-11 00:05:41 +01:00
Luca 8a298f0f5e Replace full-text message ids with keys in credits template 2019-10-28 14:25:31 +01:00
Luca 23d548585b Remove unused message from default.po 2019-10-28 14:25:31 +01:00
Luca 6cde313e47 Move translations whose message ids do not appear as literals in the sources into a separate file
Test whether additional.{m,p}o files are loaded correctly
2019-10-28 14:25:31 +01:00
Luca d10fe23366 Fix X-Poedit-Basepath for de_DE locale
Configure Poedit to correctly interpret the keyword _e
2019-10-27 15:42:38 +01:00
Igor Scheller 9b08b951a2
Merge pull request #651 from MyIgel/shift-deletion-worklog
Save time of past shifts as worklog if they get deleted
2019-10-21 09:12:10 +02:00
Igor Scheller 52b8b6b45c Removed .mo files 2019-10-21 09:11:29 +02:00
Igor Scheller eec1eff65b Shifts overview: Style cleanup 2019-10-20 15:38:09 +02:00
Jan Kapellen 941c08b2f6 removed dotted line 2019-10-20 15:04:57 +02:00
Igor Scheller c09c94f3ea style: formatting and nesting 2019-10-20 14:59:15 +02:00
Wonko T. Sane 1a5c10dd41 adding a dashed line when expandable 2019-10-20 14:59:15 +02:00
Wonko T. Sane b14d352140 Fix for #526
Implementation idea stolen from http://jsfiddle.net/6K7t4/24/
2019-10-20 14:59:15 +02:00
Michael Weimann 75f04507ae Makes Monday first day of the week even if English language is selected 2019-10-13 13:16:23 +02:00
Igor Scheller fa35187795 Removed .mo translation files from version control, use .po as fallback 2019-10-13 13:16:22 +02:00
Igor Scheller 973c108b15 credits: Make them translatable and use markdown 2019-10-13 13:15:09 +02:00
Igor Scheller 7c9910677e Frontend: Show language selects on every page 2019-10-13 13:15:09 +02:00
Igor Scheller c9ebaa972c Shifts view: Persist hidden filters 2019-10-13 13:15:08 +02:00
Igor Scheller dd03662968 Rebuild password reset 2019-10-08 16:17:06 +02:00
Igor Scheller 8f8130634e Show normal login page after registration, added msg() template function 2019-10-08 15:28:23 +02:00
Igor Scheller 24bfc29220 login: Added div around cookies note to center it 2019-10-06 17:56:53 +02:00
Igor Scheller c5dd21cbd6 Deleted shift: Added message about worklog entry 2019-09-18 04:38:49 +02:00
msquare 4d6a006d3d better login error message 2019-08-18 20:25:09 +02:00
msquare e4c2bd104b fix shift view buttons 2019-08-09 15:06:43 +02:00
msquare 51b5889666 fixes #631: alert/link coloring 2019-08-04 18:03:53 +02:00
marudor a07e62ca67
Use core-js as polyfill to really support older browsers. 2019-07-26 12:40:21 +02:00
msquare 0c51d3c487 make shift calendar printable 2019-07-24 20:57:27 +02:00
msquare 0e6de03ac1 fix login text field icons 2019-07-21 21:12:38 +02:00
msquare eefae43a47 simplified login form, show password recovery always, some camp theme tweaks 2019-07-21 18:53:51 +02:00
msquare 1e16f4c47e
Merge pull request #624 from MyIgel/version
Added version to credits and metrics page
2019-07-21 13:38:05 +02:00
Igor Scheller 4582f808f0 Added version to credits and metrics page 2019-07-21 03:19:19 +02:00
msquare 9e9fee25f2 all 3 color themes for camp and high contrast theme 2019-07-20 23:58:14 +02:00
msquare c412f6b009 add cccamp19 theme 2019-07-20 23:58:14 +02:00
msquare 6ca0e8e81a all 3 color themes for camp and high contrast theme 2019-07-14 13:09:08 +02:00
msquare 10d0428f64 add cccamp19 theme 2019-07-11 20:09:49 +02:00
Igor Scheller 6d5ada2522 Added validation to AuthController 2019-07-09 22:27:34 +02:00
Igor Scheller 508695efb2 Replaced gettext translation with package
This allows to check if no translation is available
2019-07-08 01:58:06 +02:00
Igor Scheller bcce2625a8 Implemented AuthController for login
* Moved /login functionality to AuthController
* Refactored password handling logic to use the Authenticator
2019-07-08 01:57:59 +02:00
Igor Scheller fd4303f336 Fixed translations 2019-07-08 00:57:35 +02:00
Igor Scheller 0458ce9509 Added more error messages 2019-06-04 21:24:59 +02:00
MichiK 142871f852 Add a config option for maximum signup in advance
We now have `signup_advance_hours` in the configuration that
only allows signup for shifts so many hours in the future.
A notice is displayed in the shift view for shifts in the
far future, together with an info notice on when signup for
that shift will be possible.

In addition, we now have a new shift state `NOT_YET` for this
purpose so we do not have to abuse `SHIFT_ENDED` anymore for
`signup_requires_arrival` as well.
2019-06-04 21:24:59 +02:00
msquare 9829e6da39 re add missing translation from twig files 2019-04-28 15:25:03 +02:00
msquare 24d59dbde7 update german translation 2019-04-28 14:55:13 +02:00
msquare 184c36baab update german translation 2019-04-28 14:39:49 +02:00
msquare 60ad343b22 fixes #178: Show not only next but also last shift in free angels view 2019-01-13 16:04:44 +01:00
Igor Scheller 7b3901211a moment.js: Set language on initialization
closes #544 (Translation error german / english mix)
2018-12-28 18:34:41 +01:00
Igor Scheller 97bab8e063 styling: Fix colored links text hover on dark theme
closes #547 (Text-success hover on dark theme)
2018-12-28 17:47:54 +01:00
Igor Scheller b1d8fede46 user: allow up to 40 characters for dect numbers
closes #309 (EPVPN number in DECT field is shortened)
closes #529 (For dect numbers are only 5 digits allowed)
2018-12-22 12:03:24 +01:00
Igor Scheller 330356043d credits: Allow customization 2018-12-22 12:01:23 +01:00
Igor Scheller f1b41e7ad4 styling 35c3: Fix headline color in alerts 2018-12-18 02:24:19 +01:00
msquare 93b819025c fix margin of form submit in tables 2018-12-09 12:51:48 +01:00
MichiK 252f003b94 Really fix the data/timepicker CSS and JS
Attaching the timepicker to the input instead of the sorrounding div didn't
turn out as expected. Therefore, I used the same mechanism for DOM attachment
and lazy initialization for the timepicker like for the datepicker.

Instead of trying to load the CSS through webpack and some JS voodoo, it's
a lot simpler to just include it via the normal base theme CSS. This works.
In addition, I noticed that there is an easier way to read the current locale.
No need to do this twice via different ways.

This closes #516.
2018-12-08 21:14:20 +01:00
MichiK f83e754f84 Fix the timepicker in shifts view
This is one part of #516.
2018-12-08 11:12:08 +01:00
msquare 5891dff584 fix button font colors 2018-12-07 17:30:54 +01:00
Igor Scheller e3fa19b71e styling 35c3: Lighten the font color 2018-12-07 16:59:55 +01:00
MichiK 44e33eb2de Some small JS fixes for eslint compliance 2018-12-06 22:45:40 +01:00
MichiK ed5ee3235e Add timepickers in shifts view 2018-12-05 18:43:51 +01:00
MichiK 4e3232e57a Replace datepicker and remove datepicker inline JS 2018-12-04 21:03:32 +01:00
Igor Scheller 2588bbf7bc Templating: Improved error templates 2018-12-02 12:53:31 +01:00
msquare e0de2c2c65 more work on 35c3 theme 2018-11-25 15:40:53 +01:00
msquare b36721f0c2 add more colors from c3groc to the 35c3 theme 2018-11-24 17:22:56 +01:00
Igor Scheller 23c0fae36f Added csrf middleware 2018-11-21 19:24:36 +01:00
msquare c1494fc1e7 add 35c3 theme dark 2018-11-11 20:50:25 +01:00
Igor Scheller d15946df2d Changed `src/` code and templates to use the new user model 2018-10-31 13:43:23 +01:00
Igor Scheller 90e1a94962 Make application name configurable
* Added app_name configuration option
* Extended `EngelsystemMailer` to prepend the application name to all mails

Closes #426
2018-10-30 22:50:22 +01:00
Igor Scheller 0aa5f07925 Replaced angel icons with svg 2018-10-30 22:50:22 +01:00
Igor Scheller 7f61dc95be EventConfig: Merge event configuration from database to global config 2018-10-30 21:13:56 +01:00
Igor Scheller fcee7d752f Templates cleanup 2018-10-24 23:50:44 +02:00
Igor Scheller 2aad181798 Footer: Add additional links to the footer
Closes #435 (Support for additional footer links)
2018-10-24 22:31:32 +02:00
Igor Scheller 414a21b3c6 Shifts overview: Moved the filter button to be more visible 2018-10-24 19:18:35 +02:00
Igor Scheller c1e0e121f0 Navbar: Display user angel icon 2018-10-24 19:15:52 +02:00
Igor Scheller 66038eda14 Merge branch 'twig-templates' 2018-09-23 20:11:37 +02:00
Nos- b2303c0723 Tried to fix inputfields for date, email, tel 2018-09-23 11:48:09 +02:00
Igor Scheller 2a134e6c0b Config: Removed nightshifts query 2018-09-23 11:40:53 +02:00
Igor Scheller 13d2786b7b Moved scripts/copyAssets.js to resources folder and fixed formatting 2018-09-10 22:49:51 +02:00
Igor Scheller 8456a3cf6f Moved emojis to assets 2018-09-10 22:49:46 +02:00
Igor Scheller c1a1180d1f Moved frontend, templates and lang to resources 2018-09-10 18:22:48 +02:00