From 2b0f1f9f89080c27c62d5a6ad71d1bf918dbdb4f Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 1 Feb 2015 16:34:46 +0100 Subject: [PATCH] add imprint as flatpage - add flatpages app to gnuviechadmin.settings.base.DJANGO_APPS - add imprint handling to gnuviechadmin.context_processors.navigation, remove unused about page handling - add URL 'imprint' to gnuviechadmin.urls - replace link 'about' in template base.html with 'imprint' - add templates for flatpages - add german translation for imprint and contact navigation links --- docs/changelog.rst | 1 + gnuviechadmin/gnuviechadmin/context_processors.py | 7 +++++-- gnuviechadmin/gnuviechadmin/settings/base.py | 4 +++- gnuviechadmin/gnuviechadmin/urls.py | 4 ++++ gnuviechadmin/locale/de/LC_MESSAGES/django.po | 12 ++++++++++-- gnuviechadmin/templates/base.html | 4 ++-- gnuviechadmin/templates/flatpages/base.html | 1 + gnuviechadmin/templates/flatpages/default.html | 9 +++++++++ 8 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 gnuviechadmin/templates/flatpages/base.html create mode 100644 gnuviechadmin/templates/flatpages/default.html diff --git a/docs/changelog.rst b/docs/changelog.rst index 4dbbc2a..f173cd5 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,7 @@ Changelog ========= +* :feature:`-` add imprint as flatpage * :support:`-` mark active menu item as active via context_processor and corresponding template markup * :feature:`-` add links to webmail, phpmyadmin and phppgadmin diff --git a/gnuviechadmin/gnuviechadmin/context_processors.py b/gnuviechadmin/gnuviechadmin/context_processors.py index f54bf3e..aacb7c0 100644 --- a/gnuviechadmin/gnuviechadmin/context_processors.py +++ b/gnuviechadmin/gnuviechadmin/context_processors.py @@ -34,8 +34,6 @@ def navigation(request): viewmodule = viewfunc.__module__ if viewmodule == 'contact.views': context['active_item'] = 'contact' - elif viewmodule == 'about.views': - context['active_item'] = 'about' elif viewmodule in ( 'hostingpackages.views', 'osusers.views', 'userdbs.views', 'managemails.views', 'websites.views', 'domains.views', @@ -45,6 +43,11 @@ def navigation(request): 'allauth.account.views', 'allauth.socialaccount.views' ): context['active_item'] = 'account' + elif ( + viewmodule == 'django.contrib.flatpages.views' and + request.path.endswith('/impressum/') + ): + context['active_item'] = 'imprint' else: _LOGGER.debug( 'no special handling for view %s in module %s, fallback to ' diff --git a/gnuviechadmin/gnuviechadmin/settings/base.py b/gnuviechadmin/gnuviechadmin/settings/base.py index 638ee73..dfe2f65 100644 --- a/gnuviechadmin/gnuviechadmin/settings/base.py +++ b/gnuviechadmin/gnuviechadmin/settings/base.py @@ -239,7 +239,9 @@ DJANGO_APPS = ( # Admin panel and documentation: 'django.contrib.admin', - # 'django.contrib.admindocs', + + # Flatpages for about page + 'django.contrib.flatpages', 'crispy_forms', ) diff --git a/gnuviechadmin/gnuviechadmin/urls.py b/gnuviechadmin/gnuviechadmin/urls.py index 7a79105..c483d80 100644 --- a/gnuviechadmin/gnuviechadmin/urls.py +++ b/gnuviechadmin/gnuviechadmin/urls.py @@ -18,6 +18,10 @@ urlpatterns = patterns( url(r'^osuser/', include('osusers.urls')), url(r'^admin/', include(admin.site.urls)), ) +urlpatterns += patterns( + 'django.contrib.flatpages.views', + url(r'^impressum/$', 'flatpage', {'url': '/impressum/'}, name='imprint'), +) # Uncomment the next line to serve media files in dev. # urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/gnuviechadmin/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/locale/de/LC_MESSAGES/django.po index 1ac98e9..0210942 100644 --- a/gnuviechadmin/locale/de/LC_MESSAGES/django.po +++ b/gnuviechadmin/locale/de/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnuviechadmin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-01 15:07+0100\n" -"PO-Revision-Date: 2015-02-01 15:08+0100\n" +"POT-Creation-Date: 2015-02-01 16:31+0100\n" +"PO-Revision-Date: 2015-02-01 16:31+0100\n" "Last-Translator: Jan Dittberner \n" "Language-Team: Jan Dittberner \n" "Language: de\n" @@ -473,6 +473,14 @@ msgstr "phpPgAdmin - PostgreSQL-Datenbankverwaltungswerkzeug" msgid "phpPgAdmin" msgstr "phpPgAdmin" +#: templates/base.html:67 +msgid "Imprint" +msgstr "Impressum" + +#: templates/base.html:68 +msgid "Contact" +msgstr "Kontakt" + #: templates/base.html:73 msgid "My Account" msgstr "Mein Konto" diff --git a/gnuviechadmin/templates/base.html b/gnuviechadmin/templates/base.html index a4761bd..8a42c3e 100644 --- a/gnuviechadmin/templates/base.html +++ b/gnuviechadmin/templates/base.html @@ -64,8 +64,8 @@
  • {% trans "phpPgAdmin" %}
    • - About - Contact + {% trans "Imprint" %} + {% trans "Contact" %}
      {% if user.is_authenticated %} diff --git a/gnuviechadmin/templates/flatpages/base.html b/gnuviechadmin/templates/flatpages/base.html new file mode 100644 index 0000000..94d9808 --- /dev/null +++ b/gnuviechadmin/templates/flatpages/base.html @@ -0,0 +1 @@ +{% extends "base.html" %} diff --git a/gnuviechadmin/templates/flatpages/default.html b/gnuviechadmin/templates/flatpages/default.html new file mode 100644 index 0000000..27770f4 --- /dev/null +++ b/gnuviechadmin/templates/flatpages/default.html @@ -0,0 +1,9 @@ +{% extends "flatpages/base.html" %} + +{% block title %}{{ block.super }} - {{ flatpage.title }}{% endblock title %} + +{% block page_title %}{{ flatpage.title }}{% endblock page_title %} + +{% block content %} +{{ flatpage.content }} +{% endblock content %}