From cba8c6834ee1c957584fea4fd07a712cb495d438 Mon Sep 17 00:00:00 2001 From: paul van genuchten Date: Thu, 19 Nov 2020 04:36:20 +0100 Subject: [PATCH] remove schema-org microdata, because it is now embedded as json-ld (#575) resolves #574 --- pygeoapi/templates/collection.html | 32 +++++++------------ pygeoapi/templates/collections.html | 14 +++------ pygeoapi/templates/domainset.html | 12 ++----- pygeoapi/templates/landing_page.html | 43 +++++++++++++------------- pygeoapi/templates/process.html | 17 +++++----- pygeoapi/templates/processes.html | 7 ++--- pygeoapi/templates/queryables.html | 14 +++------ pygeoapi/templates/rangetype.html | 12 ++----- pygeoapi/templates/stac/catalog.html | 5 ++- pygeoapi/templates/stac/item.html | 5 ++- pygeoapi/templates/stac/root.html | 14 +++------ pygeoapi/templates/tiles.html | 14 +++------ pygeoapi/templates/tiles_metadata.html | 16 +++------- 13 files changed, 75 insertions(+), 130 deletions(-) diff --git a/pygeoapi/templates/collection.html b/pygeoapi/templates/collection.html index bf361ff5d..b2174fe30 100644 --- a/pygeoapi/templates/collection.html +++ b/pygeoapi/templates/collection.html @@ -5,16 +5,10 @@ / {{ data['title'] }} {% endblock %} {% block body %} -
- - - - - -

{{ data['title'] }}

- -

{{ data['description'] }}

-

+

+

{{ data['title'] }}

+

{{ data['description'] }}

+

{% for kw in data['keywords'] %} {{ kw }} {% endfor %} @@ -24,17 +18,15 @@

Queryables

View

@@ -44,8 +36,7 @@

Tiles

@@ -55,10 +46,9 @@

Tiles

Links

diff --git a/pygeoapi/templates/collections.html b/pygeoapi/templates/collections.html index 4cef6df6a..649684a3f 100644 --- a/pygeoapi/templates/collections.html +++ b/pygeoapi/templates/collections.html @@ -4,11 +4,8 @@ / Collections {% endblock %} {% block body %} -
- - - -

Collections in this service

+
+

Collections in this service

@@ -18,14 +15,13 @@

Collections in this service

{% for k, v in filter_dict_by_key_value(config['resources'], 'type', 'collection').items() %} - + - diff --git a/pygeoapi/templates/domainset.html b/pygeoapi/templates/domainset.html index 85b50daa4..90bbec353 100644 --- a/pygeoapi/templates/domainset.html +++ b/pygeoapi/templates/domainset.html @@ -5,15 +5,9 @@ / {{ data['title'] }} {% endblock %} {% block body %} -
- - - - - -

{{ data['title'] }}

- -

{{ data['description'] }}

+
+

{{ data['title'] }}

+

{{ data['description'] }}

Coverage domain set

Axis labels

    diff --git a/pygeoapi/templates/landing_page.html b/pygeoapi/templates/landing_page.html index bd0f7d4a2..ca55c400f 100644 --- a/pygeoapi/templates/landing_page.html +++ b/pygeoapi/templates/landing_page.html @@ -3,16 +3,15 @@ {% block body %}
    -
    - +
    -

    {{ config['metadata']['identification']['title'] }}

    -

    {{ config['metadata']['identification']['description'] }}

    +

    {{ config['metadata']['identification']['title'] }}

    +

    {{ config['metadata']['identification']['description'] }}

    -

    +

    {% for kw in config['metadata']['identification']['keywords'] %} {{ kw }} {% endfor %} @@ -36,7 +35,7 @@

    {{ config['metadata']['identification']['title'] }}

    License
    @@ -82,14 +81,14 @@

    Conformance

    -
    +
    Provider
    - {{ config['metadata']['provider']['name'] }}
    -
    + {{ config['metadata']['provider']['name'] }}
    + {{ config['metadata']['provider']['url'] }}
    @@ -98,35 +97,35 @@

    Conformance

    Address
    -
    - {{ config['metadata']['contact']['address'] }}
    - {{ config['metadata']['contact']['city'] }}, - {{ config['metadata']['contact']['stateorprovince'] }}
    - {{ config['metadata']['contact']['postalcode'] }}
    - {{ config['metadata']['contact']['country'] }} +
    + {{ config['metadata']['contact']['address'] }}
    + {{ config['metadata']['contact']['city'] }}, + {{ config['metadata']['contact']['stateorprovince'] }}
    + {{ config['metadata']['contact']['postalcode'] }}
    + {{ config['metadata']['contact']['country'] }}
    -
    +
    Email
    - {{ config['metadata']['contact']['email'] }}
    + {{ config['metadata']['contact']['email'] }}
    {% if config['metadata']['contact']['phone'] %} Telephone
    - {{ config['metadata']['contact']['phone'] }}
    + {{ config['metadata']['contact']['phone'] }}
    {% endif %} {% if config['metadata']['contact']['fax'] %} Fax
    - {{ config['metadata']['contact']['fax'] }}
    + {{ config['metadata']['contact']['fax'] }}
    {% endif %} {% if config['metadata']['contact']['url'] %} Contact URL
    -
    + {{ config['metadata']['contact']['url'] }}
    {% endif %} {% if config['metadata']['contact']['hours'] %} Hours
    - {{ config['metadata']['contact']['hours'] }}
    + {{ config['metadata']['contact']['hours'] }}
    {% endif %} {% if config['metadata']['contact']['instructions'] %} Contact instructions
    - {{ config['metadata']['contact']['instructions'] }} + {{ config['metadata']['contact']['instructions'] }} {% endif %}
    diff --git a/pygeoapi/templates/process.html b/pygeoapi/templates/process.html index ae8daf710..f9a640ed8 100644 --- a/pygeoapi/templates/process.html +++ b/pygeoapi/templates/process.html @@ -5,10 +5,9 @@ / {{ data['title'] }} {% endblock %} {% block body %} -
    -

    {{ data['title'] }}

    -
    {{ data['description'] }}
    - +
    +

    {{ data['title'] }}

    +
    {{ data['description'] }}
- - {{ v['title'] | striptags | truncate }} + {{ v['title'] | striptags | truncate }} + {{ v['description'] | striptags | truncate }}
@@ -22,10 +21,10 @@

{{ data['title'] }}

{% for input_ in data['inputs'] %} - - - - + + + @@ -38,7 +37,7 @@

Links

    {% for link in data['links'] %}
  • - + {{ link['title'] }} ({{ link['type'] }})
  • {% endfor %} diff --git a/pygeoapi/templates/processes.html b/pygeoapi/templates/processes.html index 7497fac02..ab2e9555d 100644 --- a/pygeoapi/templates/processes.html +++ b/pygeoapi/templates/processes.html @@ -19,12 +19,11 @@

    Processes available on this service

{% for p in data['processes'] %} - - + - diff --git a/pygeoapi/templates/queryables.html b/pygeoapi/templates/queryables.html index f9cc5a298..9f4d35170 100644 --- a/pygeoapi/templates/queryables.html +++ b/pygeoapi/templates/queryables.html @@ -6,16 +6,10 @@ / Queryables {% endblock %} {% block body %} -
- - - - - -

{{ data['title'] }}

- -

{{ data['description'] }}

-

+

+

{{ data['title'] }}

+

{{ data['description'] }}

+

{% for kw in data['keywords'] %} {{ kw }} {% endfor %} diff --git a/pygeoapi/templates/rangetype.html b/pygeoapi/templates/rangetype.html index 0387c15dc..f2d9678d2 100644 --- a/pygeoapi/templates/rangetype.html +++ b/pygeoapi/templates/rangetype.html @@ -5,15 +5,9 @@ / {{ data['title'] }} {% endblock %} {% block body %} -

- - - - - -

{{ data['title'] }}

- -

{{ data['description'] }}

+
+

{{ data['title'] }}

+

{{ data['description'] }}

Coverage range type

Fields

    diff --git a/pygeoapi/templates/stac/catalog.html b/pygeoapi/templates/stac/catalog.html index fea38d3f6..338480629 100644 --- a/pygeoapi/templates/stac/catalog.html +++ b/pygeoapi/templates/stac/catalog.html @@ -20,11 +20,10 @@

    Links

{% for link in data['links'] %} {% if link['type'] == 'text/html' and link['rel'] in ['child', 'item'] %} - + {% endif %} diff --git a/pygeoapi/templates/stac/item.html b/pygeoapi/templates/stac/item.html index a79b155da..a2754a0f4 100644 --- a/pygeoapi/templates/stac/item.html +++ b/pygeoapi/templates/stac/item.html @@ -34,11 +34,10 @@

Assets

{% for k, link in data['assets'].items() %} - + {% endfor %} diff --git a/pygeoapi/templates/stac/root.html b/pygeoapi/templates/stac/root.html index c9359a74a..47d1fa501 100644 --- a/pygeoapi/templates/stac/root.html +++ b/pygeoapi/templates/stac/root.html @@ -6,15 +6,10 @@ {% block body %}
- - - -

STAC Version: {{ data['stac_version'] }}

-
-
+

Collections

{{ input_['id'] }}{{ input_['title'] }} +
{{ input_['id'] }}{{ input_['title'] }} {{ input_['description'] | striptags | truncate }}
- +
{{ p['title'] | striptags | truncate }} + {{ p['description'] | striptags | truncate }}
- - {{ link['href'] | get_path_basename }} + {{ link['href'] | get_path_basename }}
- - {{ link['href'] | get_path_basename }} + {{ link['href'] | get_path_basename }}
@@ -25,14 +20,13 @@

Collections

{% for k, v in filter_dict_by_key_value(config['resources'], 'type', 'stac-collection').items() %} - + - diff --git a/pygeoapi/templates/tiles.html b/pygeoapi/templates/tiles.html index 8be30c587..909f5a8ad 100644 --- a/pygeoapi/templates/tiles.html +++ b/pygeoapi/templates/tiles.html @@ -18,16 +18,10 @@ {% endblock %} {% block body %} -
- - - - - -

{{ data['title'] }}

- -

{{ data['description'] }}

-

+

+

{{ data['title'] }}

+

{{ data['description'] }}

+

{% for kw in data['keywords'] %} {{ kw }} {% endfor %} diff --git a/pygeoapi/templates/tiles_metadata.html b/pygeoapi/templates/tiles_metadata.html index 6d538f7b2..b8751095e 100644 --- a/pygeoapi/templates/tiles_metadata.html +++ b/pygeoapi/templates/tiles_metadata.html @@ -7,22 +7,16 @@ / Tile Metadata {% endblock %} {% block body %} -

- - - - - -

{{ data['title'] }}

- -

{{ data['description'] }}

-

+

+

{{ data['title'] }}

+

{{ data['description'] }}

+

{% for kw in data['keywords'] %} {{ kw }} {% endfor %}

Tiles metadata - {{ data['format'] }} format

-

Tileset {{ data['tileset'] }}

+

Tileset {{ data['tileset'] }}

    {% for metadata in data['metadata'].items() %}
  • {{ metadata[0] }} ({{ metadata[1] }})
- - {{ v['title'] | striptags | truncate }} + {{ v['title'] | striptags | truncate }} + {{ v['description'] | striptags | truncate }}