matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consolidate common app's template tags.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-17 02:04:01 -04:00
parent fb824c6ee1
commit e421c8e382
15 changed files with 59 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/appearance/templates/appearance/about.html
View File

@@ -3,7 +3,7 @@
{% load i18n %}
{% load static %}
{% load project_tags %}
{% load common_tags %}
{% block title %} :: {% trans 'About' %}{% endblock %}

2
mayan/apps/appearance/templates/appearance/base.html
View File

@@ -3,8 +3,8 @@
{% load compress %}
{% load common_tags %}
{% load navigation_tags %}
{% load project_tags %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

2
mayan/apps/appearance/templates/appearance/generic_form.html
View File

@@ -1,6 +1,6 @@
{% extends 'appearance/base.html' %}
{% load subtemplates_tags %}
{% load common_tags %}
{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}

1
mayan/apps/appearance/templates/appearance/generic_list.html
View File

@@ -3,7 +3,6 @@
{% load i18n %}
{% load navigation_tags %}
{% load subtemplates_tags %}
{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}

1
mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
View File

@@ -1,7 +1,6 @@
{% extends 'appearance/base.html' %}
{% load navigation_tags %}
{% load subtemplates_tags %}
{% block title %} :: {{ title }}{% endblock %}

4
mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
View File

@@ -1,11 +1,9 @@
{% load i18n %}
{% load static %}
{% load attribute_tags %}
{% load common_tags %}
{% load pagination_tags %}
{% load navigation_tags %}
{% load non_breakable %}
{% load multiselect_tags %}
{% autopaginate object_list %}
<div class="row">

2
mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
View File

@@ -1,6 +1,6 @@
{% extends 'appearance/base.html' %}
{% load subtemplates_tags %}
{% load common_tags %}
{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}

1
mayan/apps/appearance/templates/appearance/home.html
View File

@@ -4,7 +4,6 @@
{% load static %}
{% load navigation_tags %}
{% load project_tags %}
{% block title %} :: {% trans 'Home' %}{% endblock %}

2
mayan/apps/appearance/templates/appearance/login.html
View File

@@ -3,8 +3,8 @@
{% load i18n %}
{% load static %}
{% load common_tags %}
{% load autoadmin_tags %}
{% load project_tags %}
{% block project_name %}{% endblock %}

10
mayan/apps/common/templatetags/attribute_tags.py
View File

@@ -1,10 +0,0 @@
from django.template import Library
from common.utils import return_attrib
register = Library()
@register.filter
def object_property(value, arg):
return return_attrib(value, arg)

53
mayan/apps/common/templatetags/common_tags.py Normal file
View File

@@ -0,0 +1,53 @@
from __future__ import unicode_literals
from json import dumps
from django.conf import settings
from django.template import Context, Library
from django.template.loader import get_template
import mayan
from ..utils import return_attrib
register = Library()
@register.filter
def get_encoded_parameter(item, parameters_dict):
result = {}
for attrib_name, attrib in parameters_dict.items():
result[attrib_name] = return_attrib(item, attrib)
return dumps(result)
@register.filter
def make_non_breakable(value):
return value.replace('-', '\u2011')
@register.filter
def object_property(value, arg):
return return_attrib(value, arg)
@register.simple_tag
def project_name():
return settings.PROJECT_TITLE
@register.simple_tag
def project_version():
return mayan.__version__
@register.assignment_tag(takes_context=True)
def render_subtemplate(context, template_name, template_context):
"""
Renders the specified template with the mixed parent and
subtemplate contexts
"""
new_context = Context(context)
new_context.update(Context(template_context))
return get_template(template_name).render(new_context)

14
mayan/apps/common/templatetags/multiselect_tags.py
View File

@@ -1,14 +0,0 @@
from json import dumps
from django.template import Library
from ..utils import return_attrib
register = Library()
@register.filter
def get_encoded_parameter(item, parameters_dict):
result = {}
for attrib_name, attrib in parameters_dict.items():
result[attrib_name] = return_attrib(item, attrib)
return dumps(result)

10
mayan/apps/common/templatetags/non_breakable.py
View File

@@ -1,10 +0,0 @@
from __future__ import unicode_literals
from django.template import Library
register = Library()
@register.filter
def make_non_breakable(value):
return value.replace('-', '\u2011')

16
mayan/apps/common/templatetags/project_tags.py
View File

@@ -1,16 +0,0 @@
from django.conf import settings
from django.template import Library
import mayan
register = Library()
@register.simple_tag
def project_name():
return settings.PROJECT_TITLE
@register.simple_tag
def project_version():
return mayan.__version__

18
mayan/apps/common/templatetags/subtemplates_tags.py
View File

@@ -1,18 +0,0 @@
from __future__ import unicode_literals
from django.template import Context, Library
from django.template.loader import get_template
register = Library()
@register.assignment_tag(takes_context=True)
def render_subtemplate(context, template_name, template_context):
"""
Renders the specified template with the mixed parent and
subtemplate contexts
"""
new_context = Context(context)
new_context.update(Context(template_context))
return get_template(template_name).render(new_context)