Skip to content
Snippets Groups Projects
Commit 0fe17f3a authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Added output of system date if it's not today

parent 12589ede
Branches
Tags
No related merge requests found
{% comment %} {% comment %}
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSWeb. * This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify * VIPSWeb is free software: you can redistribute it and/or modify
...@@ -53,11 +53,16 @@ ...@@ -53,11 +53,16 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="/"><img src="{% static "images/logo_vips.png" %}" alt="VIPS logo"/> VIPSWeb</a> <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> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse"> <div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{% generate_main_menu %} {% generate_main_menu %}
<li> <li>
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
......
...@@ -2,6 +2,8 @@ from django import template ...@@ -2,6 +2,8 @@ from django import template
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils import translation from django.utils import translation
from django.conf import settings from django.conf import settings
from datetime import datetime
from dateutil.relativedelta import relativedelta
register = template.Library() register = template.Library()
...@@ -62,4 +64,9 @@ def get_footer_text_i18n(): ...@@ -62,4 +64,9 @@ def get_footer_text_i18n():
footer_html = settings.FOOTER_HTML[settings.FOOTER_HTML.keys()[0]] footer_html = settings.FOOTER_HTML[settings.FOOTER_HTML.keys()[0]]
return footer_html if footer_html != None else "" 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
...@@ -21,4 +21,5 @@ ...@@ -21,4 +21,5 @@
Django==1.6.1 Django==1.6.1
PIL==1.1.7 PIL==1.1.7
requests==2.0.1 requests==2.0.1
django-tinymce django-tinymce
\ No newline at end of file python-dateutil==1.5
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment