From 7d2aa560ba859ebb593d34b062bf1faf09c8724c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 18 Oct 2012 17:49:57 +0200 Subject: Djangoization - Major refactoring (step 1) --- .../templates/account_activation_email.txt | 13 + ishtar_common/templates/admin/base_site.html | 10 + ishtar_common/templates/base.html | 89 ++++ ishtar_common/templates/dashboard_file.html | 215 +++++++++ ishtar_common/templates/dashboard_main.html | 82 ++++ ishtar_common/templates/dashboard_operation.html | 510 +++++++++++++++++++++ ishtar_common/templates/form_snippet.html | 13 + ishtar_common/templates/index.html | 2 + .../templates/ishtar/wizard/confirm_wizard.html | 34 ++ .../templates/ishtar/wizard/default_wizard.html | 44 ++ ishtar_common/templates/registration/activate.html | 18 + .../templates/registration/activation_email.txt | 6 + .../registration/activation_email_subject.txt | 1 + ishtar_common/templates/registration/login.html | 19 + ishtar_common/templates/registration/logout.html | 8 + .../registration/password_change_done.html | 8 + .../registration/password_change_form.html | 14 + .../registration/password_reset_complete.html | 10 + .../registration/password_reset_confirm.html | 21 + .../registration/password_reset_done.html | 8 + .../registration/password_reset_email.html | 5 + .../registration/password_reset_form.html | 15 + .../registration/registration_complete.html | 8 + .../templates/registration/registration_form.html | 14 + ishtar_common/templates/search.html | 28 ++ ishtar_common/templates/sheet.html | 30 ++ ishtar_common/templates/sheet_contextrecord.html | 135 ++++++ .../templates/sheet_contextrecord_window.html | 3 + ishtar_common/templates/sheet_file.html | 132 ++++++ ishtar_common/templates/sheet_file_pdf.html | 18 + ishtar_common/templates/sheet_file_window.html | 3 + ishtar_common/templates/sheet_ope.html | 146 ++++++ ishtar_common/templates/sheet_ope_modif.html | 182 ++++++++ ishtar_common/templates/sheet_operation.html | 183 ++++++++ ishtar_common/templates/sheet_operation_pdf.html | 18 + .../templates/sheet_operation_window.html | 3 + ishtar_common/templates/towns_wizard.html | 40 ++ ishtar_common/templates/window.html | 45 ++ 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 + 44 files changed, 2217 insertions(+) create mode 100644 ishtar_common/templates/account_activation_email.txt create mode 100644 ishtar_common/templates/admin/base_site.html create mode 100644 ishtar_common/templates/base.html create mode 100644 ishtar_common/templates/dashboard_file.html create mode 100644 ishtar_common/templates/dashboard_main.html create mode 100644 ishtar_common/templates/dashboard_operation.html create mode 100644 ishtar_common/templates/form_snippet.html create mode 100644 ishtar_common/templates/index.html create mode 100644 ishtar_common/templates/ishtar/wizard/confirm_wizard.html create mode 100644 ishtar_common/templates/ishtar/wizard/default_wizard.html create mode 100644 ishtar_common/templates/registration/activate.html create mode 100644 ishtar_common/templates/registration/activation_email.txt create mode 100644 ishtar_common/templates/registration/activation_email_subject.txt create mode 100644 ishtar_common/templates/registration/login.html create mode 100644 ishtar_common/templates/registration/logout.html create mode 100644 ishtar_common/templates/registration/password_change_done.html create mode 100644 ishtar_common/templates/registration/password_change_form.html create mode 100644 ishtar_common/templates/registration/password_reset_complete.html create mode 100644 ishtar_common/templates/registration/password_reset_confirm.html create mode 100644 ishtar_common/templates/registration/password_reset_done.html create mode 100644 ishtar_common/templates/registration/password_reset_email.html create mode 100644 ishtar_common/templates/registration/password_reset_form.html create mode 100644 ishtar_common/templates/registration/registration_complete.html create mode 100644 ishtar_common/templates/registration/registration_form.html create mode 100644 ishtar_common/templates/search.html create mode 100644 ishtar_common/templates/sheet.html create mode 100644 ishtar_common/templates/sheet_contextrecord.html create mode 100644 ishtar_common/templates/sheet_contextrecord_window.html create mode 100644 ishtar_common/templates/sheet_file.html create mode 100644 ishtar_common/templates/sheet_file_pdf.html create mode 100644 ishtar_common/templates/sheet_file_window.html create mode 100644 ishtar_common/templates/sheet_ope.html create mode 100644 ishtar_common/templates/sheet_ope_modif.html create mode 100644 ishtar_common/templates/sheet_operation.html create mode 100644 ishtar_common/templates/sheet_operation_pdf.html create mode 100644 ishtar_common/templates/sheet_operation_window.html create mode 100644 ishtar_common/templates/towns_wizard.html create mode 100644 ishtar_common/templates/window.html create mode 100644 ishtar_common/templates/wizard_closing_done.html create mode 100644 ishtar_common/templates/wizard_delete_done.html create mode 100644 ishtar_common/templates/wizard_done.html create mode 100644 ishtar_common/templates/wizard_done_summary.html create mode 100644 ishtar_common/templates/wizard_done_summary_2.html create mode 100644 ishtar_common/templates/wizard_list_search_result.html (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/account_activation_email.txt b/ishtar_common/templates/account_activation_email.txt new file mode 100644 index 000000000..2dcc77d3e --- /dev/null +++ b/ishtar_common/templates/account_activation_email.txt @@ -0,0 +1,13 @@ +{% load i18n %} + +{% blocktrans %}Your account on {{app_name}} has been created or modified.{% endblocktrans %} + + * {% trans "Login:" %} {{login}} + * {% trans "Password:" %} {{password}} + +{% trans "You can log in here:" %} http://{{site}}{%url auth_login%} + +{% trans "Thank you for you interest in the project." %} + +-- +{% blocktrans %}The {{app_name}} team{% endblocktrans %} diff --git a/ishtar_common/templates/admin/base_site.html b/ishtar_common/templates/admin/base_site.html new file mode 100644 index 000000000..3282d4f5a --- /dev/null +++ b/ishtar_common/templates/admin/base_site.html @@ -0,0 +1,10 @@ +{% extends "admin/base.html" %} +{% load i18n %} + +{% block title %}{{ title }} | {% trans 'Ishtar administration' %}{% endblock %} + +{% block branding %} +

{% trans 'Ishtar administration' %}

+{% endblock %} + +{% block nav-global %}{% endblock %} diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html new file mode 100644 index 000000000..630fe666e --- /dev/null +++ b/ishtar_common/templates/base.html @@ -0,0 +1,89 @@ +{% load i18n %} + + + + + + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} + + + + + + + + + {% block extra_head %} + {% endblock %} + + + +
+ +
+ {% block context %}{% if current_menu %} +
+
+ {% trans "Default items"%} + + {% for lbl, model_name, items in current_menu %} + + + + + {% endfor %} +
+ +
+
+
+ {% endif %}{% endblock %} +
+ +
+ {% block content %}{% endblock %} +
+ + + + + diff --git a/ishtar_common/templates/dashboard_file.html b/ishtar_common/templates/dashboard_file.html new file mode 100644 index 000000000..cebd147f4 --- /dev/null +++ b/ishtar_common/templates/dashboard_file.html @@ -0,0 +1,215 @@ +{% extends "base.html" %} +{% load i18n %} +{% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} +
+

{% trans "Archaeological files" %}

+
+

{% trans "Global informations" %}

+ +

{% trans "Total:" %} {{dashboard.total_number}}

+ {% for type in dashboard.types %} +

{{type.file_type__label}}{% trans ":"%} {{type.number}}

+ {% endfor %} +
+ + + + {% for year in dashboard.by_year %}{% endfor %} + + + {% for year in dashboard.by_year %}{% endfor%} + +
{% trans "By year"%}
{{year.date.year}}
{{year.number}}
+
+ +
+ + + + {% for month in dashboard.by_month %}{% endfor %} + + + {% for month in dashboard.by_month %}{% endfor%} + +
{% trans "By month"%}
{{month.date|date:"F Y"|capfirst}}
{{month.number}}
+
+ +
+
+ +

{% trans "Research archaeology" %}

+ +

{% trans "Total:" %} {{dashboard.research.total_number}}

