DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Cosmetic changes
All checks were successful
buildbot/django-dav-events--test Build done.
Details

Browse Source
This commit is contained in:
heinzel
2023-02-27 15:20:08 +01:00
parent 3c53403d17
commit fb21a8721f
13 changed files with 132 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dav_base/config/modules.py
View File

@@ -36,20 +36,22 @@ class ModuleMeta:
return self._additional_apps return self._additional_apps
@property @property
def url_conf_pattern(self): def url_prefix(self):
url_pattern = '^'
if self._url_prefix is None: if self._url_prefix is None:
url_pattern += self._package_name return self._package_name
else: else:
url_pattern += self._url_prefix return self._url_prefix
url_pattern += '/'
url_conf = self._package_name + '.urls'
return django_conf_url(url_pattern, include(url_conf, self.url_namespace))
@property @property
def url_namespace(self): def url_namespace(self):
return self._package_name.replace('.', '_') 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): def _load_from_package(self):
package_name = self._package_name package_name = self._package_name
json_text = pkg_resources.resource_string(package_name, self._json_file) json_text = pkg_resources.resource_string(package_name, self._json_file)

4
dav_base/console_scripts/django_project_config/settings-dav_base.py
View File

@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# E-Mails # E-Mails
EMAIL_SENDER = 'DAV heinzel <heinzel@alpenverein-karlsruhe.de>' EMAIL_SENDER = 'DAV Touren & Kurse <tourenportal@alpenverein-karlsruhe.de>'
EMAIL_BASE_URL = 'http://localhost:8000' 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. # The following settings are for the test suite. Do not change them.
TEST_SETTING = 'do not change this value' TEST_SETTING = 'do not change this value'

12
dav_base/static/dav_base/css/local.css
View File

@@ -63,7 +63,7 @@ thead input {
} }
#page-header h2 img { #page-header h2 img {
margin-right: 1.2rem; margin-right: .6rem;
} }
#page-header h2 a { #page-header h2 a {
@@ -166,6 +166,16 @@ thead input {
padding: 0px; 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) * We need more text colors (for event stati)
*/ */

12
dav_base/templates/dav_base/base.html
View File

@@ -31,9 +31,9 @@
<div id="page"> <div id="page">
<div id="page-header"> <div id="page-header">
<h2> <h2>
<a href="{% url 'root' %}"> <a href="https://alpenverein-karlsruhe.de" target="_blank"><img
<img width="217" height="30" src="{% static 'dav_base/img/brand.png' %}" />{% block project-name %}{% include_if_exist 'project_name.html' %}{% endblock project-name %} width="217" height="30" src="{% static 'dav_base/img/brand.png' %}" /></a>
</a> <a href="{% url 'root' %}">{% block project-name %}{% include_if_exist 'project_name.html' %}{% endblock project-name %}</a>
</h2> </h2>
<div id="login-widget">{% include_if_exist 'dav_auth/includes/login_widget.html' %}</div> <div id="login-widget">{% include_if_exist 'dav_auth/includes/login_widget.html' %}</div>
</div> </div>
@@ -59,9 +59,9 @@
</div> </div>
<div id="page-footer"> <div id="page-footer">
<div class="signum">{% block signum %}<a href="mailto:heinzel@alpenverein-karlsruhe.de">heinzel@alpenverein-karlsruhe.de</a>{% endblock signum %}</div> <div class="signum">{% block signum %}<a href="mailto:tourenportal@alpenverein-karlsruhe.de">tourenportal@alpenverein-karlsruhe.de</a>{% endblock signum %}</div>
<a href="http://alpenverein-karlsruhe.de" target="_blank">&copy; Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.</a> &ensp;&bull;&ensp; <a href="https://alpenverein-karlsruhe.de" target="_blank">&copy; Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.</a> &ensp;&bull;&ensp;
<a href="http://alpenverein-karlsruhe.de/impressum">{% trans 'Impressum' %}</a> <a href="https://alpenverein-karlsruhe.de/impressum">{% trans 'Impressum' %}</a>
</div> </div>
</div> </div>
</body> </body>

