diff --git a/dav_base/config/modules.py b/dav_base/config/modules.py index ebba340..6c82e87 100644 --- a/dav_base/config/modules.py +++ b/dav_base/config/modules.py @@ -36,20 +36,22 @@ class ModuleMeta: return self._additional_apps @property - def url_conf_pattern(self): - url_pattern = '^' + def url_prefix(self): if self._url_prefix is None: - url_pattern += self._package_name + return self._package_name else: - url_pattern += self._url_prefix - url_pattern += '/' - url_conf = self._package_name + '.urls' - return django_conf_url(url_pattern, include(url_conf, self.url_namespace)) + return self._url_prefix @property def url_namespace(self): return self._package_name.replace('.', '_') + @property + def url_conf_pattern(self): + url_pattern = '^{}/'.format(self.url_prefix) + url_conf = self._package_name + '.urls' + return django_conf_url(url_pattern, include(url_conf, self.url_namespace)) + def _load_from_package(self): package_name = self._package_name json_text = pkg_resources.resource_string(package_name, self._json_file) diff --git a/dav_base/console_scripts/django_project_config/settings-dav_base.py b/dav_base/console_scripts/django_project_config/settings-dav_base.py index a86f7bc..be0fabe 100644 --- a/dav_base/console_scripts/django_project_config/settings-dav_base.py +++ b/dav_base/console_scripts/django_project_config/settings-dav_base.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # E-Mails -EMAIL_SENDER = 'DAV heinzel ' +EMAIL_SENDER = 'DAV Touren & Kurse ' EMAIL_BASE_URL = 'http://localhost:8000' -EMAIL_SUBJECT_PREFIX = u'[DAV heinzel]' +EMAIL_SUBJECT_PREFIX = u'[DAV Touren & Kurse]' # The following settings are for the test suite. Do not change them. TEST_SETTING = 'do not change this value' diff --git a/dav_base/static/dav_base/css/local.css b/dav_base/static/dav_base/css/local.css index b1f3bc6..2b3c64a 100644 --- a/dav_base/static/dav_base/css/local.css +++ b/dav_base/static/dav_base/css/local.css @@ -63,7 +63,7 @@ thead input { } #page-header h2 img { - margin-right: 1.2rem; + margin-right: .6rem; } #page-header h2 a { @@ -166,6 +166,16 @@ thead input { padding: 0px; } +/* + * Used to decolourize a link. + */ +.text-default { + color: #333; +} +a.text-default:hover, a.text-default:focus { + color: #333; +} + /* * We need more text colors (for event stati) */ diff --git a/dav_base/templates/dav_base/base.html b/dav_base/templates/dav_base/base.html index 058cc21..d26f8f2 100644 --- a/dav_base/templates/dav_base/base.html +++ b/dav_base/templates/dav_base/base.html @@ -31,9 +31,9 @@

- - {% block project-name %}{% include_if_exist 'project_name.html' %}{% endblock project-name %} - + + {% block project-name %}{% include_if_exist 'project_name.html' %}{% endblock project-name %}

{% include_if_exist 'dav_auth/includes/login_widget.html' %}
@@ -59,9 +59,9 @@
-
{% block signum %}heinzel@alpenverein-karlsruhe.de{% endblock signum %}
- © Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.  •  - {% trans 'Impressum' %} +
{% block signum %}tourenportal@alpenverein-karlsruhe.de{% endblock signum %}
+ © Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.  •  + {% trans 'Impressum' %}
diff --git a/dav_base/templates/dav_base/css_demo.html b/dav_base/templates/dav_base/css_demo.html index 59f8ecb..e382c05 100644 --- a/dav_base/templates/dav_base/css_demo.html +++ b/dav_base/templates/dav_base/css_demo.html @@ -5,8 +5,10 @@ {% block messages %}
- {% bootstrap_alert "This is a message." %} - {% bootstrap_alert "This is a message." %} + {% bootstrap_alert "This is a default (info) message." %} + {% bootstrap_alert "This is a success message." alert_type="success" %} + {% bootstrap_alert "This is a warning message." alert_type="warning" %} + {% bootstrap_alert "This is a error (danger) message." alert_type="danger" %}
{% endblock messages %} @@ -19,13 +21,14 @@
Header h6 Small Text
-

Hallo

+

This is a jumbotron with h1 header

{% lorem %}

+

This is a well with h2 header

{% lorem %}

@@ -33,24 +36,78 @@ {% lorem %}

+
+

Regular Bootstrap Buttons

btn-default btn-primary btn-success btn-info btn-warning btn-danger + +

Additional defined Buttons

+

+btn-white +btn-orange +btn-green +btn-blue +btn-yellow +btn-red +

+

+btn-black +btn-mandarin +btn-lime +btn-cyan +btn-caramel +btn-plum +btn-purple +

-

Text-Muted {% lorem %}

-

Text-Primary {% lorem %}

-

Text-Success {% lorem %}

-

Text-Info {% lorem %}

-

Text-Warning {% lorem %}

-

Text-Danger {% lorem %}

+

Regular Bootstrap Text

+

text-muted {% lorem %}

+

text-primary {% lorem %}

+

text-success {% lorem %}

+

text-info {% lorem %}

+

text-warning {% lorem %}

+

text-danger {% lorem %}

+

Additional defined Text

+

text-default {% lorem %}

+

text-orange {% lorem %}

+

text-green {% lorem %}

+

