diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..7c5b460d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Save the version details for git tarballs in .VERSION file +.VERSION export-subst diff --git a/dje/context_processors.py b/dje/context_processors.py index 95a9cf81..67d7bb05 100644 --- a/dje/context_processors.py +++ b/dje/context_processors.py @@ -14,7 +14,7 @@ def dejacode_context(request): """Return all the DejaCode specific context variables.""" return { - "DEJACODE_VERSION": DEJACODE_VERSION, + "DEJACODE_VERSION": DEJACODE_VERSION.lstrip("v"), "DEJACODE_SUPPORT_EMAIL": settings.DEJACODE_SUPPORT_EMAIL, "FAVICON_HREF": settings.FAVICON_HREF, "SITE_TITLE": settings.SITE_TITLE, diff --git a/dje/templates/admin/base_site.html b/dje/templates/admin/base_site.html index 4111810d..8c7ca25a 100644 --- a/dje/templates/admin/base_site.html +++ b/dje/templates/admin/base_site.html @@ -2,12 +2,12 @@ {% load i18n grp_tags static %} {% block title %} - {{ SITE_TITLE }} {{ DEJACODE_VERSION }} Administration + {{ SITE_TITLE }} Administration v{{ DEJACODE_VERSION }} {% endblock %} {% block admin_title %}

- {{ SITE_TITLE }} {{ DEJACODE_VERSION }} Administration + {{ SITE_TITLE }} Administration v{{ DEJACODE_VERSION }}

{% endblock %} diff --git a/dje/templates/includes/header.html b/dje/templates/includes/header.html index eadde7d7..dbaca667 100644 --- a/dje/templates/includes/header.html +++ b/dje/templates/includes/header.html @@ -17,7 +17,7 @@ {% trans 'Releases' %} {% trans 'License' %} - + {% endblock %} \ No newline at end of file diff --git a/dje/templates/includes/navbar_header.html b/dje/templates/includes/navbar_header.html index 5d0cb7d2..a4c283c6 100644 --- a/dje/templates/includes/navbar_header.html +++ b/dje/templates/includes/navbar_header.html @@ -126,7 +126,7 @@ {% endif %} - +
{% csrf_token %}