From 92c84e043c6e788190980883265e50ed8a1fa5a1 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Sun, 21 Oct 2012 18:29:47 +0200
Subject: Djangoization - Major refactoring (step 9)

* move templates
* change labels
---
 .../templates/ishtar/wizard/confirm_wizard.html    |  1 +
 .../ishtar/wizard/wizard_closing_done.html         |  6 ++++++
 .../ishtar/wizard/wizard_delete_done.html          |  6 ++++++
 .../templates/ishtar/wizard/wizard_done.html       |  6 ++++++
 .../ishtar/wizard/wizard_done_summary.html         | 18 ++++++++++++++++
 .../ishtar/wizard/wizard_done_summary_2.html       | 23 ++++++++++++++++++++
 .../ishtar/wizard/wizard_list_search_result.html   | 25 ++++++++++++++++++++++
 ishtar_common/templates/wizard_closing_done.html   |  6 ------
 ishtar_common/templates/wizard_delete_done.html    |  6 ------
 ishtar_common/templates/wizard_done.html           |  6 ------
 ishtar_common/templates/wizard_done_summary.html   | 18 ----------------
 ishtar_common/templates/wizard_done_summary_2.html | 23 --------------------
 .../templates/wizard_list_search_result.html       | 25 ----------------------
 ishtar_common/wizards.py                           |  8 +++----
 14 files changed, 89 insertions(+), 88 deletions(-)
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_closing_done.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_delete_done.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_done.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
 delete mode 100644 ishtar_common/templates/wizard_closing_done.html
 delete mode 100644 ishtar_common/templates/wizard_delete_done.html
 delete mode 100644 ishtar_common/templates/wizard_done.html
 delete mode 100644 ishtar_common/templates/wizard_done_summary.html
 delete mode 100644 ishtar_common/templates/wizard_done_summary_2.html
 delete mode 100644 ishtar_common/templates/wizard_list_search_result.html

(limited to 'ishtar_common')

diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index bd80e3967..5d1b1c042 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load range %}
 {% block content %}
