Remove the last piece of django-jinja existance
This commit is contained in:
parent
c4dd0ead15
commit
353f803c4d
@ -1,53 +0,0 @@
|
||||
from datetime import timedelta
|
||||
from django_jinja import library
|
||||
from markupsafe import Markup
|
||||
|
||||
|
||||
@library.global_function
|
||||
def country_flag(country):
|
||||
if not country:
|
||||
return ''
|
||||
html = '<span class="fam-flag fam-flag-%s" title="%s"></span> ' % (
|
||||
unicode(country.code).lower(), unicode(country.name))
|
||||
return Markup(html)
|
||||
|
||||
|
||||
@library.filter
|
||||
def duration(value):
|
||||
if not value and type(value) != timedelta:
|
||||
return u''
|
||||
# does not take microseconds into account
|
||||
total_secs = value.seconds + value.days * 24 * 3600
|
||||
mins = total_secs // 60
|
||||
hrs, mins = divmod(mins, 60)
|
||||
return '%d:%02d' % (hrs, mins)
|
||||
|
||||
|
||||
@library.filter
|
||||
def hours(value):
|
||||
if not value and type(value) != timedelta:
|
||||
return u''
|
||||
# does not take microseconds into account
|
||||
total_secs = value.seconds + value.days * 24 * 3600
|
||||
mins = total_secs // 60
|
||||
hrs, mins = divmod(mins, 60)
|
||||
if hrs == 1:
|
||||
return '%d hour' % hrs
|
||||
return '%d hours' % hrs
|
||||
|
||||
|
||||
@library.filter
|
||||
def floatvalue(value, arg=2):
|
||||
if value is None:
|
||||
return u''
|
||||
return '%.*f' % (arg, value)
|
||||
|
||||
|
||||
@library.filter
|
||||
def percentage(value, arg=1):
|
||||
if not value and type(value) != float:
|
||||
return u''
|
||||
new_val = value * 100.0
|
||||
return '%.*f%%' % (arg, new_val)
|
||||
|
||||
# vim: set ts=4 sw=4 et:
|
@ -1,12 +1,10 @@
|
||||
-e git+git://github.com/fredj/cssmin.git@master#egg=cssmin
|
||||
Django==1.8.18
|
||||
IPy==0.83
|
||||
Jinja2==2.8
|
||||
Markdown==2.6.2
|
||||
MarkupSafe==0.23
|
||||
bencode==1.0
|
||||
django-countries==3.3
|
||||
django-jinja==2.2.0
|
||||
jsmin==2.1.1
|
||||
pgpdump==1.5
|
||||
pytz>=2015.4
|
||||
|
@ -1,12 +1,10 @@
|
||||
-e git+git://github.com/fredj/cssmin.git@master#egg=cssmin
|
||||
Django==1.7.8
|
||||
IPy==0.83
|
||||
Jinja2==2.7.3
|
||||
Markdown==2.6.2
|
||||
MarkupSafe==0.23
|
||||
bencode==1.0
|
||||
django-countries==3.3
|
||||
django-jinja==1.3.3
|
||||
jsmin==2.1.1
|
||||
pgpdump==1.5
|
||||
psycopg2==2.6.1
|
||||
|
11
settings.py
11
settings.py
@ -46,16 +46,6 @@
|
||||
|
||||
from os import path
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django_jinja.backend.Jinja2',
|
||||
'APP_DIRS': True,
|
||||
'DIRS': [
|
||||
path.join(DEPLOY_PATH, 'templates/jinja')
|
||||
],
|
||||
'OPTIONS': {
|
||||
'match_extension': '.jinja'
|
||||
}
|
||||
},
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [
|
||||
@ -124,7 +114,6 @@
|
||||
'django.contrib.admin',
|
||||
'django.contrib.staticfiles',
|
||||
'django_countries',
|
||||
'django_jinja',
|
||||
|
||||
'main',
|
||||
'mirrors',
|
||||
|
Loading…
Reference in New Issue
Block a user