75
dav_base/templates/dav_base/css_demo.html
View File

@@ -5,8 +5,10 @@
{% block messages %} {% block messages %}
<div class="container-fluid"> <div class="container-fluid">
{% bootstrap_alert "This is a message." %} {% bootstrap_alert "This is a default (info) message." %}
{% bootstrap_alert "This is a 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" %}
</div> </div>
{% endblock messages %} {% endblock messages %}
@@ -19,13 +21,14 @@
<h6>Header h6 <small>Small Text</small></h6> <h6>Header h6 <small>Small Text</small></h6>
<div class="jumbotron"> <div class="jumbotron">
<h1>Hallo</h1> <h1>This is a jumbotron with h1 header</h1>
<p> <p>
{% lorem %} {% lorem %}
</p> </p>
</div> </div>
<div class="well"> <div class="well">
<h2>This is a well with h2 header</h2>
<p class="lead"> <p class="lead">
{% lorem %} {% lorem %}
</p> </p>
@@ -33,24 +36,78 @@
{% lorem %} {% lorem %}
</p> </p>
</div> </div>
<hr />
<h3>Regular Bootstrap Buttons</h3>
<a class="btn btn-default" href="#">btn-default</a> <a class="btn btn-default" href="#">btn-default</a>
<a class="btn btn-primary" href="#">btn-primary</a> <a class="btn btn-primary" href="#">btn-primary</a>
<a class="btn btn-success" href="#">btn-success</a> <a class="btn btn-success" href="#">btn-success</a>
<a class="btn btn-info" href="#">btn-info</a> <a class="btn btn-info" href="#">btn-info</a>
<a class="btn btn-warning" href="#">btn-warning</a> <a class="btn btn-warning" href="#">btn-warning</a>
<a class="btn btn-danger" href="#">btn-danger</a> <a class="btn btn-danger" href="#">btn-danger</a>
<h3>Additional defined Buttons</h3>
<p>
<a class="btn btn-white" href="#">btn-white</a>
<a class="btn btn-orange" href="#">btn-orange</a>
<a class="btn btn-green" href="#">btn-green</a>
<a class="btn btn-blue" href="#">btn-blue</a>
<a class="btn btn-yellow" href="#">btn-yellow</a>
<a class="btn btn-red" href="#">btn-red</a>
</p>
<p>
<a class="btn btn-black" href="#">btn-black</a>
<a class="btn btn-mandarin" href="#">btn-mandarin</a>
<a class="btn btn-lime" href="#">btn-lime</a>
<a class="btn btn-cyan" href="#">btn-cyan</a>
<a class="btn btn-caramel" href="#">btn-caramel</a>
<a class="btn btn-plum" href="#">btn-plum</a>
<a class="btn btn-purple" href="#">btn-purple</a>
</p>
<hr /> <hr />
<p class="text-muted"><span class="label label-default">Text-Muted</span> {% lorem %}</p> <h3>Regular Bootstrap Text</h3>
<p class="text-primary"><span class="label label-primary">Text-Primary</span> {% lorem %}</p> <p class="text-muted"><span class="label label-default">text-muted</span> {% lorem %}</p>
<p class="text-success"><span class="label label-success">Text-Success</span> {% lorem %}</p> <p class="text-primary"><span class="label label-primary">text-primary</span> {% lorem %}</p>
<p class="text-info"><span class="label label-info">Text-Info</span> {% lorem %}</p> <p class="text-success"><span class="label label-success">text-success</span> {% lorem %}</p>
<p class="text-warning"><span class="label label-warning">Text-Warning</span> {% lorem %}</p> <p class="text-info"><span class="label label-info">text-info</span> {% lorem %}</p>
<p class="text-danger"><span class="label label-danger">Text-Danger</span> {% lorem %}</p> <p class="text-warning"><span class="label label-warning">text-warning</span> {% lorem %}</p>
<p class="text-danger"><span class="label label-danger">text-danger</span> {% lorem %}</p>
<h3>Additional defined Text</h3>
<p class="text-default"><span class="label label-default">text-default</span> {% lorem %}</p>
<p class="text-orange"><span class="label label-orange">text-orange</span> {% lorem %}</p>
<p class="text-green"><span class="label label-green">text-green</span> {% lorem %}</p>
<p class="text-blue"><span class="label label-blue">text-blue</span> {% lorem %}</p>
<p class="text-yellow"><span class="label label-yellow">text-yellow</span> {% lorem %}</p>
<p class="text-red"><span class="label label-red">text-red</span> {% lorem %}</p>
<p class="text-mandarin"><span class="label label-mandarin">text-mandarin</span> {% lorem %}</p>
<p class="text-lime"><span class="label label-lime">text-lime</span> {% lorem %}</p>
<p class="text-cyan"><span class="label label-cyan">text-cyan</span> {% lorem %}</p>
<p class="text-caramel"><span class="label label-caramel">text-caramel</span> {% lorem %}</p>
<p class="text-plum"><span class="label label-plum">text-plum</span> {% lorem %}</p>
<p class="text-purple"><span class="label label-purple">text-purple</span> {% lorem %}</p>
<hr />
<h3>Regular Bootstrap Backgrounds</h3>
<p class="bg-primary"><span class="label label-primary">bg-primary</span> {% lorem %} </p>
<p class="bg-success"><span class="label label-success">bg-success</span> {% lorem %} </p> <p class="bg-success"><span class="label label-success">bg-success</span> {% lorem %} </p>
<p class="bg-info"><span class="label label-info">bg-info</span> {% lorem %} </p> <p class="bg-info"><span class="label label-info">bg-info</span> {% lorem %} </p>
<p class="bg-warning"><span class="label label-warning">bg-warning</span> {% lorem %} </p> <p class="bg-warning"><span class="label label-warning">bg-warning</span> {% lorem %} </p>
<p class="bg-danger"><span class="label label-danger">bg-danger</span> {% lorem %} </p> <p class="bg-danger"><span class="label label-danger">bg-danger</span> {% lorem %} </p>
<h3>Additional defined Backgrounds</h3>
<p class="bg-orange"><span class="label label-orange">bg-orange</span> {% lorem %} </p>
<p class="bg-green"><span class="label label-green">bg-green</span> {% lorem %} </p>
<p class="bg-blue"><span class="label label-blue">bg-blue</span> {% lorem %} </p>
<p class="bg-yellow"><span class="label label-yellow">bg-yellow</span> {% lorem %} </p>
<p class="bg-red"><span class="label label-red">bg-red</span> {% lorem %} </p>
<p class="bg-mandarin"><span class="label label-mandarin">bg-mandarin</span> {% lorem %} </p>
<p class="bg-lime"><span class="label label-lime">bg-lime</span> {% lorem %} </p>
<p class="bg-cyan"><span class="label label-cyan">bg-cyan</span> {% lorem %} </p>
<p class="bg-caramel"><span class="label label-caramel">bg-caramel</span> {% lorem %} </p>
<p class="bg-plum"><span class="label label-plum">bg-plum</span> {% lorem %} </p>
<p class="bg-purple"><span class="label label-purple">bg-purple</span> {% lorem %} </p>
<hr />
{% endblock page-container-fluid %} {% endblock page-container-fluid %}