+
+ + + + {% for year in dashboard.research.by_year %}{% endfor %} + + + {% for year in dashboard.research.by_year %}{% endfor%} + +
{% trans "By year"%}
{{year.date.year}}
{{year.number}}
+
+ +
+ + + + {% for month in dashboard.research.by_month %}{% endfor %} + + + {% for month in dashboard.research.by_month %}{% endfor%} + +
{% trans "By month"%}
{{month.date|date:"F Y"|capfirst}}
{{month.number}}
+
+ +
+ + + + {% for dpt in dashboard.research.by_dpt %}{% endfor %} + + + {% for dpt in dashboard.research.by_dpt %}{% endfor%} + +
{% trans "By department"%}
{{dpt.department__label}}
{{dpt.number}}
+
+ +
+ + + + {% for town in dashboard.research.towns %}{% endfor %} + + + {% for town in dashboard.research.towns %}{% endfor%} + +
{% trans "Main towns"%}
{{town.town__name}}
{{town.number}}
+
+ +
+
+ +

{% trans "Rescue archaeology" %}

+ +

{% trans "Total:" %} {{dashboard.rescue.total_number}}

+ +
+ + + + {% for saisine in dashboard.rescue.saisine %}{% endfor %} + + + {% for saisine in dashboard.rescue.saisine %}{% endfor%} + +
{% trans "By saisine type"%}
{{saisine.saisine_type__label}}
{{saisine.number}}
+
+ +
+ + + + {% for act in dashboard.rescue.administrative_act %}{% endfor %} + + + {% for act in dashboard.rescue.administrative_act %}{% endfor%} + +
{% trans "By administrative act"%}
{{act.act_type__label}}
{{act.number}}
+
+ +
+ + + + {% for year in dashboard.rescue.by_year %}{% endfor %} + + + {% for year in dashboard.rescue.by_year %}{% endfor%} + +
{% trans "By year"%}
{{year.date.year}}
{{year.number}}
+
+ +
+ + + + {% for month in dashboard.rescue.by_month %}{% endfor %} + + + {% for month in dashboard.rescue.by_month %}{% endfor%} + +
{% trans "By month"%}
{{month.date|date:"F Y"|capfirst}}
{{month.number}}
+
+ +

{% trans "Archaeological files linked to at least one operation:" %} {{dashboard.rescue.with_associated_operation}}

+

{% trans "Archaeological files linked to at least one operation (%):" %} {{dashboard.rescue.with_associated_operation_percent}}

+ +
+ + + + {% for year in dashboard.rescue.operational_by_year %}{% endfor %} + + + {% for year in dashboard.rescue.operational_by_year %}{% endfor%} + +
{% trans "Archaeological files linked to at least one operation (%)"%}
{{year.date.year}}
{{year.number}}
+
+ +
+ + + + {% for dpt in dashboard.rescue.by_dpt %}{% endfor %} + + + {% for dpt in dashboard.rescue.by_dpt %}{% endfor%} + +
{% trans "By department"%}
{{dpt.department__label}}
{{dpt.number}}
+
+ +
+ + + + {% for dpt in dashboard.rescue.surface_by_dpt %}{% endfor %} + + + {% for dpt in dashboard.rescue.surface_by_dpt %}{% endfor%} + +
{% trans "Surface by department (m²)"%}
{{dpt.department__label}}
{{dpt.number}}
+
+ +
+ + + + {% for town in dashboard.rescue.towns %}{% endfor %} + + + {% for town in dashboard.rescue.towns %}{% endfor%} + +
{% trans "Main towns by number"%}
{{town.town__name}}
{{town.number}}
+
+ +
+ + + + {% for town in dashboard.rescue.surface_by_town %}{% endfor %} + + + {% for town in dashboard.rescue.surface_by_town %}{% endfor%} + +
{% trans "Main towns by surface (m²)"%}
{{town.town__name}}
{{town.number}}
+
+ +
+
+{% endblock %} diff --git a/ishtar_common/templates/dashboard_main.html b/ishtar_common/templates/dashboard_main.html new file mode 100644 index 000000000..e710dbe16 --- /dev/null +++ b/ishtar_common/templates/dashboard_main.html @@ -0,0 +1,82 @@ +{% extends "base.html" %} +{% load i18n %} +{% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} +
+{% for lbl, dashboard in items %} +
+

{{lbl}}

+

{% trans "Numbers" %}

+

{% trans "Total:" %} {{dashboard.total_number}}

+
+ + {% for idx, lbl, values in dashboard.values %} + + + {% for value in values %}{% endfor%} + + {% endfor%} +
{{lbl}}{{value}}
+
+ {% if dashboard.years %} +

{% trans "By years" %}

+
    +
  • {% trans "Average:" %} {{dashboard.average}}
    • +
  • {% trans "Variance:" %} {{dashboard.variance}}
    • +
  • {% trans "Standard deviation:" %} {{dashboard.standard_deviation}}
    • +
  • {% trans "Median:" %} {{dashboard.median}}
    • +
  • {% trans "Mode:" %} {{dashboard.mode}}
    • +
+ {% endif %} + {% if dashboard.operation_average %} +

{% trans "By operations" %}

+
    +
  • {% trans "Average:" %} {{dashboard.operation_average}}
    • +
  • {% trans "Variance:" %} {{dashboard.operation_variance}}
    • +
  • {% trans "Standard deviation:" %} {{dashboard.operation_standard_deviation}}
    • +
  • {% trans "Median:" %} {{dashboard.operation_median}}
    • +
  • {% trans "Mode:" %} {{dashboard.operation_mode}}
    • +
+ {% endif %} +

{% trans "Created last" %}

+
+ + + {% for item in dashboard.lasts %} + + + + {% endfor %} +
{{lbl}}{% trans "Created" %}
{{item}}{{item.history_date}}{% if item.get_show_url %}{%trans "Show"%}{%endif%}
+
+

{% trans "Recent changes" %}

+
+ + + {% for item in dashboard.recents %} + + + + {% endfor %} +
{{lbl}}{% trans "Modified" %}
{{item}}{{item.history_date}}{% if item.get_show_url %}{%trans "Show"%}{%endif%}
+
+
+{% endfor%} +
+

{% trans "Users" %}

+
+ + + {% for user_type in ishtar_users.types %} + + + + + {% endfor%} +
{% trans "User type" %}{% trans "Number" %}
{{user_type.person__person_type__label}}{{user_type.number}}
+
+
+{% endblock %} diff --git a/ishtar_common/templates/dashboard_operation.html b/ishtar_common/templates/dashboard_operation.html new file mode 100644 index 000000000..28f1dd9c6 --- /dev/null +++ b/ishtar_common/templates/dashboard_operation.html @@ -0,0 +1,510 @@ +{% extends "base.html" %} +{% load i18n %} +{% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} +
+

{% trans "Operations" %}

+
+

{% trans "Global informations" %}

+ +
+ + + + + + {% for lbl, nb in dashboard.total %} + + + + {% endfor %} +
{% trans "Total" %}
{% trans "Status" %}{% trans "Number" %}
{{lbl}}{{nb}}
+ +
+ + + + + + {% for surface in dashboard.surface_by_type %} + + + + {% endfor %} +
{% trans "Area by type of operation" %}
{% trans "Status" %}{% trans "Area (m²)" %}
{{surface.operation_type__label}}{{surface.number}}
+ +
+ + + + {%for typ in dashboard.types %}{% endfor %} + + {% for lbl, types in dashboard.by_type %} + + {%for nb in types %}{% endfor %} + + {% endfor %} +
{% trans "By types" %}
{% trans "State" %}{{typ.label}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.by_year %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "By year" %}
{% trans "State" %}{{yr}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.realisation_years %}{% endfor %} + + {% for lbl, years in dashboard.by_realisation_year %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "By realisation year" %}
{% trans "State" %}{{yr.year}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.effective %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "Effective operation by type and year" %}
{% trans "Type" %}{{yr}}
{{lbl}}{{nb}}
+ +
+ + + + {%for mt in dashboard.last_months %}{% endfor %} + + {% for lbl, months in dashboard.by_realisation_month %} + + {%for nb in months %}{% endfor %} + + {% endfor %} +
{% trans "By realisation month" %}
{% trans "State" %}{{mt.date|date:"F Y"|capfirst}}
{{lbl}}{{nb}}
+ +
+
+ +

{% trans "Survey informations" %}

