diff --git a/manage.py b/manage.py index 3dbf192..3a81208 100755 --- a/manage.py +++ b/manage.py @@ -11,5 +11,5 @@ if __name__ == "__main__": "Couldn't import Django. Are you sure it's installed and " "available on your PYTHONPATH environment variable? Did you " "forget to activate a virtual environment?" - ) from exc + ) execute_from_command_line(sys.argv) diff --git a/membersystem/context_processors.py b/membersystem/context_processors.py new file mode 100644 index 0000000..31564b4 --- /dev/null +++ b/membersystem/context_processors.py @@ -0,0 +1,10 @@ +"""Context processors for the membersystem app.""" + +from django.contrib.sites.shortcuts import get_current_site + + +def current_site(request): + """Include the current site in the context.""" + return { + 'site': get_current_site(request) + } diff --git a/membersystem/settings/base.py b/membersystem/settings/base.py index 92f44da..24e086d 100644 --- a/membersystem/settings/base.py +++ b/membersystem/settings/base.py @@ -35,6 +35,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django.contrib.sites', + 'membersystem', 'profiles', 'accounting', 'membership', @@ -63,6 +64,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'membersystem.context_processors.current_site', ], }, }, diff --git a/membersystem/static/css/membersystem.css b/membersystem/static/css/membersystem.css new file mode 100644 index 0000000..cbf11d5 --- /dev/null +++ b/membersystem/static/css/membersystem.css @@ -0,0 +1,79 @@ +/* General styles */ +html +{ + margin: 0; + padding: 0; + font-family: sans-serif; + font-size: 2.5vmin; + background: #f8f8f8; +} + +body +{ + background: #fff; + color: #000; + margin: 1em auto; + max-width: 50em; + padding: 0 1em; + box-shadow: 0 0 2.5em rgba(0, 0, 0, 20%); +} + +header, +footer +{ + background: #eee; + padding: .5em; + margin: 0 -1em; +} + +footer +{ + margin-top: 2em; +} + + +header h1 +{ + font-size: 1em; + float: left; + padding: .5em .5em; + margin: 0; +} + +header ul, +footer ul +{ + list-style-type: none; + padding: 0; + margin: 0; + text-align: right; +} + +header ul li, +footer ul li +{ + display: inline; +} + +header ul li a, +footer ul li a +{ + display: inline-block; + margin: 0; + padding: .5em .5em; +} + + +/* Forms */ +label +{ + display: block; + padding: .5em 0; +} + +button, +input, +textarea +{ + font-size: inherit; +} diff --git a/membersystem/templates/base.html b/membersystem/templates/base.html new file mode 100644 index 0000000..0c21c7b --- /dev/null +++ b/membersystem/templates/base.html @@ -0,0 +1,50 @@ + +{% load static %} + + + {% block head_title %}{% endblock %} – {{ site.name }} + {% block extra_head %}{% endblock %} + + + +
+

+ {{ site.name }} +

+ +
+ {% block body %} + {% if messages %} + + {% endif %} + + {% block content %} + {% endblock %} + {% endblock %} + {% block extra_body %} + {% endblock %} + + + + diff --git a/requirements.txt b/requirements.txt index d74bd6a..a27dc5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ Django==2.0.6 django-money==0.14 +django-extensions==2.0.7