diff --git a/dav_base/static/dav_base/css/local.css b/dav_base/static/dav_base/css/local.css index 0b9dd27..b1f3bc6 100644 --- a/dav_base/static/dav_base/css/local.css +++ b/dav_base/static/dav_base/css/local.css @@ -11,7 +11,8 @@ * cyan #54bbd9 #469db5 #d8ebf0 #a7d5e1 #86cfe4 #54bbd9 #4cb8d7 #17343c #3a8ea5 Ski * caramel #9c5b22 #78461a #f0e3d8 #e1c6b0 #ce792d #9c5b22 #935720 #3c230d #613915 Wanderung * purple #866dac #566088 #e1d8f0 #c2b0e1 #a694c2 #866dac #8067a8 #2f263c #5a4876 Mountainbike - * brown ??? ??? ??? ??? #925f36 ??? ??? ??? ??? + * plum #a068a0 #784e78 #ebd4eb #dcb1dc #be91be #906e90 #a780a7 #352935 #705670 family + * brown #??? #??? #??? #??? #925f36 #??? #??? #??? #??? */ /* @@ -274,7 +275,7 @@ thead input { } /* - * Elements for sport categories + * Elements for sport choices */ /* * Bergsteigen: lime @@ -343,8 +344,47 @@ thead input { } /* - * Universal Buttons + * Elements for level choices */ +/* + * advanced: mandarin + */ +.label-level-advanced { + background-color: #e84e1b; +} +.btn-level-advanced { + background-color: #e84e1b; + border-color: #aa3711; + color: #fff; +} +.btn-level-advanced.focus, .btn-level-advanced:focus, .btn-level-advanced:hover { + background-color: #b43a12; + border-color: #3c1306; + color: #fff; +} +/* + * family: plum + */ +.label-level-family { + background-color: #be91be; +} +.btn-level-family { + background-color: #be91be; + border-color: #a780a7; + color: #fff; +} +.btn-level-family.focus, .btn-level-family:focus, .btn-level-family:hover { + background-color: #906e90; + border-color: #352935; + color: #fff; +} + +/* + * Coloured Elements (Buttons, Labels) for universal use + */ +.label-orange { + background-color: #f07d00; +} .btn-orange { background-color: #f07d00; border-color: #d77000; @@ -355,6 +395,9 @@ thead input { border-color: #572d00; color: #fff; } +.label-green { + background-color: #58ab27; +} .btn-green { background-color: #58ab27; border-color: #4d9622; @@ -365,6 +408,9 @@ thead input { border-color: #182e0b; color: #fff; } +.label-blue { + background-color: #1d70b7; +} .btn-blue { background-color: #1d70b7; border-color: #1a63a1; @@ -375,6 +421,9 @@ thead input { border-color: #081f33; color: #fff; } +.label-yellow { + background-color: #f9b000; +} .btn-yellow { background-color: #f9b000; border-color: #e09e00; @@ -385,6 +434,9 @@ thead input { border-color: #604400; color: #fff; } +.label-red { + background-color: #be1621; +} .btn-red { background-color: #be1621; border-color: #a7131d; @@ -395,6 +447,9 @@ thead input { border-color: #350609; color: #fff; } +.label-mandarin { + background-color: #e84e1b; +} .btn-mandarin { background-color: #e84e1b; border-color: #aa3711; @@ -405,6 +460,9 @@ thead input { border-color: #3c1306; color: #fff; } +.label-lime { + background-color: #bccf07; +} .btn-lime { background-color: #bccf07; border-color: #7c8801; @@ -415,6 +473,9 @@ thead input { border-color: #2e3200; color: #fff; } +.label-cyan { + background-color: #86cfe4; +} .btn-cyan { background-color: #86cfe4; border-color: #4cb8d7; @@ -425,6 +486,9 @@ thead input { border-color: #17343c; color: #fff; } +.label-caramel { + background-color: #ce792d; +} .btn-caramel { background-color: #ce792d; border-color: #935720; @@ -435,6 +499,9 @@ thead input { border-color: #3c230d; color: #fff; } +.label-purple { + background-color: #a694c2; +} .btn-purple { background-color: #a694c2; border-color: #8067a8; @@ -445,6 +512,19 @@ thead input { border-color: #2f263c; color: #fff; } +.label-plum { + background-color: #be91be; +} +.btn-plum { + background-color: #be91be; + border-color: #a780a7; + color: #fff; +} +.btn-plum.focus, .btn-plum:focus, .btn-plum:hover { + background-color: #906e90; + border-color: #352935; + color: #fff; +} .btn-white { background-color: #fff; diff --git a/dav_events/choices.py b/dav_events/choices.py index 8167b8b..6388955 100644 --- a/dav_events/choices.py +++ b/dav_events/choices.py @@ -71,6 +71,7 @@ DEADLINE_CHOICES = ChoiceSet([ LEVEL_CHOICES = ChoiceSet([ ('beginner', _(u'Anfänger')), ('advanced', _(u'Fortgeschrittene')), + ('family', _(u'Familien')), ]) MEALS_CHOICES = ChoiceSet([ diff --git a/dav_events/forms/events.py b/dav_events/forms/events.py index af144f1..53a8289 100644 --- a/dav_events/forms/events.py +++ b/dav_events/forms/events.py @@ -970,28 +970,38 @@ class DescriptionForm(EventCreateForm): value = u'' if mode == 'training': - if level == 'beginner': - value += u'%s ' % ugettext(u'Grundkurs') + # Titelprefix für Kurse + if level == 'family': + value += u'%s' % ugettext(u'Familienkurs') + elif level == 'beginner': + value += u'%s' % ugettext(u'Grundkurs') else: - value += u'%s ' % ugettext(u'Aufbaukurs') + value += u'%s' % ugettext(u'Aufbaukurs') if sport == 'B': - value += u'%s' % ugettext(u'Alpin') + value += u' %s' % ugettext(u'Alpin') elif sport == 'K': if terrain == 'gym': - value += ugettext(u'Indoorklettern') + value += u' %s' % ugettext(u'Indoorklettern') elif terrain == 'crag': - value += ugettext(u'Fels') + value += u' %s' % ugettext(u'Fels') elif terrain == 'alpine': - value += ugettext(u'Alpinklettern') + value += u' %s' % ugettext(u'Alpinklettern') value += u': ...' - elif sport == 'W' and not last_day: - value += u'%s ...' % ugettext(u'Tageswanderung') + elif sport == 'W': + # Titelprefix für Wanderungen + if level == 'family': + value += u'%s ...' % ugettext(u'Familienwanderung') + elif not last_day: + value += u'%s ...' % ugettext(u'Tageswanderung') + elif level == 'family': + # Titelprefix für sonstige Familientouren + value += u'%s: ...' % ugettext(u'Familientour') if app_config.settings.forms_development_init: if not value: - value = u'%s' % choices.SPORT_CHOICES.get_label(sport) + value += u'%s' % choices.SPORT_CHOICES.get_label(sport) return value diff --git a/dav_events/migrations/0043_alter_event_level.py b/dav_events/migrations/0043_alter_event_level.py new file mode 100644 index 0000000..60d0f76 --- /dev/null +++ b/dav_events/migrations/0043_alter_event_level.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2023-02-26 22:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dav_events', '0042_auto_20220607_1345'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='level', + field=models.CharField(choices=[('beginner', 'Anfänger'), ('advanced', 'Fortgeschrittene'), ('family', 'Familien')], max_length=25, verbose_name='Schwierigkeitsnivau'), + ), + ] diff --git a/dav_registration/templates/dav_registration/event_list.html b/dav_registration/templates/dav_registration/event_list.html index aa22557..600a138 100644 --- a/dav_registration/templates/dav_registration/event_list.html +++ b/dav_registration/templates/dav_registration/event_list.html @@ -8,6 +8,7 @@