diff options
Diffstat (limited to 'ishtar_common/templates')
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_nav.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet.html | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html index abf03ead1..1587963c5 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html @@ -1,8 +1,8 @@ -{% load i18n %}{% if data.count %} +{% load i18n %}{% if data.count or external %} <dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap"> <dt>{% trans caption %}</dt> - <dd>{% for d in data.all %} + <dd>{% if not external %}{% for d in data.all %} {% if forloop.counter0 %} ; {% endif %}{{ d }} - {% endfor %}</dd> + {% endfor %}{% else %}{{data}}{% endif %}</dd> </dl> {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index 1d8121faf..a1ec01dcb 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -1,4 +1,5 @@ {% load i18n ishtar_helpers %} +{% if not item.is_external %} <div class="row toolbar"> {% if current_user.is_superuser %} {% if previous or next %} @@ -112,4 +113,7 @@ $(document).ready(function(){ register_qa_on_sheet(); }); -</script>
\ No newline at end of file +</script> +{% else %} +<h3><i class="fa fa-globe" aria-hidden="true"></i> {{item.current_source}}</h3> +{% endif %}
\ No newline at end of file diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html index b0f82941f..4596d8ec6 100644 --- a/ishtar_common/templates/ishtar/sheet.html +++ b/ishtar_common/templates/ishtar/sheet.html @@ -79,19 +79,19 @@ var last_window='{{window_id}}'; jQuery(document).ready(function(){ - if (! get_next_table_id({{item.pk}})){ + if (! get_next_table_id("{{item.pk}}")){ jQuery('.next_page').hide(); } - if (! get_previous_table_id({{item.pk}})){ + if (! get_previous_table_id("{{item.pk}}")){ jQuery('.previous_page').hide(); } jQuery(".next_page").click(function() { - load_window("{{current_window_url}}" + get_next_table_id({{item.pk}}) + "/", + load_window("{{current_window_url}}" + get_next_table_id("{{item.pk}}") + "/", '', function(){hide_window("{{window_id}}");}, true); }); jQuery(".previous_page").click(function() { - load_window("{{current_window_url}}" + get_previous_table_id({{item.pk}}) + "/", + load_window("{{current_window_url}}" + get_previous_table_id("{{item.pk}}") + "/", '', function(){hide_window("{{window_id}}");}, true); }); |