+<h2>{{wizard_label}}</h2>
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_closing_done.html b/ishtar_common/templates/ishtar/wizard/wizard_closing_done.html
new file mode 100644
index 000000000..54990a629
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_closing_done.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block content %}
+<p>{%trans "Item successfully closed"%}</p>
+</div>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_delete_done.html b/ishtar_common/templates/ishtar/wizard/wizard_delete_done.html
new file mode 100644
index 000000000..854341aa3
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_delete_done.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block content %}
+<p>{%trans "Item successfully deleted"%}</p>
+</div>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done.html b/ishtar_common/templates/ishtar/wizard/wizard_done.html
new file mode 100644
index 000000000..a7068bbab
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block content %}
+<p>{%trans "Item successfully saved"%}</p>
+</div>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html b/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
new file mode 100644
index 000000000..53650dafe
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
@@ -0,0 +1,18 @@
+{% extends "wizard_done.html" %}
+{% load i18n %}
+{% block content %}
+
+<div class='form'>
+  <p>{% trans "You have entered the following informations:" %}</p>
+  {% for form_label, form_data in datas %}
+  <table class='confirm'>
+    <caption>{{form_label}}</caption>
+    {% for label, data, cls in form_data %}
+    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
+    {% endfor %}
+  </table>
+  {% endfor %}
+  <p>{% trans {%trans "Item successfully saved"%} %}</p>
+</div>
+
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html b/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
new file mode 100644
index 000000000..66a572542
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
@@ -0,0 +1,23 @@
+{% extends "wizard_done.html" %}
+{% load i18n %}
+{% block content %}
+
+<div class='form'>
+  <p>{% trans {%trans "Item successfully saved"%} %}</p>	
+  <p>{% trans "You have saved the following informations:" %}</p>
+  <p>{% trans {%trans "The file must be processed before :"%} %} {% calculated_deadline %}  </p>
+  <p>{% trans {%trans "The person in charge is : "%} %} {% responsible %} </p>
+  <p>{% trans {%trans "The internal reference of this file is :"%} %} {% Year %} - {% ref_index %} [{% ref_string %}]</p>
+
+  {% for form_label, form_data in datas %}
+  <table class='confirm'>
+    <caption>{{form_label}}</caption>
+    {% for label, data, cls in form_data %}
+    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
+    {% endfor %}
+  </table>
+  {% endfor %}
+
+</div>
+
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html b/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
new file mode 100644
index 000000000..6cbafb930
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
@@ -0,0 +1,25 @@
+{% extends "wizard_done.html" %}
+{% load i18n %}
+{% block content %}
+
+<div class='form'>
+  <p>{% trans {%trans "PLease note that the file must be processed before :"%} %} {% calculated_deadline %}  </p>
+
+  <p>{% trans {%trans "Item successfully saved"%} %}</p>	
+  <p>{% trans "You have saved the following informations:" %}</p>
+  
+  <p>{% trans {%trans "The person in charge is : "%} %} {% responsible %} </p>
+  <p>{% trans {%trans "The internal reference of this file is :"%} %} {% Year %} - {% ref_index %} [{% ref_string %}]</p>
+
+  {% for form_label, form_data in datas %}
+  <table class='confirm'>
+    <caption>{{form_label}}</caption>
+    {% for label, data, cls in form_data %}
+    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
+    {% endfor %}
+  </table>
+  {% endfor %}
+
+</div>
+
+{% endblock %}
diff --git a/ishtar_common/templates/wizard_closing_done.html b/ishtar_common/templates/wizard_closing_done.html
deleted file mode 100644
index 54990a629..000000000
--- a/ishtar_common/templates/wizard_closing_done.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block content %}
-<p>{%trans "Item successfully closed"%}</p>
-</div>
-{% endblock %}
diff --git a/ishtar_common/templates/wizard_delete_done.html b/ishtar_common/templates/wizard_delete_done.html
deleted file mode 100644
index 854341aa3..000000000
--- a/ishtar_common/templates/wizard_delete_done.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block content %}
-<p>{%trans "Item successfully deleted"%}</p>
-</div>
-{% endblock %}
diff --git a/ishtar_common/templates/wizard_done.html b/ishtar_common/templates/wizard_done.html
deleted file mode 100644
index a7068bbab..000000000
--- a/ishtar_common/templates/wizard_done.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block content %}
-<p>{%trans "Item successfully saved"%}</p>
-</div>
-{% endblock %}
diff --git a/ishtar_common/templates/wizard_done_summary.html b/ishtar_common/templates/wizard_done_summary.html
deleted file mode 100644
index 53650dafe..000000000
--- a/ishtar_common/templates/wizard_done_summary.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "wizard_done.html" %}
-{% load i18n %}
-{% block content %}
-
-<div class='form'>
-  <p>{% trans "You have entered the following informations:" %}</p>
-  {% for form_label, form_data in datas %}
-  <table class='confirm'>
-    <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
-    {% endfor %}
-  </table>
-  {% endfor %}
-  <p>{% trans {%trans "Item successfully saved"%} %}</p>
-</div>
-
-{% endblock %}
diff --git a/ishtar_common/templates/wizard_done_summary_2.html b/ishtar_common/templates/wizard_done_summary_2.html
deleted file mode 100644
index 66a572542..000000000
--- a/ishtar_common/templates/wizard_done_summary_2.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "wizard_done.html" %}
-{% load i18n %}
-{% block content %}
-
-<div class='form'>
-  <p>{% trans {%trans "Item successfully saved"%} %}</p>	
-  <p>{% trans "You have saved the following informations:" %}</p>
-  <p>{% trans {%trans "The file must be processed before :"%} %} {% calculated_deadline %}  </p>
-  <p>{% trans {%trans "The person in charge is : "%} %} {% responsible %} </p>
-  <p>{% trans {%trans "The internal reference of this file is :"%} %} {% Year %} - {% ref_index %} [{% ref_string %}]</p>
-
-  {% for form_label, form_data in datas %}
-  <table class='confirm'>
-    <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
-    {% endfor %}
-  </table>
-  {% endfor %}
-
-</div>
-
-{% endblock %}
diff --git a/ishtar_common/templates/wizard_list_search_result.html b/ishtar_common/templates/wizard_list_search_result.html
deleted file mode 100644
index 6cbafb930..000000000
--- a/ishtar_common/templates/wizard_list_search_result.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "wizard_done.html" %}
-{% load i18n %}
-{% block content %}
-
-<div class='form'>
-  <p>{% trans {%trans "PLease note that the file must be processed before :"%} %} {% calculated_deadline %}  </p>
-
-  <p>{% trans {%trans "Item successfully saved"%} %}</p>	
-  <p>{% trans "You have saved the following informations:" %}</p>
-  
-  <p>{% trans {%trans "The person in charge is : "%} %} {% responsible %} </p>
-  <p>{% trans {%trans "The internal reference of this file is :"%} %} {% Year %} - {% ref_index %} [{% ref_string %}]</p>
-
-  {% for form_label, form_data in datas %}
-  <table class='confirm'>
-    <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
-    {% endfor %}
-  </table>
-  {% endfor %}
-
-</div>
-
-{% endblock %}
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index e423b834e..fb6ad22e2 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -417,7 +417,7 @@ class Wizard(NamedUrlWizardView):
                 # necessary to manage interaction between models like
                 # material_index management for baseitems
                 obj.save()
-        res = render_to_response('wizard_done.html', {},
+        res = render_to_response('ishtar/wizard/wizard_done.html', {},
                                   context_instance=RequestContext(self.request))
         return return_object and (obj, res) or res
 
@@ -727,7 +727,7 @@ class DeletionWizard(Wizard):
     def done(self, form_list, **kwargs):
         obj = self.get_current_object()
         obj.delete()
-        return render_to_response('wizard_delete_done.html', {},
+        return render_to_response('ishtar/wizard/wizard_delete_done.html', {},
                                   context_instance=RequestContext(self.request))
 
 class ClosingWizard(Wizard):
@@ -777,7 +777,7 @@ class ClosingWizard(Wizard):
                 if 'end_date' in form.cleaned_data and hasattr(obj, 'end_date'):
                     obj.end_date = form.cleaned_data['end_date']
                     obj.save()
-        return render_to_response('wizard_closing_done.html', {},
+        return render_to_response('ishtar/wizard/wizard_closing_done.html', {},
                                   context_instance=RequestContext(self.request))
 
 class PersonWizard(Wizard):
@@ -853,7 +853,7 @@ class AccountWizard(Wizard):
                                                            "app_name":app_name}
             send_mail(subject, msg, settings.ADMINS[0][1],
                       [dct['email']], fail_silently=True)
-        res = render_to_response('wizard_done.html', {},
+        res = render_to_response('ishtar/wizard/wizard_done.html', {},
                                   context_instance=RequestContext(self.request))
         return res
 
-- 
cgit v1.2.3