Merge branch 'master' into feature/merge_master

2016-03-03 16:46:11 -04:00
parent 652613452b 378a346e79
commit ce6a1f4020
24 changed files with 194 additions and 181 deletions
--- a/mayan/apps/appearance/templates/appearance/calculate_form_title.html
+++ b/mayan/apps/appearance/templates/appearance/calculate_form_title.html
@@ -1,7 +1,7 @@
 {% load i18n %}

 {% if title %}
-    {{ title }}
+    {{ title|striptags }}
 {% else %}
    {% if read_only %}
        {% blocktrans %}Details for: {{ object }}{% endblocktrans %}
--- a/mayan/apps/appearance/templates/appearance/generic_wizard.html
+++ b/mayan/apps/appearance/templates/appearance/generic_wizard.html
@@ -2,6 +2,8 @@

 {% load i18n %}

+{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %}
+
 {% block content %}
    <h3>{% include 'appearance/calculate_form_title.html' %}</h3>
    <hr>