text-blue {% lorem %}

+

text-yellow {% lorem %}

+

text-red {% lorem %}

+

text-mandarin {% lorem %}

+

text-lime {% lorem %}

+

text-cyan {% lorem %}

+

text-caramel {% lorem %}

+

text-plum {% lorem %}

+

text-purple {% lorem %}

+
+ + +

Regular Bootstrap Backgrounds

+

bg-primary {% lorem %}

bg-success {% lorem %}

bg-info {% lorem %}

bg-warning {% lorem %}

bg-danger {% lorem %}

+ +

Additional defined Backgrounds

+

bg-orange {% lorem %}

+

bg-green {% lorem %}

+

bg-blue {% lorem %}

+

bg-yellow {% lorem %}

+

bg-red {% lorem %}

+

bg-mandarin {% lorem %}

+

bg-lime {% lorem %}

+

bg-cyan {% lorem %}

+

bg-caramel {% lorem %}

+

bg-plum {% lorem %}

+

bg-purple {% lorem %}

+
{% endblock page-container-fluid %} diff --git a/dav_base/tests/test_templates.py b/dav_base/tests/test_templates.py index f5fb812..b61e7ee 100644 --- a/dav_base/tests/test_templates.py +++ b/dav_base/tests/test_templates.py @@ -45,9 +45,9 @@ class TemplatesTestCase(SimpleTestCase): html = """
-
heinzel@alpenverein-karlsruhe.de
- © Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.  •  - Impressum +
tourenportal@alpenverein-karlsruhe.de
+ © Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.  •  + Impressum
""" diff --git a/dav_events/forms/events.py b/dav_events/forms/events.py index 53a8289..2b83268 100644 --- a/dav_events/forms/events.py +++ b/dav_events/forms/events.py @@ -227,7 +227,7 @@ class ModeForm(EventCreateForm): ) level = forms.ChoiceField(choices=choices.LEVEL_CHOICES, - label=_(u'Schwierigkeitsnivau'), + label=_(u'Schwierigkeitsnivau / Familien'), widget=forms.RadioSelect()) first_day = forms.DateField(required=True, diff --git a/dav_events/templates/dav_events/home.html b/dav_events/templates/dav_events/home.html index ce39d20..9e7809b 100644 --- a/dav_events/templates/dav_events/home.html +++ b/dav_events/templates/dav_events/home.html @@ -3,6 +3,6 @@ {% load i18n %} {% block page-container-fluid %} -

{% trans 'Für Tourenleiter' %}

+

{% trans 'Für Tourenleiter*innen' %}

{% include './includes/home_tiles.html' %} {% endblock page-container-fluid %} diff --git a/dav_events/tests/test_urls.py b/dav_events/tests/test_urls.py index c626b84..df70ec7 100644 --- a/dav_events/tests/test_urls.py +++ b/dav_events/tests/test_urls.py @@ -1,8 +1,10 @@ +from django.conf import settings + from dav_base.tests.generic import Url, UrlsTestCase from .. import views -url_prefix = 'events' +url_prefix = settings.MODULE_CONFIG.modules['dav_events'].url_prefix class TestCase(UrlsTestCase): diff --git a/dav_registration/templates/dav_registration/home.html b/dav_registration/templates/dav_registration/home.html new file mode 100644 index 0000000..efdac5c --- /dev/null +++ b/dav_registration/templates/dav_registration/home.html @@ -0,0 +1,8 @@ +{% extends "dav_registration/base.html" %} +{% load bootstrap3 %} +{% load i18n %} + +{% block page-container-fluid %} +

{% trans 'Für Teilnehmer*innen' %}

+{% include './includes/home_tiles.html' %} +{% endblock page-container-fluid %} diff --git a/dav_registration/templates/dav_registration/includes/home_tiles.html b/dav_registration/templates/dav_registration/includes/home_tiles.html new file mode 100644 index 0000000..247b82e --- /dev/null +++ b/dav_registration/templates/dav_registration/includes/home_tiles.html @@ -0,0 +1,17 @@ +{% load bootstrap3 %} +{% load i18n %} + +
+
+
+

Bei Veranstaltungen anmelden...

+

+ Hier siehst du welche Touren und Kurse angeboten werden und + kannst dich dafür anmelden. +

+

+ Zur Veranstaltungsliste +

+
+
+
diff --git a/dav_registration/urls.py b/dav_registration/urls.py index c0585d8..3051da5 100644 --- a/dav_registration/urls.py +++ b/dav_registration/urls.py @@ -6,6 +6,7 @@ app_name = 'dav_registration' urlpatterns = [ url(r'^$', views.RootView.as_view(), name='root'), + url(r'^home$', views.HomeView.as_view(), name='home'), url(r'^finished', views.RegistrationSuccessView.as_view(), name='registered'), url(r'^event/(?P\d+)/registration', views.RegistrationView.as_view(), name='register'), url(r'^event/(?P\d+)/', views.EventDetailView.as_view(), name='event'), diff --git a/dav_registration/views.py b/dav_registration/views.py index 961cab1..f2b39d0 100644 --- a/dav_registration/views.py +++ b/dav_registration/views.py @@ -27,6 +27,10 @@ class RootView(generic.RedirectView): return super().get(request, *args, **kwargs) +class HomeView(generic.TemplateView): + template_name = 'dav_registration/home.html' + + class EventListView(generic.ListView): model = Event template_name = 'dav_registration/event_list.html'