+ +
+ + + + + + {% for lbl, nb in dashboard.survey.total %} + + + + {% endfor %} +
{% trans "Total" %}
{% trans "Status" %}{% trans "Number" %}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.survey.by_year %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "By year" %}
{% trans "State" %}{{yr}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.realisation_years %}{% endfor %} + + {% for lbl, years in dashboard.survey.by_realisation_year %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "By realisation year" %}
{% trans "State" %}{{yr.year}}
{{lbl}}{{nb}}
+ +
+ + + + {% for lbl in dashboard.filters_label %}{%endfor%} + + + {% for nb in dashboard.survey.area %}{%endfor%} + + + {% for nb in dashboard.survey.manday %}{%endfor%} + + + {% for nb in dashboard.survey.mandayhect %}{%endfor%} + +
{% trans "Current year" %}
{% trans "Status" %}{{lbl}}
{% trans "Area"%}{{nb}}
{% trans "Man-day"%}{{nb}}
{% trans "Man-day/hectare"%}{{nb}}
+ +

{% trans "Man-day/hectare for effective operations (current year):" %} {{dashboard.survey.mandayhect_effective}}

+ +
+ + + + + + {% for org in dashboard.survey.org %} + + + + {% endfor %} +
{% trans "Organizations (current year)" %}
 {% trans "Area" %}{% trans "Man-day" %}{% trans "Man-day/hectare" %}
{{org.in_charge__attached_to__name}}{{org.area}}{{org.manday}}{{org.mandayhect}}
+ +
+ + + + {% for lbl in dashboard.filters_label %}{%endfor%} + + + {% for nb in dashboard.survey.area_realised %}{%endfor%} + + + {% for nb in dashboard.survey.manday_realised %}{%endfor%} + + + {% for nb in dashboard.survey.mandayhect_realised %}{%endfor%} + +
{% trans "Current realisation year" %}
{% trans "Status" %}{{lbl}}
{% trans "Area"%}{{nb}}
{% trans "Man-day"%}{{nb}}
{% trans "Man-day/hectare"%}{{nb}}
+ +

{% trans "Man-day/hectare for effective operations (current realisation year):" %} {{dashboard.survey.mandayhect_real_effective}}

+ +
+ + + + + + {% for org in dashboard.survey.org_realised %} + + + + {% endfor %} +
{% trans "Organizations (current realisation year)" %}
 {% trans "Area" %}{% trans "Man-day" %}{% trans "Man-day/hectare" %}
{{org.in_charge__attached_to__name}}{{org.area}}{{org.manday}}{{org.mandayhect}}
+ +
+ + + + {% for yr in dashboard.years%}{% endfor %} + + {% for org, vals in dashboard.survey.org_by_year %} + + {% for area, cost in vals %}{% endfor %} + + {% endfor %} + + {% for area in dashboard.survey.org_by_year_area_mean %}{% endfor %} + +
{% trans "Area by organization by year" %}
{% trans "Organization" %}{{yr}}
{{org}}{{area}}
{% trans "Mean" %}{{area}}
+ +
+ + + + {% for yr in dashboard.years%}{% endfor %} + + + {% for nb, mean in dashboard.survey.effective %}{% endfor %} + + + {% for nb, avg in dashboard.survey.effective %}{% endfor %} + +
{% trans "Effective operations areas (m²)" %}
 {{yr}}
{% trans "Sum" %}{{nb}}
{% trans "Average" %}{{avg}}
+ +
+ + + + {% for yr in dashboard.years%}{% endfor %} + + + {% for nb, mean in dashboard.survey.mandayshect %}{% endfor %} + + + {% for nb, avg in dashboard.survey.mandayshect %}{% endfor %} + +
{% trans "Man-Days/hectare by Year" %}
 {{yr}}
{% trans "Man-Days/hectare" %}{{nb}}
{% trans "Average" %}{{avg}}
+ +
+ + + + {%for mt in dashboard.last_months %}{% endfor %} + + {% for lbl, months in dashboard.survey.by_month %} + + {%for nb in months %}{% endfor %} + + {% endfor %} +
{% trans "By month" %}
{% trans "State" %}{{mt.date|date:"F Y"|capfirst}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.survey.by_dpt %} + + {%for nb in years %}{{nb}}{% endfor %} + + {% endfor %} +
{% trans "By department" %}
{% trans "Department" %}{{yr}}{% trans "Sum" %}
{{lbl}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.survey.effective_by_dpt %} + + {%for nb, area, cost, fnap in years %}{{nb}}{{area}}{% endfor %} + + {% endfor %} +
{% trans "Effective operation by department" %}
{% trans "Department" %}{{yr}}{% trans "Sum" %}
{%trans "Nb."%}{%trans "Area"%}{%trans "Nb."%}{%trans "Area"%}
{{lbl}}
+ +
+ + + + + + {% for lbl, nb in dashboard.survey.towns %} + + + + {% endfor %} +
{% trans "Main towns by number" %}
{% trans "Town" %}{% trans "Number" %}
{{lbl}}{{nb}}
+ +
+ + + + + + {% for lbl, nb in dashboard.survey.towns_surface %} + + + + {% endfor %} +
{% trans "Main towns by surface" %}
{% trans "Town" %}{% trans "Total surface (m²)" %}
{{lbl}}{{nb}}
+ + +
+
+ +

{% trans "Excavation informations" %}

+ +
+ + + + + + {% for lbl, nb in dashboard.excavation.total %} + + + + {% endfor %} +
{% trans "Total" %}
{% trans "Status" %}{% trans "Number" %}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.excavation.by_year %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "By year" %}
{% trans "State" %}{{yr}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.realisation_years %}{% endfor %} + + {% for lbl, years in dashboard.excavation.by_realisation_year %} + + {%for nb in years %}{% endfor %} + + {% endfor %} +
{% trans "By realisation year" %}
{% trans "State" %}{{yr.year}}
{{lbl}}{{nb}}
+ +
+ + + + {% for lbl in dashboard.filters_label %}{%endfor%} + + + {% for nb in dashboard.excavation.area_realised %}{%endfor%} + + + {% for nb in dashboard.excavation.manday_realised %}{%endfor%} + + + {% for nb in dashboard.excavation.mandayhect_realised %}{%endfor%} + +
{% trans "Current realisation year" %}
{% trans "Status" %}{{lbl}}
{% trans "Area"%}{{nb}}
{% trans "Man-day"%}{{nb}}
{% trans "Man-day/hectare"%}{{nb}}
+ +

{% trans "Man-day/hectare for effective operations (current realisation year):" %} {{dashboard.excavation.mandayhect_real_effective}}

