From 89a89e9c1dcc072d2d435d57d4eb1761b94099c7 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 7 Jul 2016 20:28:33 +0200 Subject: Switch to font-awesome for icons --- ishtar_common/templates/ishtar/basket_list.html | 2 +- .../ishtar/dashboards/dashboard_main_detail.html | 6 ++--- ishtar_common/templates/ishtar/manage_basket.html | 2 +- ishtar_common/templates/ishtar/merge.html | 2 +- .../templates/ishtar/merge_organization.html | 4 ++-- ishtar_common/templates/ishtar/merge_person.html | 4 ++-- ishtar_common/templates/ishtar/sheet.html | 4 ++-- .../templates/ishtar/sheet_organization.html | 2 +- .../templates/ishtar/wizard/parcels_wizard.html | 2 +- .../templates/ishtar/wizard/towns_wizard.html | 2 +- .../wizard/wizard_organization_deletion.html | 8 +++---- .../ishtar/wizard/wizard_person_deletion.html | 26 +++++++++++----------- 12 files changed, 32 insertions(+), 32 deletions(-) (limited to 'ishtar_common/templates/ishtar') diff --git a/ishtar_common/templates/ishtar/basket_list.html b/ishtar_common/templates/ishtar/basket_list.html index a0a0e5d73..011ed97a0 100644 --- a/ishtar_common/templates/ishtar/basket_list.html +++ b/ishtar_common/templates/ishtar/basket_list.html @@ -1,7 +1,7 @@ {% load i18n %} {% for item in basket.items.all %} - + {% endfor %}
{% trans 'Details' %} {{item.full_label}} {% trans "remove" %}
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index d7ea16d90..ff6234764 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -16,12 +16,12 @@

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

-

{% trans 'Draw rectangle on the graph to zoom. Double-click to reinitialize.' %}

+

{% trans 'Draw rectangle on the graph to zoom. Double-click to reinitialize.' %}

-

{% trans 'Right-click on this image to save it.' %}

+

{% trans 'Right-click on this image to save it.' %}

