From c7953a1cfb916a8b70dd1198ef832ce5764a2539 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 30 Jun 2015 17:35:16 -0400 Subject: [PATCH] Improve document upload wizard title messages --- .../apps/appearance/templates/appearance/generic_form.html | 6 ++---- .../appearance/templates/appearance/generic_wizard.html | 2 ++ mayan/apps/metadata/{parsers.py => validators.py} | 0 mayan/apps/sources/wizards.py | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) rename mayan/apps/metadata/{parsers.py => validators.py} (100%) diff --git a/mayan/apps/appearance/templates/appearance/generic_form.html b/mayan/apps/appearance/templates/appearance/generic_form.html index ca7b055ed3..6c7f7eac99 100644 --- a/mayan/apps/appearance/templates/appearance/generic_form.html +++ b/mayan/apps/appearance/templates/appearance/generic_form.html @@ -5,10 +5,8 @@ {% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %} {% block content %} - {% if title %} -

{{ title }}

-
- {% endif %} +

{% include 'appearance/calculate_form_title.html' %}

+
{% if form %} {% with '' as title %} diff --git a/mayan/apps/appearance/templates/appearance/generic_wizard.html b/mayan/apps/appearance/templates/appearance/generic_wizard.html index c939c40de7..58e35cc735 100644 --- a/mayan/apps/appearance/templates/appearance/generic_wizard.html +++ b/mayan/apps/appearance/templates/appearance/generic_wizard.html @@ -3,6 +3,8 @@ {% load i18n %} {% block content %} +

{% include 'appearance/calculate_form_title.html' %}

+
{{ wizard.management_form }} {% with step_title as title %} diff --git a/mayan/apps/metadata/parsers.py b/mayan/apps/metadata/validators.py similarity index 100% rename from mayan/apps/metadata/parsers.py rename to mayan/apps/metadata/validators.py diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py index e9b2580488..bfdb258279 100644 --- a/mayan/apps/sources/wizards.py +++ b/mayan/apps/sources/wizards.py @@ -64,6 +64,7 @@ class DocumentCreateWizard(ViewPermissionCheckMixin, SessionWizardView): 'step_title': self.step_titles[self.steps.step0], 'submit_label': _('Next step'), 'submit_icon': 'fa fa-arrow-right', + 'title': _('Document upload wizard'), }) return context