+ +
+ + + + + + {% for org in dashboard.excavation.org_realised %} + + + + {% endfor %} +
{% trans "Organizations (current realisation year)" %}
 {% trans "Area" %}{% trans "Man-day" %}{% trans "Man-day/hectare" %}
{{org.in_charge__attached_to__name}}{{org.area}}{{org.manday}}{{org.mandayhect}}
+ +
+ + + + {% for yr in dashboard.years%}{% endfor %} + + {% for org, vals in dashboard.excavation.org_by_year %} + + {% for area, cost in vals %}{% endfor %} + + {% endfor %} + + {% for area in dashboard.excavation.org_by_year_area_sum %}{% endfor %} + + + {% for area in dashboard.excavation.org_by_year_area_mean %}{% endfor %} + +
{% trans "Area by organization by year" %}
{% trans "Organization" %}{{yr}}
{{org}}{{area}}
{% trans "Sum" %}{{area}}
{% trans "Mean" %}{{area}}
+ +
+ + + + {% for yr in dashboard.years%}{% endfor %} + + {% for org, vals in dashboard.excavation.org_by_year %} + + {% for area, cost in vals %}{% endfor %} + + {% endfor %} + + {% for area in dashboard.excavation.org_by_year_area_sum %}{% endfor %} + + + {% for area in dashboard.excavation.org_by_year_area_mean %}{% endfor %} + +
{% trans "Area by organization by realisation year" %}
{% trans "Organization" %}{{yr}}
{{org}}{{area}}
{% trans "Sum" %}{{area}}
{% trans "Mean" %}{{area}}
+ +
+ + + + {%for mt in dashboard.last_months %}{% endfor %} + + {% for lbl, months in dashboard.excavation.by_month %} + + {%for nb in months %}{% endfor %} + + {% endfor %} +
{% trans "By month" %}
{% trans "State" %}{{mt.date|date:"F Y"|capfirst}}
{{lbl}}{{nb}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.excavation.by_dpt %} + + {%for nb in years %}{{nb}}{% endfor %} + + {% endfor %} +
{% trans "By department" %}
{% trans "Department" %}{{yr}}{% trans "Sum" %}
{{lbl}}
+ +
+ + + + {%for yr in dashboard.years %}{% endfor %} + + + {%for yr in dashboard.years %}{% endfor %} + + {% for lbl, years in dashboard.excavation.effective_by_dpt %} + + {%for nb, area, cost, fnap in years %}{{nb}}{{cost}}{{fnap}}{% endfor %} + + {% endfor %} +
{% trans "Effective operation by department" %}
{% trans "Department" %}{{yr}}{% trans "Sum" %}
{%trans "Nb."%}{%trans "Cost"%}{%trans "FNAP cost"%}{%trans "Nb."%}{%trans "Cost"%}{%trans "FNAP cost"%}
{{lbl}}
+ +
+ + + + + + {% for lbl, nb in dashboard.excavation.towns %} + + + + {% endfor %} +
{% trans "Main towns by number" %}
{% trans "Town" %}{% trans "Number" %}
{{lbl}}{{nb}}
+ +
+ + + + + + {% for lbl, nb in dashboard.excavation.towns_cost %} + + + + {% endfor %} +
{% trans "Main towns by cost" %}
{% trans "Town" %}{% trans "Cost (€)" %}
{{lbl}}{{nb}}
+ + +
+
+{% endblock %} diff --git a/ishtar_common/templates/form_snippet.html b/ishtar_common/templates/form_snippet.html new file mode 100644 index 000000000..2f841e078 --- /dev/null +++ b/ishtar_common/templates/form_snippet.html @@ -0,0 +1,13 @@ +{% load i18n %} + {% if form.non_field_errors %} + {{form.non_field_errors}} + {%endif%} + {% for field in form %}{% if not field.is_hidden %} + + {{ field.label_tag }} + {{ field.errors }}{{field|safe}}{% if field.help_text %} + ? + + +
{{field.help_text}}
+ {%endif%}{% else %}{{field}}{% endif %}{% endfor %} diff --git a/ishtar_common/templates/index.html b/ishtar_common/templates/index.html new file mode 100644 index 000000000..c4c0b0f2a --- /dev/null +++ b/ishtar_common/templates/index.html @@ -0,0 +1,2 @@ +{% extends "base.html" %} +{% load i18n %} diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html new file mode 100644 index 000000000..bd80e3967 --- /dev/null +++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} +{% load i18n %} +{% load range %} +{% block content %} +
{% csrf_token %} + +
+

{%if confirm_msg %}{{confirm_msg|safe}}{%else%}{% trans "You have entered the following informations:" %}{%endif%}

+ {% for form_label, form_data in datas %} + + + {% for label, data, cls in form_data %} + + {% endfor %} +
{{form_label}}
{{label}}{{data}}
+ {% endfor %} +{{wizard.management_form}} + {%if not wizard.form.is_hidden %} + + {{ wizard.form.as_table }} +
+ {%endif%} +

{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}

+ + {{ previous_fields|safe }} + +
+
+{% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html new file mode 100644 index 000000000..1996f4e46 --- /dev/null +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -0,0 +1,44 @@ +{% extends "base.html" %} +{% load i18n %} +{% load range %} +{% load table_form %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} +
{% csrf_token %} +
    +{% for step in previous_steps %} +
  • » 
    • +{% endfor %} +
  • » {{current_step.form_label}}
    • +{% for step in next_steps %} +
  • » 
    • +{% endfor %} +
+
+{% if reminder %}
{{ reminder }}
{%endif%} +{{ wizard.form.media }} +{{ wizard.management_form }} +{% if wizard.form.forms %} + {{ wizard.form.management_form }} +
+ + {%if wizard.form.non_form_errors%}{%endif%} + {% for formsetform in wizard.form.forms %} + {% table_form formsetform %} + {% endfor %} + +
{{wizard.form.non_form_errors}}
+{% else %} + +{% table_form wizard.form %} +
+{% endif %} + +{{ previous_fields|safe }} + +{% if next_steps %}{% endif %} +
+
+{% endblock %} diff --git a/ishtar_common/templates/registration/activate.html b/ishtar_common/templates/registration/activate.html new file mode 100644 index 000000000..0dcbccc00 --- /dev/null +++ b/ishtar_common/templates/registration/activate.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+{% if account %} + +

{% trans "Account successfully activated" %}

+ +

{% trans "Log in" %}

+ +{% else %} + +

{% trans "Account activation failed" %}

+ +{% endif %} +
+{% endblock %} diff --git a/ishtar_common/templates/registration/activation_email.txt b/ishtar_common/templates/registration/activation_email.txt new file mode 100644 index 000000000..b30035969 --- /dev/null +++ b/ishtar_common/templates/registration/activation_email.txt @@ -0,0 +1,6 @@ +{% load i18n %} +{% trans "Activate account at" %} {{ site.name }}: + +http://{{ site.domain }}{% url registration_activate activation_key %} + +{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} diff --git a/ishtar_common/templates/registration/activation_email_subject.txt b/ishtar_common/templates/registration/activation_email_subject.txt new file mode 100644 index 000000000..24f477cbb --- /dev/null +++ b/ishtar_common/templates/registration/activation_email_subject.txt @@ -0,0 +1 @@ +{% load i18n %}{% trans "Account activation on" %} {{ site.name }} diff --git a/ishtar_common/templates/registration/login.html b/ishtar_common/templates/registration/login.html new file mode 100644 index 000000000..ada4f6aa9 --- /dev/null +++ b/ishtar_common/templates/registration/login.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
{% csrf_token %} + + +{{ form.as_table }} + + +
{%trans "Log in"%}
+
+
+
+

{% trans "Forgot password?" %} {% trans "Reset it" %}

+

{% trans "Not member?" %} {% trans "Register" %}

+
+{% endblock %} diff --git a/ishtar_common/templates/registration/logout.html b/ishtar_common/templates/registration/logout.html new file mode 100644 index 000000000..029a0c25b --- /dev/null +++ b/ishtar_common/templates/registration/logout.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Logged out" %}

+
+{% endblock %} diff --git a/ishtar_common/templates/registration/password_change_done.html b/ishtar_common/templates/registration/password_change_done.html new file mode 100644 index 000000000..9d442360c --- /dev/null +++ b/ishtar_common/templates/registration/password_change_done.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Password changed" %}

+
+{% endblock %} diff --git a/ishtar_common/templates/registration/password_change_form.html b/ishtar_common/templates/registration/password_change_form.html new file mode 100644 index 000000000..84d915eaa --- /dev/null +++ b/ishtar_common/templates/registration/password_change_form.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
{% csrf_token %} + + {{ form.as_table }} + + +
+
+

+{% endblock %} diff --git a/ishtar_common/templates/registration/password_reset_complete.html b/ishtar_common/templates/registration/password_reset_complete.html new file mode 100644 index 000000000..dfa3ce682 --- /dev/null +++ b/ishtar_common/templates/registration/password_reset_complete.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Password reset successfully" %}

+ +

{% trans "Log in" %}

+
+{% endblock %} diff --git a/ishtar_common/templates/registration/password_reset_confirm.html b/ishtar_common/templates/registration/password_reset_confirm.html new file mode 100644 index 000000000..b0e2cc142 --- /dev/null +++ b/ishtar_common/templates/registration/password_reset_confirm.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} + +{% if validlink %} +
+
{% csrf_token %} + + {{ form.as_table }} + +
+
+
+{% else %} +
+

{% trans "Password reset failed" %}

+
+{% endif %} + +{% endblock %} diff --git a/ishtar_common/templates/registration/password_reset_done.html b/ishtar_common/templates/registration/password_reset_done.html new file mode 100644 index 000000000..cc7d9b40e --- /dev/null +++ b/ishtar_common/templates/registration/password_reset_done.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Email with password reset instructions has been sent." %}

+
+{% endblock %} diff --git a/ishtar_common/templates/registration/password_reset_email.html b/ishtar_common/templates/registration/password_reset_email.html new file mode 100644 index 000000000..a55c86958 --- /dev/null +++ b/ishtar_common/templates/registration/password_reset_email.html @@ -0,0 +1,5 @@ +{% load i18n %} +{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}: +{% block reset_link %} +{{ protocol }}://{{ domain }}{% url auth_password_reset_confirm uidb36=uid, token=token %} +{% endblock %} diff --git a/ishtar_common/templates/registration/password_reset_form.html b/ishtar_common/templates/registration/password_reset_form.html new file mode 100644 index 000000000..d6fad7a0a --- /dev/null +++ b/ishtar_common/templates/registration/password_reset_form.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
{% csrf_token %} + {% trans "Reset password" %} + + {{ form.as_table }} + + +
+
+
+{% endblock %} diff --git a/ishtar_common/templates/registration/registration_complete.html b/ishtar_common/templates/registration/registration_complete.html new file mode 100644 index 000000000..e9f487444 --- /dev/null +++ b/ishtar_common/templates/registration/registration_complete.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "You are now registered. Activation email sent." %}