@@ -105,7 +105,7 @@ if (typeof values_1_{{unique_id}} === 'undefined' || values_1_{{unique_id}}.length == 0){ $('#chart_img_{{unique_id}}').hide(); -$('#chart_{{unique_id}}').html("

{% trans 'No data for these criteria.' %}

"); +$('#chart_{{unique_id}}').html("

{% trans 'No data for these criteria.' %}

"); } else { var showmarker = false; diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html index 6332b326e..64793c46d 100644 --- a/ishtar_common/templates/ishtar/manage_basket.html +++ b/ishtar_common/templates/ishtar/manage_basket.html @@ -4,7 +4,7 @@

{{page_name}}{% trans ":"%} {{basket}}

{% csrf_token %}
-

{% trans 'Checking "Select all" only select the current page.' %}

+

{% trans 'Checking "Select all" only select the current page.' %}

{{form}}

{% trans "Basket content" %}

diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html index edd27a722..0e15da62a 100644 --- a/ishtar_common/templates/ishtar/merge.html +++ b/ishtar_common/templates/ishtar/merge.html @@ -4,7 +4,7 @@ {% block content %}

{% trans "Merge" %}

-

+

{% if previous_page %}↞←{% else %} {% endif %} {% trans "Page " %}{{current_page}}/{{max_page}} {% if next_page %}→↠{% else %} {% endif %}

diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html index e4ca430a1..87eab7d53 100644 --- a/ishtar_common/templates/ishtar/merge_organization.html +++ b/ishtar_common/templates/ishtar/merge_organization.html @@ -4,14 +4,14 @@ {% if form.non_field_errors %}{% for error in form.non_field_errors %}{{error}} {% endfor%}{% endif %} - Détails + {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})
{{form.instance.from_organization.address_lbl|linebreaksbr}} - Détails + {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html index f677a5cf3..4e76c804b 100644 --- a/ishtar_common/templates/ishtar/merge_person.html +++ b/ishtar_common/templates/ishtar/merge_person.html @@ -4,14 +4,14 @@ {% if form.non_field_errors %}{% for error in form.non_field_errors %}{{error}} {% endfor%}{% endif %} - Détails + {{form.instance.from_person}} ({{form.instance.from_person.pk}})
{{form.instance.from_person.address_lbl|linebreaksbr}} - Détails + {{form.instance.to_person}} ({{form.instance.to_person.pk}})
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html index 714bfa762..5cb75ea3a 100644 --- a/ishtar_common/templates/ishtar/sheet.html +++ b/ishtar_common/templates/ishtar/sheet.html @@ -18,10 +18,10 @@
-{% trans "Previous" %} + {% trans "Close" %} - {% trans "Close all windows" %} -{% trans "Next" %} +
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html index c5f01b96a..8deeebf98 100644 --- a/ishtar_common/templates/ishtar/sheet_organization.html +++ b/ishtar_common/templates/ishtar/sheet_organization.html @@ -32,7 +32,7 @@ {{person.name|default:""}} {{person.surname|default:""}} {% for type in person.person_types.all %}{% if forloop.counter0 %}, {% endif %}{{type.label}}{% endfor %} - {% trans "Details" %} + {% empty %} {% trans "No person in this organization" %} diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index 5afa69360..e417b5e4d 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -9,7 +9,7 @@ {{ wizard.form.media }} {{ wizard.management_form }} {{ wizard.form.management_form }} -{% if automatic_parcel_association %}

{% endif %} +{% if automatic_parcel_association %}

{% endif %} {%if wizard.form.non_form_errors%} diff --git a/ishtar_common/templates/ishtar/wizard/towns_wizard.html b/ishtar_common/templates/ishtar/wizard/towns_wizard.html index 4f9ff6c5f..889108f32 100644 --- a/ishtar_common/templates/ishtar/wizard/towns_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/towns_wizard.html @@ -24,7 +24,7 @@
{{wizard.form.non_form_errors}}
{% endif %} {% else %} -

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

+

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

{% endif %} {{ previous_fields|safe }} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html index 6de2fbe8c..c4d765352 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html @@ -6,7 +6,7 @@

{% trans "Associated persons" %}

    {% for person in current_object.members.all %} -
  • {{person}} {% trans "show"%}
    • {% endfor %} +
  • {{person}}
    • {% endfor %}
{% endif %} @@ -14,7 +14,7 @@

{% trans "Associated archaeological files" %}

    {% for file in current_object.files.all %} -
  • {{file}} {% trans "show"%}
    • {% endfor %} +
  • {{file}}
    • {% endfor %}
{% endif %} @@ -22,7 +22,7 @@

{% trans "Operator of archaeological operations" %}

    {% for operation in current_object.operator.all %} -
  • {{operation}} {% trans "show"%}
    • {% endfor %} +
  • {{operation}}
    • {% endfor %}
{% endif %} @@ -30,7 +30,7 @@

{% trans "Adminact: operator of archaeological operations" %}

    {% for adminact in current_object.adminact_operator.all %} -
  • {{adminact}} {% trans "show"%}
    • {% endfor %} +
  • {{adminact}}
    • {% endfor %}
{% endif %} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html index ee04fbd84..03b941c60 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html @@ -6,7 +6,7 @@

{% trans "In charge of archaeological files" %}

    {% for file in current_object.file_responsability.all %} -
  • {{file}} {% trans "show"%}
    • {% endfor %} +
  • {{file}}
    • {% endfor %}
{% endif %} @@ -14,7 +14,7 @@

{% trans "General contractor of archaeological files" %}

    {% for file in current_object.general_contractor.all %} -
  • {{file}} {% trans "show"%}
    • {% endfor %} +
  • {{file}}
    • {% endfor %}
{% endif %} @@ -22,7 +22,7 @@

{% trans "Responsible town planning service of archaeological files" %}

    {% for file in current_object.responsible_town_planning_service.all %} -
  • {{file}} {% trans "show"%}
    • {% endfor %} +
  • {{file}}
    • {% endfor %}
{% endif %} @@ -30,7 +30,7 @@

{% trans "Scientist in charge of archaeological files" %}

    {% for file in current_object.scientist.all %} -
  • {{file}} {% trans "show"%}
    • {% endfor %} +
  • {{file}}
    • {% endfor %}
{% endif %} @@ -38,7 +38,7 @@

{% trans "Scientist in charge of archaeological operations" %}

    {% for operation in current_object.operation_scientist_responsability.all %} -
  • {{operation}} {% trans "show"%}
    • {% endfor %} +
  • {{operation}}
    • {% endfor %}
{% endif %} @@ -46,7 +46,7 @@

{% trans "In charge of archaeological operations" %}

    {% for operation in current_object.operation_responsability.all %} -
  • {{operation}} {% trans "show"%}
    • {% endfor %} +
  • {{operation}}
    • {% endfor %}
{% endif %} @@ -54,7 +54,7 @@

{% trans "Rapporteur CIRA des operations" %}

    {% for operation in current_object.cira_rapporteur.all %} -
  • {{operation}} {% trans "show"%}
    • {% endfor %} +
  • {{operation}}
    • {% endfor %}
{% endif %} @@ -62,7 +62,7 @@

{% trans "Administrativ act: in charge of archaeological operations" %}

    {% for adminact in current_object.adminact_operation_in_charge.all %} -
  • {{adminact}} {% trans "show"%}
    • {% endfor %} +
  • {{adminact}}
    • {% endfor %}
{% endif %} @@ -70,7 +70,7 @@

{% trans "Administrativ act: scientist in charge" %}

    {% for adminact in current_object.adminact_scientist.all %} -
  • {{adminact}} {% trans "show"%}
    • {% endfor %} +
  • {{adminact}}
    • {% endfor %}
{% endif %} @@ -78,7 +78,7 @@

{% trans "Administrativ act: signatory" %}

    {% for adminact in current_object.signatory.all %} -
  • {{adminact}} {% trans "show"%}
    • {% endfor %} +
  • {{adminact}}
    • {% endfor %}
{% endif %} @@ -95,10 +95,10 @@
    {% for treatments in current_object.treatments.all %} {% if treatment.downstream_treatment %} -
  • {{treatment.downstream_treatment}} ({% trans "downstream"%}) {% trans "show"%}
    • +
  • {{treatment.downstream_treatment}} ({% trans "downstream"%})
    • {% endif %} {% if treatment.upstream_treatment %} -
  • {{treatment.upstream_treatment}} ({% trans "upstream"%}) {% trans "show"%}
    • +
  • {{treatment.upstream_treatment}} ({% trans "upstream"%})
    • {% endif %} {% endfor %}
@@ -108,7 +108,7 @@

{% trans "Property of items" %}

    {% for property in current_object.properties.all %} -
  • {{property.find}} {% trans "show"%}
    • {% endfor %} +
  • {{property.find}}
    • {% endfor %}
{% endif %} -- cgit v1.2.3