From bbaad22b70fbe644958e0d69cc360f5a1d0bf4f2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Mar 2017 10:31:21 +0100 Subject: Sheet: remove ":" from labels --- ishtar_common/templates/ishtar/blocks/sheet_creation_section.html | 4 ++-- ishtar_common/templates/ishtar/blocks/window_field.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_detail.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_multiple.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_url.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html index 1312cbcd5..e6ce31c25 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html @@ -1,6 +1,6 @@ {% load i18n link_to_window %} {% if item.history_creator.ishtaruser.person %} -
  • +
  • {{item.history_creator.ishtaruser.person}} {{item.history_creator.ishtaruser.person|link_to_window}}
    @@ -9,7 +9,7 @@
  • {% endif %} {% if item.history_creation_date != item.last_edition_date %} -
  • +
  • {{item.history_modifier.ishtaruser.person}} {{item.history_modifier.ishtaruser.person|link_to_window}}
    diff --git a/ishtar_common/templates/ishtar/blocks/window_field.html b/ishtar_common/templates/ishtar/blocks/window_field.html index 969f32dbb..b52ed78ee 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field.html +++ b/ishtar_common/templates/ishtar/blocks/window_field.html @@ -1,3 +1,3 @@ -{% load i18n %}{% if data %}{% if li %}
  • {% else %}

    {% endif %} +{% load i18n %}{% if data %}{% if li %}

  • {% else %}

    {% endif %} {{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe}}{% if li %}

  • {% else %}

    {% endif %} {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_detail.html b/ishtar_common/templates/ishtar/blocks/window_field_detail.html index 2be9c5ec4..594c67529 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_detail.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_detail.html @@ -1,3 +1,3 @@ -{% load i18n %}{% if item %}{% if li %}
  • {% else %}

    {% endif %} +{% load i18n %}{% if item %}{% if li %}

  • {% else %}

    {% endif %} {{item}}{{link}}{% if li %}

  • {% else %}

    {% endif %} {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html index cc817490c..f07630174 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html @@ -1,4 +1,4 @@ -{% load i18n %}{% if data.count %}{% if li %}
  • {% else %}

    {% endif %} +{% load i18n %}{% if data.count %}{% if li %}

  • {% else %}

    {% endif %} {% for d in data.all %} {% if forloop.counter0 %} ; {% endif %}{{ d }} {% endfor %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_url.html b/ishtar_common/templates/ishtar/blocks/window_field_url.html index d63ebdca9..cd6365106 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_url.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_url.html @@ -1,3 +1,3 @@ -{% load i18n %}{% if link %}{% if li %}

  • {% else %}

    {% endif %}

    +{% load i18n %}{% if link %}{% if li %}

  • {% else %}

    {% endif %}

    {% if link_name %}{{link_name}}{% else %}{{link}}{% endif %}{% if li %}

  • {% else %}

    {% endif %} {% endif%} -- cgit v1.2.3