+
+{% endblock %} diff --git a/ishtar_common/templates/registration/registration_form.html b/ishtar_common/templates/registration/registration_form.html new file mode 100644 index 000000000..b15f0e74b --- /dev/null +++ b/ishtar_common/templates/registration/registration_form.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
{% csrf_token %} + + + {{ form.as_table }} + +
{% trans "Register" %}
+
+
+{% endblock %} diff --git a/ishtar_common/templates/search.html b/ishtar_common/templates/search.html new file mode 100644 index 000000000..1b5829820 --- /dev/null +++ b/ishtar_common/templates/search.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} +{% load i18n %} +{% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} + +
+{% if form.forms %} +
+ + {%if form.non_form_errors%}{%endif%} + {{ form.management_form }} + {% for formsetform in form.forms %} + {{ formsetform.as_table }} + {% endfor %} + +
{{form.non_form_errors}}
+{% else %} + + {{ form.as_table }} +
+{% endif %} +
+{% endblock %} diff --git a/ishtar_common/templates/sheet.html b/ishtar_common/templates/sheet.html new file mode 100644 index 000000000..5608a684f --- /dev/null +++ b/ishtar_common/templates/sheet.html @@ -0,0 +1,30 @@ +{% load i18n %} +{% block main_head %} + + + + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} + + {% block css_head %} + + {% endblock %} + + +{% endblock %} +
+{% block head_sheet %} + +
+{% trans "Close" %} - + +{% trans "Close all windows" %} +
{% endblock %} +
+{% block content %}{% endblock %} +
+
+{%block main_foot%} + + +{%endblock%} diff --git a/ishtar_common/templates/sheet_contextrecord.html b/ishtar_common/templates/sheet_contextrecord.html new file mode 100644 index 000000000..c2b94bafe --- /dev/null +++ b/ishtar_common/templates/sheet_contextrecord.html @@ -0,0 +1,135 @@ +{% extends "sheet.html" %} +{% load i18n %} +{% block content %} +
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+ +

{% trans "Context Record"%}

+ +{% if item.operation.code_patriarche %} +

+{% else %} +

+

+{%endif%} +{{item.full_label}}

+{%if item.unit %} +

{{ item.unit }}

+{%endif%} +

{{ item.datings.all|join:", " }}

+

{{ item.parcel.town }}

+

{{ item.parcel.short_label }}

+ +{% if item.description or item.lenght or item.width or item.depth %} +

{% trans "Description"%}

+ +

{{ item.description }}

+{% if item.lenght %}

{{ item.length }}

{%endif%} +{% if item.width %}

{{ item.width }}

{%endif%} +{% if item.depth %}

{{ item.depth }}

{%endif%} +{% endif %} + +{% if item.activity or item.identification or item.interpretation %} +

{% trans "Interpretation"%}

+ +{% if item.activity %}

{{ item.activity }}

{%endif%} +{% if item.identification %}

{{ item.identification }}

{%endif%} +{% if item.interpretation %}

{{ item.interpretation }}

{%endif%} +{% endif %} + +{% if item.taq or item.taq_estimated or item.tpq or item.tpq_estimated %} +

{% trans "Datations"%}

+{% if item.taq %}

{{ item.taq }}

{%endif%} +{% if item.taq_estimated %}

{{ item.taq_estimated }}

{%endif%} +{% if item.tpq %}

{{ item.tpq }}

{%endif%} +{% if item.tpq_estimated %}

{{ item.tpq_estimated }}

{%endif%} +{%endif%} + +{% if item.operation %} +

{% trans "Operation resume"%}

+

{{ item.operation.year }}

+

{{ item.operation.operation_code }}

+{% if item.operation.code_patriarche %} +

+{{ item.operation.code_patriarche }}

+{% else %}

