diff --git a/docs/changelog.rst b/docs/changelog.rst index 9de7bf8..715df28 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,10 @@ Changelog ========= +* :release:`0.11.1 <2015-02-01>` +* :bug:`-` fix translation of contact form by using ugettext_lazy and adding + contact_form to INSTALLED_APPS + * :release:`0.11.0 <2015-02-01>` * :feature:`-` add icons to top level navigation * :feature:`-` add contact form diff --git a/docs/conf.py b/docs/conf.py index ba71442..a1cec22 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,10 +59,11 @@ copyright = u'2014, 2015 Jan Dittberner' # |version| and |release|, also used in various other places throughout the # built documents. # -# The short X.Y version. -version = '0.11' # The full version, including alpha/beta/rc tags. -release = '0.11.0' +from gnuviechadmin import __version__ as release + +# The short X.Y version. +version = ".".join(release.split('.')[:2]) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/gnuviechadmin/contact_form/forms.py b/gnuviechadmin/contact_form/forms.py index 96de08e..d703983 100644 --- a/gnuviechadmin/contact_form/forms.py +++ b/gnuviechadmin/contact_form/forms.py @@ -10,7 +10,7 @@ from django.core.mail import send_mail from django.core.urlresolvers import reverse from django.template import RequestContext from django.template import loader -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.contrib.sites.models import RequestSite from django.contrib.sites.models import Site diff --git a/gnuviechadmin/gnuviechadmin/__init__.py b/gnuviechadmin/gnuviechadmin/__init__.py index bd9391f..a34637d 100644 --- a/gnuviechadmin/gnuviechadmin/__init__.py +++ b/gnuviechadmin/gnuviechadmin/__init__.py @@ -1 +1,3 @@ from gnuviechadmin.celery import app as celery_app + +__version__ = '0.11.1' diff --git a/gnuviechadmin/gnuviechadmin/context_processors.py b/gnuviechadmin/gnuviechadmin/context_processors.py index 89537b3..3e71aa2 100644 --- a/gnuviechadmin/gnuviechadmin/context_processors.py +++ b/gnuviechadmin/gnuviechadmin/context_processors.py @@ -8,6 +8,8 @@ import logging from django.conf import settings +from gnuviechadmin import __version__ as gvaversion + _LOGGER = logging.getLogger(__name__) @@ -54,3 +56,15 @@ def navigation(request): 'default active menu item %s', viewfunc.__name__, viewmodule, context['active_item']) return context + + +def version_info(request): + """ + Context processor that adds the gnuviechadmin version to the request + context. + + """ + context = { + 'gnuviechadmin_version': gvaversion, + } + return context diff --git a/gnuviechadmin/gnuviechadmin/settings/base.py b/gnuviechadmin/gnuviechadmin/settings/base.py index dfe2f65..0e79b62 100644 --- a/gnuviechadmin/gnuviechadmin/settings/base.py +++ b/gnuviechadmin/gnuviechadmin/settings/base.py @@ -173,6 +173,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'allauth.socialaccount.context_processors.socialaccount', # custom context processors 'gnuviechadmin.context_processors.navigation', + 'gnuviechadmin.context_processors.version_info', ) # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders @@ -270,6 +271,7 @@ LOCAL_APPS = ( 'userdbs', 'hostingpackages', 'websites', + 'contact_form', ) # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps diff --git a/gnuviechadmin/static/css/gnuviechadmin.css b/gnuviechadmin/static/css/gnuviechadmin.css index f165388..a8a8dd5 100644 --- a/gnuviechadmin/static/css/gnuviechadmin.css +++ b/gnuviechadmin/static/css/gnuviechadmin.css @@ -8,3 +8,18 @@ table thead th.status-column { table thead th.name-column { width: 15em; } + +.gva-body { + padding-bottom: 40px; +} +.gva-footer { + text-align: center; + padding-top: 40px; + padding-bottom: 40px; + border-top: 1px solid #e5e5e5; +} + +.gva-footer-links li { + display: inline; + padding: 0px 2px; +} diff --git a/gnuviechadmin/templates/base.html b/gnuviechadmin/templates/base.html index 33e6fc9..b6c10fb 100644 --- a/gnuviechadmin/templates/base.html +++ b/gnuviechadmin/templates/base.html @@ -1,5 +1,4 @@ -{% load staticfiles i18n account %} - +{% load staticfiles i18n account %} @@ -92,7 +91,7 @@ -
+

{% block page_title %}Example Base Template{% endblock page_title %}

@@ -111,6 +110,27 @@
+ +