diff --git a/HISTORY.rst b/HISTORY.rst
index 3acb652c86..ca59576c16 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -158,6 +158,9 @@
- Switch default installation to use two Redis
databases. One for the message broker, and the
other to store task results.
+- Complete the prefixing of template tags with the
+ app name.
+- Remove unused template tags.
3.2.10 (2019-XX-XX)
===================
diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html
index 47776295c2..5f89100cb6 100644
--- a/mayan/apps/appearance/templates/appearance/about.html
+++ b/mayan/apps/appearance/templates/appearance/about.html
@@ -56,18 +56,18 @@
{% endblock stylesheets %}
{% block content %}
- {% project_information '__build_string__' as build_number %}
+ {% common_project_information '__build_string__' as build_number %}
{% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}
- {% project_information '__title__' as project_title %}
+ {% common_project_information '__title__' as project_title %}
- {% get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %}
- {% get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %}
- {% get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %}
- {% get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %}
- {% get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %}
- {% get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %}
- {% get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %}
- {% get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %}
+ {% appearance_get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}
{{ setting_project_title }}
@@ -79,25 +79,25 @@
{% endblocktrans %}
{% endif %}
-
{% trans 'Version' %} {% project_information '__version__' %}
+
{% trans 'Version' %} {% common_project_information '__version__' %}
{% if build_number %}
{% blocktrans with build_number as build_number %}Build number: {{ build_number }}{% endblocktrans %}
{% endif %}
- {% project_information '__description__' as project_description %}
+ {% common_project_information '__description__' as project_description %}
{% trans project_description %}
- {% project_information '__website__' %}
+ {% common_project_information '__website__' %}
- {% project_information '__license__' as license_information %}
+ {% common_project_information '__license__' as license_information %}
{% trans 'Released under the license:' %} {% trans license_information %}
-
{% project_information '__title__' %}
+
{% common_project_information '__title__' %}
{% blocktrans with project_title as project_title %}
@@ -160,7 +160,7 @@
- {% project_information '__copyright__' %}
+ {% common_project_information '__copyright__' %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_form.html b/mayan/apps/appearance/templates/appearance/generic_form.html
index 66086009ee..27fdce4de2 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form.html
@@ -17,7 +17,7 @@
{% else %}
{% endif %}
- {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
+ {% common_render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
{{ rendered_subtemplate }}
{% endfor %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_form_instance.html b/mayan/apps/appearance/templates/appearance/generic_form_instance.html
index d8aa93755b..56d9da3e21 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form_instance.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form_instance.html
@@ -77,13 +77,13 @@
{% endif %}
{% elif field|widget_type == 'select' %}
{% if read_only %}
- {{ field|get_choice_value }}
+ {{ field|appearance_get_choice_value }}
{% else %}
{% render_field field class+="form-control" %}
{% endif %}
{% elif field|widget_type == 'selectmultiple' %}
{% if read_only %}
- {{ field|get_choice_value }}
+ {{ field|appearance_get_choice_value }}
{% else %}
{% render_field field class+="form-control" %}
{% endif %}
@@ -119,7 +119,7 @@
{% endif %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
index 97436d3aa6..304b2ce63f 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
@@ -53,7 +53,7 @@
{% endif %}
{% for column in extra_columns %}
-
{{ column.name }}: {{ object|object_property:column.attribute }}
+
{{ column.name }}: {{ object|common_object_property:column.attribute }}
{% endfor %}
{% if not hide_links %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
index 5d2ea6b952..ba6a5d64c0 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
@@ -42,7 +42,7 @@
{% if source_column.help_text %}
- {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
+ {% appearance_get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
{% endif %}
@@ -66,7 +66,7 @@
{% if source_column.help_text %}
- {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
+ {% appearance_get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
{% endif %}
@@ -117,7 +117,7 @@
{% endif %}
{% for column in extra_columns %}
-
{{ object|object_property:column.attribute }} |
+
{{ object|common_object_property:column.attribute }} |
{% endfor %}
{% if not hide_links %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
index 542bd6ec63..aaf55eb7ec 100644
--- a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
@@ -13,10 +13,10 @@
{% endif %}
{% if subtemplate.form %}
- {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
+ {% common_render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
{{ rendered_subtemplate }}
{% else %}
- {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
+ {% common_render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
{{ rendered_subtemplate }}
{% endif %}
diff --git a/mayan/apps/appearance/templates/appearance/home.html b/mayan/apps/appearance/templates/appearance/home.html
index 9c7bc68cc8..067a5cf922 100644
--- a/mayan/apps/appearance/templates/appearance/home.html
+++ b/mayan/apps/appearance/templates/appearance/home.html
@@ -44,6 +44,6 @@
{% include 'dynamic_search/search_box.html' %}
- {% render_dashboard 'main' %}
+ {% dashboards_render_dashboard 'main' %}
{% endblock %}
diff --git a/mayan/apps/appearance/templates/appearance/menu_main.html b/mayan/apps/appearance/templates/appearance/menu_main.html
index d9e356607a..836902186b 100644
--- a/mayan/apps/appearance/templates/appearance/menu_main.html
+++ b/mayan/apps/appearance/templates/appearance/menu_main.html
@@ -1,10 +1,8 @@
{% load i18n %}
-{% load navigation_tags %}
-{% load smart_settings_tags %}
-
{% load common_tags %}
{% load navigation_tags %}
+{% load smart_settings_tags %}
{% spaceless %}