6
dav_base/tests/test_templates.py
View File

@@ -45,9 +45,9 @@ class TemplatesTestCase(SimpleTestCase):
html = """ html = """
<div id="page-footer"> <div id="page-footer">
<div class="signum"><a href="mailto:heinzel@alpenverein-karlsruhe.de">heinzel@alpenverein-karlsruhe.de</a></div> <div class="signum"><a href="mailto:tourenportal@alpenverein-karlsruhe.de">tourenportal@alpenverein-karlsruhe.de</a></div>
<a href="http://alpenverein-karlsruhe.de" target="_blank">&copy; Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.</a> &ensp;&bull;&ensp; <a href="https://alpenverein-karlsruhe.de" target="_blank">&copy; Sektion Karlsruhe im Deutschen Alpenverein (DAV) e.V.</a> &ensp;&bull;&ensp;
<a href="http://alpenverein-karlsruhe.de/impressum">Impressum</a> <a href="https://alpenverein-karlsruhe.de/impressum">Impressum</a>
</div> </div>
""" """

2
dav_events/forms/events.py
View File

@@ -227,7 +227,7 @@ class ModeForm(EventCreateForm):
) )
level = forms.ChoiceField(choices=choices.LEVEL_CHOICES, level = forms.ChoiceField(choices=choices.LEVEL_CHOICES,
label=_(u'Schwierigkeitsnivau'), label=_(u'Schwierigkeitsnivau / Familien'),
widget=forms.RadioSelect()) widget=forms.RadioSelect())
first_day = forms.DateField(required=True, first_day = forms.DateField(required=True,

2
dav_events/templates/dav_events/home.html
View File

@@ -3,6 +3,6 @@
{% load i18n %} {% load i18n %}
{% block page-container-fluid %} {% block page-container-fluid %}
<h3 class="top-most">{% trans 'Für Tourenleiter' %}</h3> <h3 class="top-most">{% trans 'Für Tourenleiter*innen' %}</h3>
{% include './includes/home_tiles.html' %} {% include './includes/home_tiles.html' %}
{% endblock page-container-fluid %} {% endblock page-container-fluid %}

4
dav_events/tests/test_urls.py
View File

@@ -1,8 +1,10 @@
from django.conf import settings
from dav_base.tests.generic import Url, UrlsTestCase from dav_base.tests.generic import Url, UrlsTestCase
from .. import views from .. import views
url_prefix = 'events' url_prefix = settings.MODULE_CONFIG.modules['dav_events'].url_prefix
class TestCase(UrlsTestCase): class TestCase(UrlsTestCase):

8
dav_registration/templates/dav_registration/home.html Normal file
View File

@@ -0,0 +1,8 @@
{% extends "dav_registration/base.html" %}
{% load bootstrap3 %}
{% load i18n %}
{% block page-container-fluid %}
<h3 class="top-most">{% trans 'Für Teilnehmer*innen' %}</h3>
{% include './includes/home_tiles.html' %}
{% endblock page-container-fluid %}

17
dav_registration/templates/dav_registration/includes/home_tiles.html Normal file
View File

@@ -0,0 +1,17 @@
{% load bootstrap3 %}
{% load i18n %}
<div class="row">
<div class="col-sm-12">
<div class="well">
<p class="lead">Bei Veranstaltungen anmelden...</p>
<p>
Hier siehst du welche Touren und Kurse angeboten werden und
kannst dich dafür anmelden.
</p>
<p>
<a class="btn btn-primary" href="{% url 'dav_registration:root' %}">Zur Veranstaltungsliste</a>
</p>
</div>
</div>
</div>

1
dav_registration/urls.py
View File

@@ -6,6 +6,7 @@ app_name = 'dav_registration'
urlpatterns = [ urlpatterns = [
url(r'^$', views.RootView.as_view(), name='root'), 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'^finished', views.RegistrationSuccessView.as_view(), name='registered'),
url(r'^event/(?P<pk>\d+)/registration', views.RegistrationView.as_view(), name='register'), url(r'^event/(?P<pk>\d+)/registration', views.RegistrationView.as_view(), name='register'),
url(r'^event/(?P<pk>\d+)/', views.EventDetailView.as_view(), name='event'), url(r'^event/(?P<pk>\d+)/', views.EventDetailView.as_view(), name='event'),

4
dav_registration/views.py
View File

@@ -27,6 +27,10 @@ class RootView(generic.RedirectView):
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
class HomeView(generic.TemplateView):
template_name = 'dav_registration/home.html'
class EventListView(generic.ListView): class EventListView(generic.ListView):
model = Event model = Event
template_name = 'dav_registration/event_list.html' template_name = 'dav_registration/event_list.html'