From 9fc865e4657721841627866c167f5c9d89f47581 Mon Sep 17 00:00:00 2001
From: Kevin Ngai <ngaik@geomet-dev-22.cmc.ec.gc.ca>
Date: Tue, 20 Aug 2024 15:05:01 +0000
Subject: [PATCH] Template theme enhancements: - Breadcrumb fix of using
 data['id']and data['collections_path'] if possible - Improve limit warning
 display of collection items and add ARIA tags

---
 theme/templates/collections/items/index.html | 36 +++++++++++---------
 theme/templates/collections/queryables.html  |  4 +++
 theme/templates/collections/schema.html      |  4 +++
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/theme/templates/collections/items/index.html b/theme/templates/collections/items/index.html
index d5bd8d76..2a4101d1 100644
--- a/theme/templates/collections/items/index.html
+++ b/theme/templates/collections/items/index.html
@@ -51,8 +51,8 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
         </div>
         <div v-if="items.length === 0" class="alert alert-warning">
           <p>{% trans %}No results. Please modify your search query or <button
-            :title="txt.reset"  
-            class="btn btn-warning btn-sm" 
+            :title="txt.reset"
+            class="btn btn-warning btn-sm"
             @click="clearSearch">reset</button> the table.{% endtrans %}</p>
         </div>
         <div class="form-inline row" aria-controls="items-table">
@@ -67,15 +67,15 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
           </div>
           <div class="col-xs-7 text-right">
             <div class="btn-group btn-group-sm inline-block">
-              <button 
-                :title="txt.reset" 
-                class="btn btn-warning" 
+              <button
+                :title="txt.reset"
+                class="btn btn-warning"
                 @click="clearSearch"
                 :disabled="queryColsIsEmpty">
                 <span class="glyphicon glyphicon-remove"></span> {% trans %}Reset{% endtrans %}</button>
-              <button 
-                title="{% trans %}Apply column keyword search queries to the entire collection{% endtrans %}" 
-                class="btn btn-primary" 
+              <button
+                title="{% trans %}Apply column keyword search queries to the entire collection{% endtrans %}"
+                class="btn btn-primary"
                 @click="applyKeywordSearch()"
                 :disabled="queryColsIsEmpty">
                 <span class="glyphicon glyphicon-search"></span> {% trans %}Search by keywords{% endtrans %}</button>
@@ -97,7 +97,7 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
                   </div>
                   <div v-if="th.key !== 'id'">
                     <label class="wb-inv" :for="'search-'+th.key">{% trans %}Keyword search for: [% th.key %]{% endtrans %}</label>
-                    <input 
+                    <input
                       type="text"
                       class="form-control input-sm keyword-search-input"
                       title="{% trans %}eg. &quot;BC QC ON&quot; will search for &quot;BC&quot; or &quot;ON&quot; or &quot;QC&quot;{% endtrans %}"
@@ -147,9 +147,11 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
                     class="input-sm form-control inline-block"
                     v-model="limit"
                     :disabled="itemsLoading"
+                    aria-describedby="limit-warning"
                     @change="limitChange()">
                       <option v-for="value of limitOptions" :value="value" v-text="value"></option>
                   </select>
+                  <span id="limit-warning" class="label label-warning mrgn-lft-sm" role="status" aria-live="polite">{% trans %}Higher limits are not recommended{% endtrans %}</span>
                 </div>
               </div>
             </div>
@@ -158,10 +160,10 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
               <span v-show="showingFilteredFromText !== ''" v-text="' (' + showingFilteredFromText + ')'"></span>
             </div>
           </div>
-          <div class="alert alert-warning padding-tb-5 mrgn-bttm-0 mrgn-tp-sm">
-            <p><small>{% trans %}Higher limits are not recommended{% endtrans %}</small></p>
-          </div>
-          <ul class="pagination pagination-sm clearfix">
+          <!-- <div class="alert alert-warning mrgn-bttm-0 mrgn-tp-sm">
+            <h5>{% trans %}Higher limits are not recommended{% endtrans %}</h5>
+          </div> -->
+          <ul class="pagination pagination-sm clearfix mrgn-tp-sm">
             <li>
               <button class="btn btn-sm btn-default" @click="prevPageItems" rel="prev" :disabled="itemsLoading || currentPage === 1">{% trans %}Previous{% endtrans %}</button>
             </li>
