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

Fix HTML mark up in window title. GitLab issue #397.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-12 00:55:09 -04:00
parent bbb5c393a6
commit b9994dbf40
8 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY.rst
View File

@@ -1,3 +1,7 @@
2.5.3 (2017-07-XX)
==================
- Fix HTML mark up in window title. GitLab issue #397.
2.5.2 (2017-07-08) 2.5.2 (2017-07-08)
================== ==================
- Improve new document creation signal handling. - Improve new document creation signal handling.

10
mayan/apps/appearance/templates/appearance/calculate_form_title.html
View File

@@ -5,7 +5,10 @@
{% smart_setting 'APPEARANCE_MAXIMUM_TITLE_LENGTH' as maximum_title_length %} {% smart_setting 'APPEARANCE_MAXIMUM_TITLE_LENGTH' as maximum_title_length %}
{# Avoid horizontal scroll on small displays #} {# Avoid horizontal scroll on small displays #}
<span style="word-break: break-all;"> {% if not html_title %}
<span style="word-break: break-all;">
{% endif %}
{% if title %} {% if title %}
{{ title|truncatechars:maximum_title_length }} {{ title|truncatechars:maximum_title_length }}
{% else %} {% else %}
@@ -19,4 +22,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</span>
{% if not html_title %}
</span>
{% endif %}

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

@@ -2,7 +2,7 @@
{% load common_tags %} {% load common_tags %}
{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %} {% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
{% block content %} {% block content %}
<h3>{% include 'appearance/calculate_form_title.html' %}</h3> <h3>{% include 'appearance/calculate_form_title.html' %}</h3>

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

@@ -4,7 +4,7 @@
{% load navigation_tags %} {% load navigation_tags %}
{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %} {% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
{% block content %} {% block content %}
{% if title %} {% if title %}

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

@@ -2,7 +2,7 @@
{% load common_tags %} {% load common_tags %}
{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %} {% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
{% block content %} {% block content %}
{% if main_title %} {% if main_title %}

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

@@ -1,6 +1,5 @@
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
<h4> <h4>
{% include 'appearance/calculate_form_title.html' %} {% include 'appearance/calculate_form_title.html' %}
</h4> </h4>

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

@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %} {% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
{% block content %} {% block content %}
<h3>{% include 'appearance/calculate_form_title.html' %}</h3> <h3>{% include 'appearance/calculate_form_title.html' %}</h3>

2
mayan/apps/document_indexing/templates/document_indexing/node_details.html
View File

@@ -4,7 +4,7 @@
{% load navigation_tags %} {% load navigation_tags %}
{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %} {% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
{% block content %} {% block content %}
{% if title %} {% if title %}