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,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

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 '

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',
 )

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)

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"
+"POT-Creation-Date: 2015-02-01 16:31+0100\n"
-"PO-Revision-Date: 2015-02-01 15:08+0100\n"
+"PO-Revision-Date: 2015-02-01 16:31+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: Jan Dittberner <jan@dittberner.info>\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"

gnuviechadmin/templates/base.html

@@ -64,8 +64,8 @@
                 <li><a href="{{ phppgadmin_url }}" title="{% trans "phpPgAdmin - PostgreSQL database administration tool" %}"><i class="icon-postgres"></i> {% trans "phpPgAdmin" %}</a></li>
               </ul>
             </li>
-            <li{% if active_item == 'about' %} class="active"{% endif %}><a href="#about">About</a></li>
+            <li{% if active_item == 'imprint' %} class="active"{% endif %}><a href="{% url 'imprint' %}">{% trans "Imprint" %}</a></li>
-            <li{% if active_item == 'contact' %} class="active"{% endif %}><a href="#contact">Contact</a></li>
+            <li{% if active_item == 'contact' %} class="active"{% endif %}><a href="#contact">{% trans "Contact" %}</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">
             {% if user.is_authenticated %}

gnuviechadmin/templates/flatpages/base.html

@@ -0,0 +1 @@
+{% extends "base.html" %}

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 %}