From 407fd0de82f227d9d01a9bb637c928e5207b0d29 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 31 Jan 2018 16:27:35 +0100 Subject: UI: fix url field - improve operation header --- archaeological_operations/templates/ishtar/sheet_operation.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_flex_url.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 8166d9d68..24e08eacb 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -1,7 +1,7 @@ {% extends "ishtar/sheet.html" %} {% load i18n window_tables window_header window_ope_tables window_field from_dict %} -{% block head_title %}{% trans "Operation" %} - {{item.short_label}}{% endblock %} +{% block head_title %}{% trans "Operation" %} - {{item.short_label}}{% if item.common_name %} - {{item.common_name}}{% endif %}{% endblock %} {% block toolbar %} {% window_nav item window_id 'show-operation' 'operation_modify' 'show-historized-operation' 'revert-operation' previous next 1 %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html index 59f612bc6..b3a801636 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html @@ -1,7 +1,8 @@ {% load i18n %}{% if link %} -
+
{% trans caption %}
{% if link_name %}{{link_name}}{% else %}{{link}}{% endif %}
+
{% endif%} -- cgit v1.2.3