From e728afffc7f3743f0e23eddd8f874b258ac282ce Mon Sep 17 00:00:00 2001 From: Thorge Petersen <petersen@rz.uni-kiel.de> Date: Mon, 6 Nov 2023 13:29:05 +0100 Subject: [PATCH] Prevent empty divs in distribution item when name or description is empty --- .../package/snippets/resource_item.html | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/ckanext/odsh/templates/package/snippets/resource_item.html b/ckanext/odsh/templates/package/snippets/resource_item.html index c46a732b..5c957ea6 100644 --- a/ckanext/odsh/templates/package/snippets/resource_item.html +++ b/ckanext/odsh/templates/package/snippets/resource_item.html @@ -10,33 +10,35 @@ <li class="resource-item" data-id="{{ res.id }}"> <div class="resource-title-container"> - <div class="resource-title" title="{{ rtitle }}"> - {% if res.name %} + {% if res.name %} + <div class="resource-title" title="{{ rtitle }}"> <a href="{{ download }}" title="{{ res.name }}"> {{ h.resource_display_name(res) | truncate(120) }} </a> - {% endif %} - </div> - {% block resource_item_description %} - <div class="resource-description"> - {% if res.description %} - <p class="description" id="resource-description-{{ res.id }}"> - {{ h.markdown_extract(res.description, extract_length=0) }} - </p> - <div class="ellipsis-action" data-target="#resource-description-{{ res.id }}" data-max-height="75"> - <div class="ellipsis-overlay"></div> - <a title="Read more" class="readmore" href="#">{% trans %}Read more »{% endtrans %}</a> - <a title="Read less" class="readless" href="#">{% trans %}« Read less{% endtrans %}</a> - </div> - {% endif %} - {% if resource_size %} - <p>{{ _('File size') }}: {{ resource_size }}</p> - {% endif %} - {% set number_of_pages = res.get('number_of_pages') %} - {% if number_of_pages%} - <p>{{ _('Number of pages') }}: {{ number_of_pages }}</p> - {% endif %} </div> + {% endif %} + {% block resource_item_description %} + {% if res.description or resource_size %} + <div class="resource-description"> + {% if res.description %} + <p class="description" id="resource-description-{{ res.id }}"> + {{ h.markdown_extract(res.description, extract_length=0) }} + </p> + <div class="ellipsis-action" data-target="#resource-description-{{ res.id }}" data-max-height="75"> + <div class="ellipsis-overlay"></div> + <a title="Read more" class="readmore" href="#">{% trans %}Read more »{% endtrans %}</a> + <a title="Read less" class="readless" href="#">{% trans %}« Read less{% endtrans %}</a> + </div> + {% endif %} + {% if resource_size %} + <p>{{ _('File size') }}: {{ resource_size }}</p> + {% endif %} + <!-- {% set number_of_pages = res.get('number_of_pages') %} + {% if number_of_pages%} + <p>{{ _('Number of pages') }}: {{ number_of_pages }}</p> + {% endif %} --> + </div> + {% endif %} {% endblock %} <div class="resource-icons"> {% block resource_item_explore_links %} -- GitLab