From 0fe17f3aee085daef8eab50fae7d3d87776e76e7 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Tue, 13 Jan 2015 11:46:25 +0100
Subject: [PATCH] Added output of system date if it's not today
---
VIPSWeb/templates/base.html | 7 ++++++-
VIPSWeb/templatetags/template_helper.py | 7 +++++++
requirements.txt | 3 ++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
index 19281f16..ce24e85c 100644
--- a/VIPSWeb/templates/base.html
+++ b/VIPSWeb/templates/base.html
@@ -1,7 +1,7 @@
{% comment %}
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
@@ -53,11 +53,16 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="{% static "images/logo_vips.png" %}" alt="VIPS logo"/> VIPSWeb</a>
+ {% if settings.SYSTEM_TIME_OFFSET_MONTHS != 0 %}
+ <span class="navbar-brand" style="padding-top: 13px;">({% get_system_time "%Y-%m-%d" %})</span>
+ {% endif %}
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
+
<ul class="nav navbar-nav navbar-right">
+
{% generate_main_menu %}
<li>
{% get_current_language as LANGUAGE_CODE %}
diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py
index 7244b0ce..f37cc3d7 100644
--- a/VIPSWeb/templatetags/template_helper.py
+++ b/VIPSWeb/templatetags/template_helper.py
@@ -2,6 +2,8 @@ from django import template
from django.utils.translation import ugettext as _
from django.utils import translation
from django.conf import settings
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
register = template.Library()
@@ -62,4 +64,9 @@ def get_footer_text_i18n():
footer_html = settings.FOOTER_HTML[settings.FOOTER_HTML.keys()[0]]
return footer_html if footer_html != None else ""
+
+@register.simple_tag
+def get_system_time(format_string):
+ time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)
+ return time.strftime(format_string)
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index bf385cb3..2ad016cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,4 +21,5 @@
Django==1.6.1
PIL==1.1.7
requests==2.0.1
-django-tinymce
\ No newline at end of file
+django-tinymce
+python-dateutil==1.5
\ No newline at end of file
--
GitLab