summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/blocks
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates/ishtar/blocks')
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_creation_section.html19
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_external_id.html7
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field.html2
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field_detail.html2
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field_multiple.html2
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field_url.html2
6 files changed, 30 insertions, 4 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
new file mode 100644
index 000000000..e6ce31c25
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
@@ -0,0 +1,19 @@
+{% load i18n link_to_window %}
+{% if item.history_creator.ishtaruser.person %}
+<li><label>{% trans "Creation" context "Sheet" %}</label>
+ <span class='value'>
+ {{item.history_creator.ishtaruser.person}}
+ {{item.history_creator.ishtaruser.person|link_to_window}} <br/>
+ <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small>
+ </span>
+</li>
+{% endif %}
+{% if item.history_creation_date != item.last_edition_date %}
+<li><label>{% trans "Modification" context "Sheet" %}</label>
+ <span class='value'>
+ {{item.history_modifier.ishtaruser.person}}
+ {{item.history_modifier.ishtaruser.person|link_to_window}} <br/>
+ <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small>
+ </span>
+</li>
+{% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_external_id.html b/ishtar_common/templates/ishtar/blocks/sheet_external_id.html
new file mode 100644
index 000000000..95628ab15
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_external_id.html
@@ -0,0 +1,7 @@
+{% load i18n %}{% if item.external_id %}
+<p class='window-refs external-id'>
+ <small title="{% trans 'Internal ID' %}">
+ <i class="fa fa-key" aria-hidden="true"></i>
+ {{item.external_id|default:''}}
+ </small>
+</p>{% endif %}
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 %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label>
+{% load i18n %}{% if data %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}</label>
<span class='value'>{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe}}</span>{% if li %}</li>{% else %}</p>{% 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 %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label>
+{% load i18n %}{% if item %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}</label>
<span class='value'>{{item}}{{link}}</span>{% if li %}</li>{% else %}</p>{% 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 %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label>
+{% load i18n %}{% if data.count %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}</label>
<span class='value'>{% for d in data.all %}
{% if forloop.counter0 %} ; {% endif %}{{ d }}
{% endfor %}</span>
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 %}<li>{% else %}<p>{% endif %}<p><label>{% trans caption %}{% trans ":"%}</label>
+{% load i18n %}{% if link %}{% if li %}<li>{% else %}<p>{% endif %}<p><label>{% trans caption %}</label>
<span class='value'><a target="_blank" href='{{link|safe}}'>{% if link_name %}{{link_name}}{% else %}{{link}}{% endif %}</a></span>{% if li %}</li>{% else %}</p>{% endif %}
{% endif%}