summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-11 10:40:29 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-11 10:40:29 +0100
commit1f374dd36b2901b35e4ab0bdbcfcbcbb93224f1a (patch)
tree37b3e24a5a6580fd08d6790aea2ada3ebe5bca20 /ishtar_common
parent1b68835844edb9038486b1ffeed210157cf7b8f3 (diff)
downloadIshtar-1f374dd36b2901b35e4ab0bdbcfcbcbb93224f1a.tar.bz2
Ishtar-1f374dd36b2901b35e4ab0bdbcfcbcbb93224f1a.zip
UI: Workon on a new date picker
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/context_processors.py2
-rw-r--r--ishtar_common/templates/base.html1
2 files changed, 3 insertions, 0 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py
index 8cef32d9f..911a28e33 100644
--- a/ishtar_common/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -22,6 +22,7 @@ from django.contrib.sites.models import Site
from ishtar_common.version import __version__
from ishtar_common.models import get_current_profile
+from bootstrap_datepicker.widgets import DatePicker
from menus import Menu
@@ -56,6 +57,7 @@ def get_base_context(request):
dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL
dct['COUNTRY'] = settings.COUNTRY
dct['VERSION'] = __version__
+ dct['EXTRA_MEDIA'] = DatePicker().media
if settings.EXTRA_VERSION:
dct['VERSION'] += "-" + unicode(settings.EXTRA_VERSION)
profile = get_current_profile()
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 783b1c599..5171af374 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -45,6 +45,7 @@
<link rel="stylesheet" href="{{STATIC_URL}}media/styles.css?ver={{VERSION}}">
{% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}?ver={{VERSION}}">{% endfor %}
{% endcompress %}
+ {{EXTRA_MEDIA}}
{% block extra_head %}
{% endblock %}
{% comment %}{% if raw_css %}<style media="screen" type="text/css">