Merge pull request #22 from GeoscienceAustralia/develop

Develop

Author: jwallace94

pygeoapi/templates/collections/items/index.html

@@ -16,12 +16,6 @@
     <link rel="stylesheet" href="https://unpkg.com/leaflet.markercluster/dist/MarkerCluster.css"/>
     <link rel="stylesheet" href="https://unpkg.com/leaflet.markercluster/dist/MarkerCluster.Default.css"/>
     <script src="https://unpkg.com/leaflet.markercluster/dist/leaflet.markercluster-src.js"></script>
-    <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4=" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdn.datatables.net/2.0.3/css/dataTables.dataTables.css" />
-    <script type="text/javascript" src="https://cdn.datatables.net/1.10.24/js/jquery.dataTables.min.js"></script>
-    <script type="text/javascript" src="https://cdn.datatables.net/fixedcolumns/3.3.2/js/dataTables.fixedColumns.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.min.css">
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/fixedcolumns/3.3.2/css/fixedColumns.dataTables.min.css"> 
 {% endblock %}
 
 {% block body %}
@@ -83,35 +77,23 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
 
       <div class="col-sm-12 col-md-6" style="overflow-x: scroll;">
         {% set props = [] %}
-        <table id="searchtable" class="stripe cell-border order-column" style="width:100%">
+        <table class="table table-striped table-bordered">
           <thead>
             <tr>
               {% if data.get('uri_field') %}
                 {% set uri_field = data.uri_field %}
-                <th>                  
-                  <label> {{uri_field}} </label>
-                  <div> {{uri_field}} </div>
-                </th>
+                <th>{{ uri_field }}</th>
               {% elif data.get('title_field') %}
                 {% set title_field = data.title_field %}
-                <th>
-                    <label> {{ title_field }} </label>
-                    <div>  {{ title_field }} </div>
-                </th>
+                <th>{{ title_field }}</th>
               {% else %}
-                <th>
-                    <label> id </label>
-                    <div> id </div>
-                </th>
+                <th>id</th>
               {% endif %}
 
               {% for k in data['features'][0]['properties'].keys() %}
                 {% if k not in [data.id_field, data.title_field, data.uri_field, 'extent'] %}
                   {% set props = props.append(k) %}
-                  <th>
-                      <label> {{ k }} </label>
-                      <div> {{ k }} </div>
-                  </th>
+                  <th>{{ k | striptags }}</th>
                 {% endif %}
               {% endfor %}
             </tr>
@@ -159,32 +141,6 @@ <h1>{% for l in data['links'] if l.rel == 'collection' %} {{ l['title'] }} {% en
     </div>
     {% endif %}
     </section>
-    <script>
-        $(document).ready(function() {
-      	// Setup - add a text input to each header cell
-      	$('#searchtable thead th div').each(function(i) {
-        	var title = $('#searchtable thead th div').eq($(this).index()).text();
-        	$(this).html('<input type="text" placeholder="Search ' + '" data-index="' + i + '" />');
-      	});
-
-      	// DataTable
-      	var table = $('#searchtable').DataTable({
-        	responsive: true,
-        	paging: true,
-        	sorting: false,
-        	searching: true,
-	      //dom: 'rtip',      //this can be used to remove the search bar at the top and other configuration settings
-      	});
-
-      	// Filter event handler
-      	$(table.table().container()).on('keyup', 'thead input', function() {
-        	table
-          	.column($(this).data('index'))
-          	.search(this.value)
-          	.draw();
-      	});
-      });
-    </script>
 {% endblock %}
 
 {% block extrafoot %}