Switch to new css colour classes for event stati
Run tests / Execute tox to run the test suite (push) Successful in 2m54s
Run tests / Execute tox to run the test suite (push) Successful in 2m54s
This commit is contained in:
@@ -13,7 +13,8 @@
|
|||||||
* purple #866dac #566088 #e1d8f0 #c2b0e1 #a694c2 #866dac #8067a8 #2f263c #5a4876 -------- MTB - ----- ------
|
* purple #866dac #566088 #e1d8f0 #c2b0e1 #a694c2 #866dac #8067a8 #2f263c #5a4876 -------- MTB - ----- ------
|
||||||
* plum #aa6c95 #784c69 #f0d4e7 #e6b0d4 #be91af #aa6c95 #a66691 #3c2635 #764867 -------- ----- famil ------
|
* plum #aa6c95 #784c69 #f0d4e7 #e6b0d4 #be91af #aa6c95 #a66691 #3c2635 #764867 -------- ----- famil ------
|
||||||
* brown #??? #??? #??? #??? #925f36 #??? #??? #??? #??? -------- ----- ----- ------
|
* brown #??? #??? #??? #??? #925f36 #??? #??? #??? #??? -------- ----- ----- ------
|
||||||
* black #??? #??? #??? #??? #??? #??? #??? #??? #??? -------- ----- ----- clear
|
* black #333 #??? #333 #??? #??? #??? #??? #??? #??? -------- ----- ----- clear
|
||||||
|
* gray #??? #??? #878787 #??? #??? #??? #??? #??? #??? -------- ----- ----- ------
|
||||||
* white #??? #??? #??? #??? #??? #??? #??? #??? #??? -------- ----- ----- ------
|
* white #??? #??? #??? #??? #??? #??? #??? #??? #??? -------- ----- ----- ------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Generated by Django 5.2.13 on 2026-06-16 13:21
|
||||||
|
|
||||||
|
import django.core.validators
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('dav_events', '0044_alter_event_level'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='eventstatus',
|
||||||
|
name='bootstrap_context',
|
||||||
|
field=models.CharField(blank=True, choices=[('default', 'default'), ('primary', 'primary'), ('success', 'success'), ('info', 'info'), ('warning', 'warning'), ('danger', 'danger'), ('dav-purple', 'dav-purple'), ('dav-lime', 'dav-lime'), ('dav-cyan', 'dav-cyan'), ('dav-caramel', 'dav-caramel'), ('dav-mandarin', 'dav-mandarin'), ('dav-brown', 'dav-brown'), ('orange', 'orange'), ('green', 'green'), ('blue', 'blue'), ('yellow', 'yellow'), ('red', 'red'), ('mandarin', 'mandarin'), ('lime', 'lime'), ('cyan', 'cyan'), ('caramel', 'caramel'), ('purple', 'purple'), ('plum', 'plum'), ('black', 'black'), ('white', 'white')], max_length=20),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='participant',
|
||||||
|
name='dav_number',
|
||||||
|
field=models.CharField(blank=True, max_length=62, validators=[django.core.validators.RegexValidator('^([0-9]{3}/[0-9]{2}/)?[0-9]{1,6}([*x ][0-9]{4})?([*x ][0-9]{4}[*x ][0-9]{4})?([*x ][0-9]{8})?$', 'Ungültiges Format.')], verbose_name='DAV Mitgliedsnummer'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='trashedparticipant',
|
||||||
|
name='dav_number',
|
||||||
|
field=models.CharField(blank=True, max_length=62, validators=[django.core.validators.RegexValidator('^([0-9]{3}/[0-9]{2}/)?[0-9]{1,6}([*x ][0-9]{4})?([*x ][0-9]{4}[*x ][0-9]{4})?([*x ][0-9]{8})?$', 'Ungültiges Format.')], verbose_name='DAV Mitgliedsnummer'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -11,13 +11,25 @@ BOOTSTRAP_CONTEXT_CHOICES = (
|
|||||||
('info', 'info'),
|
('info', 'info'),
|
||||||
('warning', 'warning'),
|
('warning', 'warning'),
|
||||||
('danger', 'danger'),
|
('danger', 'danger'),
|
||||||
('black', 'black'),
|
|
||||||
('dav-purple', 'dav-purple'),
|
('dav-purple', 'dav-purple'),
|
||||||
('dav-lime', 'dav-lime'),
|
('dav-lime', 'dav-lime'),
|
||||||
('dav-cyan', 'dav-cyan'),
|
('dav-cyan', 'dav-cyan'),
|
||||||
('dav-caramel', 'dav-caramel'),
|
('dav-caramel', 'dav-caramel'),
|
||||||
('dav-mandarin', 'dav-mandarin'),
|
('dav-mandarin', 'dav-mandarin'),
|
||||||
('dav-brown', 'dav-brown'),
|
('dav-brown', 'dav-brown'),
|
||||||
|
('orange', 'orange'),
|
||||||
|
('green', 'green'),
|
||||||
|
('blue', 'blue'),
|
||||||
|
('yellow', 'yellow'),
|
||||||
|
('red', 'red'),
|
||||||
|
('mandarin', 'mandarin'),
|
||||||
|
('lime', 'lime'),
|
||||||
|
('cyan', 'cyan'),
|
||||||
|
('caramel', 'caramel'),
|
||||||
|
('purple', 'purple'),
|
||||||
|
('plum', 'plum'),
|
||||||
|
('black', 'black'),
|
||||||
|
('white', 'white'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -183,9 +183,9 @@
|
|||||||
{% if not event.registration_required %}
|
{% if not event.registration_required %}
|
||||||
<span class="label label-success">{% trans 'Anmeldung nicht erforderlich' %}</span>
|
<span class="label label-success">{% trans 'Anmeldung nicht erforderlich' %}</span>
|
||||||
{% elif is_canceled %}
|
{% elif is_canceled %}
|
||||||
<span class="label label-dav-mandarin">{% trans 'Veranstaltung abgesagt' %}</span>
|
<span class="label label-{{ event.workflow.get_status_list.0.bootstrap_context|default:'default' }}">{% trans 'Veranstaltung abgesagt' %}</span>
|
||||||
{% elif is_realized or is_expired %}
|
{% elif is_realized or is_expired %}
|
||||||
<span class="label label-dav-lime">{% trans 'Veranstaltung beendet' %}</span>
|
<span class="label label-{{ event.workflow.get_status_list.0.bootstrap_context|default:'default' }}">{% trans 'Veranstaltung beendet' %}</span>
|
||||||
{% elif event.registration_closed %}
|
{% elif event.registration_closed %}
|
||||||
<span class="label label-danger">{% trans 'Anmeldung geschlossen' %}</span>
|
<span class="label label-danger">{% trans 'Anmeldung geschlossen' %}</span>
|
||||||
{% elif event.is_deadline_expired %}
|
{% elif event.is_deadline_expired %}
|
||||||
|
|||||||
+11
-11
@@ -21,18 +21,18 @@ oneday = datetime.timedelta(1)
|
|||||||
|
|
||||||
DEFAULT_EVENT_STATI = {
|
DEFAULT_EVENT_STATI = {
|
||||||
'void': (0, _(u'Ungültig'), None),
|
'void': (0, _(u'Ungültig'), None),
|
||||||
'draft': (10, _(u'Entwurf'), 'info'),
|
'draft': (10, _(u'Entwurf'), 'blue'),
|
||||||
'submitted': (30, _(u'Eingereicht'), 'danger'),
|
'submitted': (30, _(u'Eingereicht'), 'red'),
|
||||||
'accepted': (50, _(u'Freigegeben'), 'warning'),
|
'accepted': (50, _(u'Freigegeben'), 'yellow'),
|
||||||
'publishing_facebook': (68, _(u'Veröffentlichung (Facebook)'), 'warning'),
|
'publishing_facebook': (68, _(u'Veröffentlichung (Facebook)'), 'yellow'),
|
||||||
'publishing_web': (69, _(u'Veröffentlichung (Web)'), 'warning'),
|
'publishing_web': (69, _(u'Veröffentlichung (Web)'), 'yellow'),
|
||||||
'publishing': (70, _(u'Veröffentlichung'), 'warning'),
|
'publishing': (70, _(u'Veröffentlichung'), 'yellow'),
|
||||||
'published_facebook': (78, _(u'Veröffentlicht (Facebook)'), 'success'),
|
'published_facebook': (78, _(u'Veröffentlicht (Facebook)'), 'green'),
|
||||||
'published_web': (79, _(u'Veröffentlicht (Web)'), 'success'),
|
'published_web': (79, _(u'Veröffentlicht (Web)'), 'green'),
|
||||||
'published': (80, _(u'Veröffentlicht'), 'success'),
|
'published': (80, _(u'Veröffentlicht'), 'green'),
|
||||||
'expired': (100, _(u'Ausgelaufen'), None),
|
'expired': (100, _(u'Ausgelaufen'), None),
|
||||||
'canceled': (101, _(u'Abgesagt'), 'dav-mandarin'),
|
'canceled': (101, _(u'Abgesagt'), 'mandarin'),
|
||||||
'realized': (102, _(u'Durchgeführt'), 'dav-lime'),
|
'realized': (102, _(u'Durchgeführt'), 'lime'),
|
||||||
'cleared': (110, _(u'Abgerechnet'), 'black'),
|
'cleared': (110, _(u'Abgerechnet'), 'black'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.2.13 on 2026-06-16 13:21
|
||||||
|
|
||||||
|
import django.core.validators
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('dav_registration', '0012_alter_registrationstatus_accepted'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='registration',
|
||||||
|
name='dav_number',
|
||||||
|
field=models.CharField(blank=True, help_text='Deine Mitgliedsnummer findest du unter dem Strichcode auf deinem DAV Ausweis.<br /> Beispiel: <tt>131/00/012345</tt> (der Teil bis zum ersten * genügt)', max_length=62, validators=[django.core.validators.RegexValidator('^([0-9]{3}/[0-9]{2}/)?[0-9]{1,6}([*x ][0-9]{4})?([*x ][0-9]{4}[*x ][0-9]{4})?([*x ][0-9]{8})?$', 'Ungültiges Format.')], verbose_name='DAV Mitgliedsnummer'),
|
||||||
|
),
|
||||||
|
]
|
||||||
Reference in New Issue
Block a user