diff options
7 files changed, 22 insertions, 11 deletions
diff --git a/CHANGES.md b/CHANGES.md index d8b1f9649..24520376b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ --- title: Ishtar changelog -date: 2023-01-27 +date: 2023-01-30 --- Ishtar changelog @@ -8,6 +8,7 @@ Ishtar changelog ### Features/improvements ### - add custom cached_label configuration for each main item +- sheet document: better UI for files v4.0.42 - 2023-01-25 -------------------- diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index a524ad04d..d952f66cb 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -23,9 +23,9 @@ {% with pdf_attached=item.pdf_attached %} {% if pdf_attached %} <p class="text-center col-12 p-2"> - <a href="{{pdf_attached}}" target="_blank"> + <a href="{{pdf_attached}}" class="btn btn-secondary" target="_blank"> + <i class="fa fa-file-pdf-o" aria-hidden="true"></i> {% trans "View PDF" %} - <i class="fa fa-external-link" aria-hidden="true"></i> </a> </p> {% endif %} diff --git a/ishtar_common/templates/blocks/DataTables-external-sources.html b/ishtar_common/templates/blocks/DataTables-external-sources.html index af8774b82..3a46b39f1 100644 --- a/ishtar_common/templates/blocks/DataTables-external-sources.html +++ b/ishtar_common/templates/blocks/DataTables-external-sources.html @@ -2,7 +2,7 @@ <div class="d-flex justify-content-center"> <div class="external-sources btn-group btn-group-toggle" data-toggle="buttons"> - <label id="source_button_default" class="btn btn-success"> + <label id="source_button_default" class="btn btn-primary"> <input type="radio" name="_sources" autocomplete="off" checked> {% trans "Local" %} <span class="badge badge-light" id="source_badge_default">-</span> </label> diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index 239d48a95..4c1043c51 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -229,8 +229,8 @@ jQuery(document).ready(function(){ $(".sources-default").show(); redraw_plots("{{name}}", "default"); if (current_tab == "map") map_submit_search(); - $(this).parent().children().removeClass("btn-success").addClass("btn-secondary"); - $(this).removeClass("active").removeClass("btn-secondary").addClass("btn-success"); + $(this).parent().children().removeClass("btn-primary").addClass("btn-secondary"); + $(this).removeClass("active").removeClass("btn-secondary").addClass("btn-primary"); return false; } ); @@ -243,8 +243,8 @@ jQuery(document).ready(function(){ redraw_plots("{{name}}", "{{source_id}}"); $("#grid_{{name}}_{{source_id}}").DataTable().clear().draw(); if (current_tab == "map") map_submit_search(); - $(this).parent().children().removeClass("btn-success").addClass("btn-secondary"); - $(this).removeClass("active").removeClass("btn-secondary").addClass("btn-success"); + $(this).parent().children().removeClass("btn-primary").addClass("btn-secondary"); + $(this).removeClass("active").removeClass("btn-secondary").addClass("btn-primary"); return false; } ); diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_file.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_file.html new file mode 100644 index 000000000..0a79176d6 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_file.html @@ -0,0 +1,10 @@ +{% load i18n %}{% if link %} +<dl class="col-12 col-md-6 col-lg-3 flex-wrap"> + <dt>{% trans caption %}</dt> + <dd> + <a href="{{link|safe}}" class="btn btn-secondary" target="_blank"> + {% if link_name %}{{link_name}}{% else %}{{link}}{% endif %} + </a> + </dd> +</dl> +{% endif%} diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 5ce51003c..388c2ca26 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -23,9 +23,9 @@ {% with pdf_attached=item.pdf_attached %} {% if pdf_attached %} <p class="text-center col-12 p-2"> - <a href="{{pdf_attached}}" target="_blank"> + <a href="{{pdf_attached}}" class="btn btn-secondary" target="_blank"> + <i class="fa fa-file-pdf-o" aria-hidden="true"></i> {% trans "View PDF" %} - <i class="fa fa-external-link" aria-hidden="true"></i> </a> </p> {% endif %} diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py index 8a9b5fa65..d55a005e9 100644 --- a/ishtar_common/templatetags/window_field.py +++ b/ishtar_common/templatetags/window_field.py @@ -86,7 +86,7 @@ def field_file(context, caption, link): return field_url(caption, link, link_name, get_base_url=True) -@register.inclusion_tag('ishtar/blocks/window_field_flex_url.html', +@register.inclusion_tag('ishtar/blocks/window_field_flex_file.html', takes_context=True) def field_flex_file(context, caption, link): return field_file(context, caption, link) |