@@ -206,7 +208,7 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
           const { items, itemsJson, itemProps, getItems, getTableHeaders, itemsTotal, itemsLoading,
             currentPage, maxPages, prevPage, nextPage, limit, showingLimitText, calcOffset,
             queryCols, clearQueryCols, queryColsIsEmpty } = useItems(itemsi18n)
-          
+
           /* Table columns */
           const tableFields = computed(() => {
             const fields = []
@@ -223,7 +225,7 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
                 // avoid duplicate column id case that matches root id
                 if (prop.toLowerCase() === 'id') {
                   return // skip
-                } 
+                }
                 // avoid duplicate columns if root id and ID_FIELD are the same
                 if (prop.toLowerCase() === ID_FIELD.toLowerCase()) {
                   return // skip
@@ -255,7 +257,7 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
             sortDir(col)
             getItemsSorted()
           }
-          
+
           /* Collection searching */
           const clearSearch = function() {
             clearQueryCols()
@@ -300,7 +302,7 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
           const nonQueryColumns = ['sortby', 'offset', 'limit', 'f', 'bbox']
           let params = Object.fromEntries(queryParams.entries())
           let historyState = 1 // internal state handling for back/forward
-          // update JSON and JSONLD href 
+          // update JSON and JSONLD href
           const updateJsonLinks = function() {
             let jsonLink = document.getElementById('json-format-url')
             jsonLink.href = '?' + queryParams.toString() + '&f=json'
diff --git a/theme/templates/collections/queryables.html b/theme/templates/collections/queryables.html
index 918985c7..557d4244 100644
--- a/theme/templates/collections/queryables.html
+++ b/theme/templates/collections/queryables.html
@@ -2,7 +2,11 @@
 {% block title %}{{ super() }} {{ data['title'] }} {% endblock %}
 {% block crumbs %}{{ super() }}
 <li><a href="{{ data['collections_path'] }}?lang={{ (locale|lower)[:2] }}">{% trans %}Collections{% endtrans %}</a></li>
+{% if 'id' in data %}
+<li><a href="{{ data['collections_path'] }}/{{ data['id'] }}?lang={{ (locale|lower)[:2] }}">{{ data['title'] | truncate( 25 ) }}</a></li>
+{% else %}
 <li><a href="./?lang={{ (locale|lower)[:2] }}">{{ data['title'] | truncate( 25 ) }}</a></li>
+{% endif %}
 <li><a href="./queryables?lang={{ (locale|lower)[:2] }}">{% trans %}Queryables{% endtrans %}</a></li>
 {% endblock %}
 {% block body %}
diff --git a/theme/templates/collections/schema.html b/theme/templates/collections/schema.html
index 6de94588..f5959663 100644
--- a/theme/templates/collections/schema.html
+++ b/theme/templates/collections/schema.html
@@ -2,7 +2,11 @@
 {% block title %}{{ super() }} {{ data['title'] }} {% endblock %}
 {% block crumbs %}{{ super() }}
 <li><a href="{{ data['collections_path'] }}?lang={{ (locale|lower)[:2] }}">{% trans %}Collections{% endtrans %}</a></li>
+{% if 'id' in data %}
+<li><a href="{{ data['collections_path'] }}/{{ data['id'] }}?lang={{ (locale|lower)[:2] }}">{{ data['title'] | truncate( 25 ) }}</a></li>
+{% else %}
 <li><a href="./?lang={{ (locale|lower)[:2] }}">{{ data['title'] | truncate( 25 ) }}</a></li>
+{% endif %}
 <li><a href="./schema?lang={{ (locale|lower)[:2] }}">{% trans %}Schema{% endtrans %}</a></li>
 {% endblock %}
 {% block body %}