+{%endif%} +{#

{{ item.operation.internal_reference }}

#} +

+{{ item.operation.in_charge.full_label }}

+

+{% if item.operation.is_active %} +{%trans "Active file"%}

+{% else %} +{%trans "Closed operation"%}

+

{{ item.operation.closing.date }} +{%trans "by" %} {{ item.operation.closing.user }}

+{% endif %} +

{{ item.operation.operation_type }}

+

{{ item.operation.remains.all|join:", " }}

+

{{ item.operation.periods.all|join:", " }}

+{% if item.operation.comment %}

{{ item.operation.comment }}

{%endif%} +

{% trans "Localisation"%}

+

{{ item.operation.towns.all|join:", " }}

+

+{{ item.operation }}

+{# TODO: Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related operation #} +{% else %}

+{% endif %} + + + + + + + + {##} + + {% for doc in item.source.all %} + + + + + {##} + + {% empty %} + + {% endfor %} +
{%trans "Documents"%}
{% trans "Title" %}{% trans "Type" %}{% trans "Authors" %}{% trans "Localisation" %}
{{ doc.title }}{{doc.source_type}}{{ doc.authors.all|join:", " }}{{ doc.localisation }}
{% trans "No document associated to this context record" %}
+ + + + + + + + + + + + + + + {% for find in item.base_items.all %} + + +{# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #} +{# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #} + +{# Displayed as (Patriarche operation code)-(Record unit label)-(material code)-(Finds label indexed by material type). #} +{# or displayed as (Year)-(index)-(Record unit label)-(material code)-(Finds label indexed by material type) #} + + + {# TODO .all|join:", " ? #} + + + + + + {#{%trans "Details"%}#} + + {% empty %} + + {% endfor %} +
{%trans "Finds"%}
{% trans "Find" %}{% trans "Material type" %}{% trans "Context record" %}{% trans "Periods" %}{% trans "Description" %}{% trans "Weight" %}{% trans "Numbers" %}{% trans "Parcel" %} 
{{ find.full_label }}{{ find.material_type_label }}{{find.context_record}}{{ find.get_last_item.dating}}{{ find.get_last_item.description }}{{ find.get_last_item.weight }}{{ find.get_last_item.item_number }}{{ item.context_record.parcel.short_label }}{% trans "Details" %}
{% trans "No find associated to this context record" %}
+ +{% endblock %} diff --git a/ishtar_common/templates/sheet_contextrecord_window.html b/ishtar_common/templates/sheet_contextrecord_window.html new file mode 100644 index 000000000..7ff65d1e7 --- /dev/null +++ b/ishtar_common/templates/sheet_contextrecord_window.html @@ -0,0 +1,3 @@ +{% extends "sheet_contextrecord.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/ishtar_common/templates/sheet_file.html b/ishtar_common/templates/sheet_file.html new file mode 100644 index 000000000..88ef1b3a2 --- /dev/null +++ b/ishtar_common/templates/sheet_file.html @@ -0,0 +1,132 @@ +{% extends "sheet.html" %} +{% load i18n %} +{% block content %} +{% if previous or next %} +
+{%if previous%} +{%trans "Previous version"%} ({{previous}}) +{% endif %} +{% if previous and next %} - {% endif %} +{%if next%} +Rollback - +{%trans "Next version"%} ({{next}}) +{% endif %} +
+{% endif %} +
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+

{% trans "General"%}

+

{{ item.year }}

+

{{ item.numeric_reference }}

+ +

{{ item.internal_reference }}

+ +

{{ item.history_date }}

+{% if item.reception_date %}

{{ item.reception_date }}

{% endif %} +

{{ item.creation_date }}

+{% comment %} +{% if item.deadline_date and not item.acts %} +

{% item.deadline_date %}

+{% endif %} +{% endcomment %} + +

{{ item.in_charge.full_label }}

+

{% if item.is_active %}{%trans "Active file"%}

+{% else %}{%trans "Closed file"%}

+

{{ item.closing.date }} {%trans "by" %} {{ item.closing.user }}

+{% endif %} + +

{{ item.file_type }}

+ +{% if item.related_file %}

{{ item.related_file }}

{% endif %} +{% if item.comment %}

{{ item.comment }}

{%endif%} + +

{% trans "Localisation"%}

+

{{ item.towns.all|join:", " }}

+ +

{{ item.address }}

+{% if item.address_complement %}

{{ item.address_complement }}

{%endif%} +{% if item.postal_code %}

{{ item.postal_code }}

{%endif%} + +

{% if item.total_surface %} {{ item.total_surface }} m2 ({{ item.total_surface_ha }} ha){%endif%}

+ + + +{% if item.is_preventive %} +

{% trans "Preventive archaelogical file"%}

+

{{ item.total_developed_surface }} m2 ({{ item.total_developed_surface_ha }} ha)

+

{{ item.saisine_type }}

+{% if item.town_planning_service %}

{{ item.town_planning_service }}

{% endif %} +{% if item.permit_type %}

{{ item.permit_type }}

{% endif %} +{% if item.permit_reference %}

{{ item.permit_reference }}

{% endif %} +{% if item.general_contractor.attached_to %}

{{ item.general_contractor.attached_to }}

{% endif %} +{% if item.general_contractor %}

{{ item.general_contractor.full_label }}

{% endif %} +{% endif %} + + + + + + + + + + {% for act in item.administrative_act.all %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Admninistrative acts"%}
{% trans "Year" %}{% trans "Reference" %}{% trans "Type" %}{% trans "Date" %}
{{act.signature_date.year}}{{act.ref_sra}}{{act.act_type}}{{act.signature_date}}
{% trans "No administrative act associated to this archaelogical file" %}
+ + + + + + + + + + + + + + {% for operation in item.operations.all %} + + + + + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Associated operations"%}
{% trans "Year" %}{% trans "Reference" %}Code Patriarche{% trans "Type" %}{% trans "In charge" %}{% trans "Start date" %}{% trans "Excavation end date" %} 
{{operation.year}}{{operation.operation_code}}{{operation.code_patriarche|default:""}}{{operation.operation_type}}{{operation.in_charge|default:""}}{{operation.start_date|default:""}}{{operation.excavation_end_date|default:""}}{% trans "Details" %}
{% trans "No operation associated to this archaelogical file" %}
+ + + + + + + + + + {% for act in item.operation_acts %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Admninistrative acts linked to associated operations"%}
{% trans "Year" %}{% trans "Reference" %}{% trans "Type" %}{% trans "Date" %}
{{act.signature_date.year}}{{act.ref_sra}}{{act.act_type}}{{act.signature_date}}
{% trans "No administrative act linked to operations" %}
+{% endblock %} diff --git a/ishtar_common/templates/sheet_file_pdf.html b/ishtar_common/templates/sheet_file_pdf.html new file mode 100644 index 000000000..3c77c75f8 --- /dev/null +++ b/ishtar_common/templates/sheet_file_pdf.html @@ -0,0 +1,18 @@ +{% extends "sheet_file.html" %} +{% block css_head %} + +{% endblock %} +{% block main_head %} +{{ block.super }} +
+Ishtar – {{APP_NAME}} – {{item}} +
+{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +
+– – +
+ + +{%endblock%} diff --git a/ishtar_common/templates/sheet_file_window.html b/ishtar_common/templates/sheet_file_window.html new file mode 100644 index 000000000..e9debdd0d --- /dev/null +++ b/ishtar_common/templates/sheet_file_window.html @@ -0,0 +1,3 @@ +{% extends "sheet_file.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/ishtar_common/templates/sheet_ope.html b/ishtar_common/templates/sheet_ope.html new file mode 100644 index 000000000..dbe3297b3 --- /dev/null +++ b/ishtar_common/templates/sheet_ope.html @@ -0,0 +1,146 @@ +{% extends "sheet.html" %} +{% load i18n %} +{% block content %} +
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+

{% trans "General"%}

+

{{ item.year }}

+

{{ item.numeric_reference }}

+ +{% if item.patriarche_code %}

{{ item.patriarche_code }}

{%endif%} +{% if item.patriarche_code_not_recorded %}

{%endif%} + +

{{ item.internal_reference }}

+ +

{{ item.history.all.0.history_date }}

+ +

{{ item.begin_date }}

+

{{ item.end_date }}

+ +

{{ item.head_scientist.full_label }}

+

{% if item.is_active %}{%trans "Active file"%}

+{% else %}{%trans "Closed operation"%}

+

{{ item.closing.date }} {%trans "by" %} {{ item.closing.user }}

+{% endif %} +

{{ item.operation_type }}

+

{{ item.total_surface }} m2 ({{ item.total_surface_ha }} ha)

+

{{ item.cost }} Euros, ({{ item.cost_by_m2 }} Euros/m2)

+

{{ item.duration }} {%trans "Day"%}s

+ +

{{ item.remains.all|join:", " }}

+

{{ item.periods.all|join:", " }}

+ +{% if item.related_file %} +

{{ item.related_file }}

+{% if item.related_file.is_preventive %} +{% if item.operator_reference_code %}

{{ item.operator_reference_code }}

{% endif %} +{% if item.related_file.town_planning_service %}

{{ item.related_file.town_planning_service }}

{% endif %} +{% if item.related_file.permit_type %}

{{ item.related_file.permit_type }}

{% endif %} +{% if item.related_file.permit_reference %}

{{ item.related_file.permit_reference }}

{% endif %} +{% if item.related_file.general_contractor.attached_to %}

{{ item.related_file.general_contractor.attached_to }}

{% endif %} +{% if item.related_file.general_contractor %}

{{ item.related_file.general_contractor.full_label }}

{% endif %} +{% endif %} +{% endif %} + +{% if item.comment %}

{{ item.comment }}

{%endif%} + +

{% trans "Localisation"%}

+

{{ item.towns.all|join:", " }}

+ +

{{ item.address }}

+{% if item.address_complement %}

{{ item.address_complement }}

{%endif%} +{% if item.postal_code %}

{{ item.postal_code }}

{%endif%} + +

{{ item.lambert_x }}

+

{{ item.lambert_y }}

+

{{ item.altitude }}

+ + + + + + + + + + + {% for parcels in item.parcel.all %} + + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Associated parcels"%}
{% trans "Commune" %}{% trans "Year" %}{% trans "Section" %}{% trans "Parcel" %}{% trans "Owner" %}
{{operation.commune}}{{operation.year}}{{operation.section}}{{operation.parcel}}{{operation.parcel.owner}}
{% trans "No parcel associated to this operation" %}
+ +

{% trans "Admninistrative acts"%}

+ + + + + + + + + {% for act in item.administrative_act.all %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Admninistrative acts"%}
{% trans "Year" %}{% trans "Reference" %}{% trans "Type" %}{% trans "Date" %}
{{act.signature_date.year}}{{act.ref_sra}}{{act.act_type}}{{act.signature_date}}
{% trans "No administrative act associated to this operation" %}
+ +

{% trans "Documentation"%}

+ + + + + + + + + {% for doc in item.doc.all %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Documents"%}
{% trans "Title" %}{% trans "Type" %}{% trans "Authors" %}{% trans "Localisation" %}
{{ doc.title }}{{doc.type}}{{ doc.author.all|join:", " }}{{ doc.localisation }}
{% trans "No document associated to this operation" %}
+ +

{% trans "Recording Units"%}

+ + + + + + + + + + + {% for record_unit in item.record_unit.all %} + + + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Recording Units"%}
{% trans "ID" %}{% trans "Type" %}{% trans "Chronology" %}{% trans "Description" %}{% trans "Parcel" %} 
{{ record_unit.label }}{{record_unit.unit_type}}{{ record_unit.period.all|join:", " }}{{ record_unit.description }}{{ record_unit.section_and_parcel }}{% trans "Details" %}
{% trans "No recording unit associated to this operation" %}
+ +{% endblock %} diff --git a/ishtar_common/templates/sheet_ope_modif.html b/ishtar_common/templates/sheet_ope_modif.html new file mode 100644 index 000000000..cc3a4492e --- /dev/null +++ b/ishtar_common/templates/sheet_ope_modif.html @@ -0,0 +1,182 @@ +{% extends "sheet.html" %} +{% load i18n %} +{% block content %} +
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+

{% trans "General"%}

+

{{ item.year }}

+

{{ item.numeric_reference }}

+ +{% if item.patriarche_code %}

{{ item.patriarche_code }}

{%endif%} +{% if item.patriarche_code_not_recorded %}

{%endif%} + +

{{ item.internal_reference }}

+ +

{{ item.history.all.0.history_date }}

+ +

{{ item.begin_date }}

+

{{ item.end_date }}

+ +

{{ item.head_scientist.full_label }}

+

{% if item.is_active %}{%trans "Active file"%}

+{% else %}{%trans "Closed operation"%}

+

{{ item.closing.date }} {%trans "by" %} {{ item.closing.user }}

+{% endif %} +

{{ item.operation_type }}

+

{{ item.total_surface }} m2 ({{ item.total_surface_ha }} ha)

+

{{ item.cost }} Euros, ({{ item.cost_by_m2 }} Euros/m2)

+

{{ item.duration }} {%trans "Day"%}s

+ +

{{ item.remains.all|join:", " }}

+

{{ item.periods.all|join:", " }}

+ +{% if item.related_file %} +

{{ item.related_file }}

+{% if item.related_file.is_preventive %} +{% if item.operator_reference_code %}

{{ item.operator_reference_code }}

{% endif %} +{% if item.related_file.town_planning_service %}

{{ item.related_file.town_planning_service }}

{% endif %} +{% if item.related_file.permit_type %}

{{ item.related_file.permit_type }}

{% endif %} +{% if item.related_file.permit_reference %}

{{ item.related_file.permit_reference }}

{% endif %} +{% if item.related_file.general_contractor.attached_to %}

{{ item.related_file.general_contractor.attached_to }}

{% endif %} +{% if item.related_file.general_contractor %}

{{ item.related_file.general_contractor.full_label }}

{% endif %} +{% endif %} +{% endif %} + +{% if item.comment %}

{{ item.comment }}

{%endif%} + +

{% trans "Localisation"%}

+

{{ item.towns.all|join:", " }}

+ +

{{ item.address }}

+{% if item.address_complement %}

{{ item.address_complement }}

{%endif%} +{% if item.postal_code %}

{{ item.postal_code }}

{%endif%} + +

{{ item.lambert_x }}

+

{{ item.lambert_y }}

+

{{ item.altitude }}

+ + + + + + + + + + + {% for parcels in item.parcel.all %} + + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Associated parcels"%}
{% trans "Commune" %}{% trans "Year" %}{% trans "Section" %}{% trans "Parcel" %}{% trans "Owner" %}
{{operation.commune}}{{operation.year}}{{operation.section}}{{operation.parcel}}{{operation.parcel.owner}}
{% trans "No parcel associated to this operation" %}
+ +

{% trans "Admninistrative acts"%}

+ + + + + + + + + {% for act in item.administrative_act.all %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Admninistrative acts"%}
{% trans "Year" %}{% trans "Reference" %}{% trans "Type" %}{% trans "Date" %}
{{act.signature_date.year}}{{act.ref_sra}}{{act.act_type}}{{act.signature_date}}
{% trans "No administrative act associated to this operation" %}
+ +

{% trans "Documentation"%}

+ + + + + + + + + {% for doc in item.doc.all %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Documents"%}
{% trans "Title" %}{% trans "Type" %}{% trans "Authors" %}{% trans "Localisation" %}
{{ doc.title }}{{doc.type}}{{ doc.author.all|join:", " }}{{ doc.localisation }}
{% trans "No document associated to this operation" %}
+ +

{% trans "Recording Units"%}

+ + + + + + + + + + + {% for record_unit in item.record_unit.all %} + + + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Recording Units"%}
{% trans "ID" %}{% trans "Type" %}{% trans "Chronology" %}{% trans "Description" %}{% trans "Parcel" %} 
{{ record_unit.label }}{{record_unit.unit_type}}{{ record_unit.period.all|join:", " }}{{ record_unit.description }}{{ record_unit.section_and_parcel }}{% trans "Details" %}
{% trans "No recording unit associated to this operation" %}
+ +

{% trans "Finds"%}

+ + + + + + + + + + + + + + {% for find in item.find.all %} + + + {% if item.patriarche_code %}{%endif%} + {% if item.patriarche_code_not_recorded %}{%endif%} + + {% if item.patriarche_code %}{%endif%} + {% if item.patriarche_code_not_recorded %}{%endif%} + + + + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Finds"%}
{% trans "Find_complete_Label" %}{% trans "Find_complete_material_type_Label" %}{% trans "Context_record" %}{% trans "Periods" %}{% trans "Description" %}{% trans "Weight" %}{% trans "Numbers" %}{% trans "Parcel" %} 
{% trans "find.complete_label" %}{% trans "find.not_patriarche_complete_label" %}{% trans "find.material_type_complete_label" %}{% trans "find.material_type_not_patriarche_complete_label" %}{{find.context_record}}{{ find.period.all|join:", " }}{{ find.description }}{{ find.weight }}{{ find.numbers }}{{ find.record_unit.section_and_parcel }}{% trans "Details" %}
{% trans "No find associated to this operation" %}
+ +{% endblock %} diff --git a/ishtar_common/templates/sheet_operation.html b/ishtar_common/templates/sheet_operation.html new file mode 100644 index 000000000..aa571d20c --- /dev/null +++ b/ishtar_common/templates/sheet_operation.html @@ -0,0 +1,183 @@ +{% extends "sheet.html" %} +{% load i18n %} +{% block content %} +
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+

{% trans "General"%}

+

{{ item.year }}

+

{{ item.operation_code }}

+ +{% if item.code_patriarche %}

{{ item.code_patriarche }}

{%else%} +

{%trans "Patriarche OA code not yet recorded!"%}

{%endif%} + +{#

{{ item.internal_reference }}

#} + +

{{ item.history.all.0.history_date }}

+ +{% if item.start_date %}

{{ item.start_date }}

+

{{ item.excavation_end_date|default:"-" }}

+{%endif%} +{% if item.in_charge %}

{{ item.in_charge.full_label }}

{%endif%} +

{% if item.is_active %}{%trans "Active file"%}

+{% else %}{%trans "Closed operation"%}

+

{{ item.closing.date }} {%trans "by" %} {{ item.closing.user }}

+{% endif %} +

{{ item.operation_type }}

+{% if item.surface %}

{{ item.surface }} m2 ({{ item.surface_ha }} ha)

{% endif %} +{% if item.cost %}

{{ item.cost }} €{% if item.cost_by_m2 %}, ({{ item.cost_by_m2 }} €/m2){%endif%}

{%endif%} +{% if item.duration %}

{{ item.duration }} {%trans "Day"%}s

{%endif%} + +

{{ item.remains.all|join:", " }}

+

{{ item.periods.all|join:", " }}

+ +{% if item.associated_file %} +

{{ item.associated_file }}

+{% if item.associated_file.is_preventive %} +{#{% if item.operator_reference_code %}

{{ item.operator_reference_code }}

{% endif %}#} +{% if item.associated_file.town_planning_service %}

{{ item.associated_file.town_planning_service }}

{% endif %} +{% if item.associated_file.permit_type %}

{{ item.associated_file.permit_type }}

{% endif %} +{% if item.associated_file.permit_reference %}

{{ item.associated_file.permit_reference }}

{% endif %} +{% if item.associated_file.general_contractor.attached_to %}

{{ item.associated_file.general_contractor.attached_to }}

{% endif %} +{% if item.associated_file.general_contractor %}

{{ item.associated_file.general_contractor.full_label }}

{% endif %} +{% endif %} +{% endif %} + +{% if item.comment %}

{{ item.comment }}

{%endif%} + +

{% trans "Localisation"%}

+

{{ item.towns.all|join:", " }}

+ +

{{ item.associated_file.address }}

+{% if item.associated_file.address_complement %}

{{ item.associated_file.address_complement }}

{%endif%} +{% if item.associated_file.postal_code %}

{{ item.associated_file.postal_code }}

{%endif%} + +{% comment %} +

{{ item.lambert_x }}

+

{{ item.lambert_y }}

+

{{ item.altitude }}

+{% endcomment %} + + + + + + + + {##} + + {% for parcel in item.parcels.all %} + + + + + + {##} + + {% empty %} + + {% endfor %} +
{%trans "Associated parcels"%}
{% trans "Commune" %}{% trans "Year" %}{% trans "Section" %}{% trans "Parcel" %}{% trans "Owner" %}
{{parcel.town}}{{parcel.year}}{{parcel.section}}{{parcel.parcel_number}}{{operation.parcel.owner}}
{% trans "No parcel associated to this operation" %}
+ + + + + + + + + + {% for act in item.administrative_act.all %} + + + + + + + {% empty %} + + {% endfor %} +
{%trans "Admninistrative acts"%}
{% trans "Year" %}{% trans "Reference" %}{% trans "Type" %}{% trans "Date" %}
{{act.signature_date.year}}{{act.ref_sra}}{{act.act_type}}{{act.signature_date}}
{% trans "No acts associated to this operation" %}
+ +

{% trans "Scientific documentation"%}

+ + + + + + + {##} + + {% for doc in item.source.all %} + + + + + {##} + + {% empty %} + + {% endfor %} +
{%trans "Documents"%}
{% trans "Title" %}{% trans "Type" %}{% trans "Authors" %}{% trans "Localisation" %}
{{ doc.title }}{{doc.source_type}}{{ doc.authors.all|join:", " }}{{ doc.localisation }}
{% trans "No scientific document associated to this operation" %}
+ + + + + + + + + + + + {% for context_record in item.context_record.all %} + + + + {# periods ?#} + + + + + {% empty %} + + {% endfor %} +
{%trans "Context records"%}
{% trans "ID" %}{% trans "Type" %}{% trans "Chronology" %}{% trans "Description" %}{% trans "Parcel" %} 
{{ context_record.label }}{{context_record.unit|default:""}}{{ context_record.datings.all|join:", " }}{{ context_record.description }}{{ context_record.parcel.section }} - {{context_record.parcel.parcel_number}}{% trans "Details" %}
{% trans "No context record associated to this operation" %}
+
+ + + + + + + + + + + + + + {% for context_record in item.context_record.all %} + {% for find in context_record.base_items.all %} + + +{# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #} +{# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #} + + + {# TODO .all|join:", " ? #} + + + + + + {#{%trans "Details"%}#} + + {% empty %} + + {% endfor %} + {% empty %} + + {% endfor %} +
{%trans "Finds"%}
{% trans "Find" %}{% trans "Material type" %}{% trans "Context record" %}{% trans "Periods" %}{% trans "Description" %}{% trans "Weight" %}{% trans "Numbers" %}{% trans "Parcel" %} 
{{ find.full_label }}{{ find.material_type_label }}{{find.context_record.label}}{{ find.get_last_item.dating}}{{ find.get_last_item.description }}{{ find.get_last_item.weight }}{{ find.get_last_item.item_number }}{{ context_record.parcel.short_label }}{% trans "Details" %}
{% trans "No find associated to context record" %} {{context_record.short_label}}
{% trans "No find associated to parcel" %} {{parcel.short_label}} {% trans "(no context record)" %}
+
+ +{% endblock %} diff --git a/ishtar_common/templates/sheet_operation_pdf.html b/ishtar_common/templates/sheet_operation_pdf.html new file mode 100644 index 000000000..3397d5f43 --- /dev/null +++ b/ishtar_common/templates/sheet_operation_pdf.html @@ -0,0 +1,18 @@ +{% extends "sheet_operation.html" %} +{% block css_head %} + +{% endblock %} +{% block main_head %} +{{ block.super }} +
+Ishtar – {{APP_NAME}} – {{item}} +
+{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +
+– – +
+ + +{%endblock%} diff --git a/ishtar_common/templates/sheet_operation_window.html b/ishtar_common/templates/sheet_operation_window.html new file mode 100644 index 000000000..9c595a1e9 --- /dev/null +++ b/ishtar_common/templates/sheet_operation_window.html @@ -0,0 +1,3 @@ +{% extends "sheet_operation.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/ishtar_common/templates/towns_wizard.html b/ishtar_common/templates/towns_wizard.html new file mode 100644 index 000000000..115ac9838 --- /dev/null +++ b/ishtar_common/templates/towns_wizard.html @@ -0,0 +1,40 @@ +{% extends "default_wizard.html" %} +{% load i18n %} +{% load range %} +{% block extra_head %} +{{form.media}} +{% endblock %} +{% block content %} +
{% csrf_token %} + +
+{% if extra_context.TOWNS %} +{% if form.forms %} +
+ + {%if form.non_form_errors%}{%endif%} + {{ form.management_form }} + {% for formsetform in form.forms %} + {{ formsetform.as_table }} + {% endfor %} + +
{{form.non_form_errors}}
+{% else %} + + {{ form.as_table }} +
+{% endif %} +{% else %} +

{% trans "No town set in the associated file." %}

+{% endif %} + +{{ previous_fields|safe }} + +
+
+{% endblock %} diff --git a/ishtar_common/templates/window.html b/ishtar_common/templates/window.html new file mode 100644 index 000000000..a92f859ab --- /dev/null +++ b/ishtar_common/templates/window.html @@ -0,0 +1,45 @@ +{% load i18n %} + + + + + + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} + + + + + + + + + {% block extra_head %} + {% endblock %} + + +{% if new_item_label %} + +{% endif %} +
+

{{title}}

+
{% csrf_token %} + + {% for field in form %} + + + + {% endfor %} + +
{{ field.errors }}{{field|safe}}
+
+
+ +
+ + + diff --git a/ishtar_common/templates/wizard_closing_done.html b/ishtar_common/templates/wizard_closing_done.html new file mode 100644 index 000000000..54990a629 --- /dev/null +++ b/ishtar_common/templates/wizard_closing_done.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% load i18n %} +{% block content %} +

{%trans "Item successfully closed"%}

+
+{% endblock %} diff --git a/ishtar_common/templates/wizard_delete_done.html b/ishtar_common/templates/wizard_delete_done.html new file mode 100644 index 000000000..854341aa3 --- /dev/null +++ b/ishtar_common/templates/wizard_delete_done.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% load i18n %} +{% block content %} +

{%trans "Item successfully deleted"%}

+ +{% endblock %} diff --git a/ishtar_common/templates/wizard_done.html b/ishtar_common/templates/wizard_done.html new file mode 100644 index 000000000..a7068bbab --- /dev/null +++ b/ishtar_common/templates/wizard_done.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% load i18n %} +{% block content %} +

{%trans "Item successfully saved"%}

+ +{% endblock %} diff --git a/ishtar_common/templates/wizard_done_summary.html b/ishtar_common/templates/wizard_done_summary.html new file mode 100644 index 000000000..53650dafe --- /dev/null +++ b/ishtar_common/templates/wizard_done_summary.html @@ -0,0 +1,18 @@ +{% extends "wizard_done.html" %} +{% load i18n %} +{% block content %} + +
+

{% trans "You have entered the following informations:" %}

+ {% for form_label, form_data in datas %} + + + {% for label, data, cls in form_data %} + + {% endfor %} +
{{form_label}}
{{label}}{{data}}
+ {% endfor %} +

{% trans {%trans "Item successfully saved"%} %}

+
+ +{% endblock %} diff --git a/ishtar_common/templates/wizard_done_summary_2.html b/ishtar_common/templates/wizard_done_summary_2.html new file mode 100644 index 000000000..66a572542 --- /dev/null +++ b/ishtar_common/templates/wizard_done_summary_2.html @@ -0,0 +1,23 @@ +{% extends "wizard_done.html" %} +{% load i18n %} +{% block content %} + +
+

{% trans {%trans "Item successfully saved"%} %}

+

{% trans "You have saved the following informations:" %}

+

{% trans {%trans "The file must be processed before :"%} %} {% calculated_deadline %}

+

{% trans {%trans "The person in charge is : "%} %} {% responsible %}

+

{% trans {%trans "The internal reference of this file is :"%} %} {% Year %} - {% ref_index %} [{% ref_string %}]

+ + {% for form_label, form_data in datas %} + + + {% for label, data, cls in form_data %} + + {% endfor %} +
{{form_label}}
{{label}}{{data}}
+ {% endfor %} + +
+ +{% endblock %} diff --git a/ishtar_common/templates/wizard_list_search_result.html b/ishtar_common/templates/wizard_list_search_result.html new file mode 100644 index 000000000..6cbafb930 --- /dev/null +++ b/ishtar_common/templates/wizard_list_search_result.html @@ -0,0 +1,25 @@ +{% extends "wizard_done.html" %} +{% load i18n %} +{% block content %} + +
+

{% trans {%trans "PLease note that the file must be processed before :"%} %} {% calculated_deadline %}

+ +

{% trans {%trans "Item successfully saved"%} %}

+

{% trans "You have saved the following informations:" %}

+ +

{% trans {%trans "The person in charge is : "%} %} {% responsible %}

+

{% trans {%trans "The internal reference of this file is :"%} %} {% Year %} - {% ref_index %} [{% ref_string %}]

+ + {% for form_label, form_data in datas %} + + + {% for label, data, cls in form_data %} + + {% endfor %} +
{{form_label}}
{{label}}{{data}}
+ {% endfor %} + +
+ +{% endblock %} -- cgit v1.2.3