Resolved merge conflicts

GeoscienceAustralia · Dec 11, 2023 · 5d91b01 · 5d91b01
1 parent 1052447
commit 5d91b01
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 18 deletions.
diff --git a/docs/_static/styles/components/_card_list.scss b/docs/_static/styles/components/_card_list.scss
@@ -49,6 +49,8 @@
         & > .rubric,
         & > p {
             text-align: center;
+            margin-left: 2rem;
+            margin-right: 2rem;
 
             &:last-of-type {
                 margin-bottom: 2rem;

diff --git a/docs/_static/styles/components/_demo_banner.scss b/docs/_static/styles/components/_demo_banner.scss
@@ -1,14 +1,19 @@
 #demo-banner {
-    background-color: #FF1493;
+    background-color: #c8e7da;
     padding: 0.5rem;
     border-radius: 3px;
     margin-top: 1.5rem;
     margin-bottom: 0.5rem;
+    box-shadow: 0 .5rem 1rem rgba(0,0,0,.15) !important;
 
     p {
         text-align: center;
     }
 
+    p, a {
+        color: #4B0082;
+    }
+
     .fa, .svg-inline--fa {
         margin-right: 0.5rem;
     }

diff --git a/docs/_static/styles/pages/_home.scss b/docs/_static/styles/pages/_home.scss
@@ -3,22 +3,40 @@
     margin-bottom: 4rem;
 
     h1 {
-        font-size: 1.75rem;
-        margin-bottom: 1.15rem;
+        font-size: 1.9rem;
+        margin-bottom: 1.25rem;
     }
 
-    h1, & > p {
+    h1, h1 + p {
         text-align: center;
+        margin-left: 2rem;
+        margin-right: 2rem;
+    }
+
+    h1 + p {
+        margin-bottom: 3.5rem;
+
+        a {
+            white-space: nowrap;
+        }
     }
 
     & > p {
         margin-bottom: 0.75rem;
     }
 
-    & > p:last-of-type, .showcase-panel, .card-list {
+    .showcase-panel {
         margin-bottom: 1.75rem;
     }
 
+    .card-list {
+        margin-bottom: 2.75rem;
+
+        .sd-mb-4, .sd-my-4 {
+            margin-bottom: 0 !important;
+        }
+    }
+
     & > hr {
         border-color: var(--pst-color-primary);
     }
@@ -27,4 +45,8 @@
         padding-top: 0.5rem;
         padding-bottom: 0.5rem;
     }
+
+    h2, .rubric {
+        font-size: 1.35rem;
+    }
 }
diff --git a/docs/_templates/home-v1.rst b/docs/_templates/home-v1.rst
@@ -4,7 +4,7 @@
 {{ data.title }}
 ======================================================================================================================================================
 
-Digital Earth Australia (DEA) is a program of Geoscience Australia, an agency of the Australian Government. We create free and open satellite data products for the benefit of Australia.
+Digital Earth Australia (DEA) is a program of Geoscience Australia, an entity of the Australian Government. We create free and open satellite data products for the benefit of Australia.
 
 The DEA Knowledge Hub brings together information about DEA’s products and services to assist you to take advantage of Australia’s free and open satellite imagery archive. 
 
@@ -64,9 +64,11 @@ The DEA Knowledge Hub brings together information about DEA’s products and ser
 
       .. rubric:: About Digital Earth Australia
 
-      It’s DEA’s mission to embed satellite imagery and data into decisions that support a sustainable Australian environment, a resilient society and a strong economy.
+      It is our mission is to embed satellite imagery and data into decisions that support a sustainable Australian environment, a resilient society, and a strong economy.
 
-      To find out more about the DEA program, our strategy and journey to get here, as well as program news feeds and to `subscribe to the DEA newsletter <https://www.dea.ga.gov.au/news/dea-newsletter-and-communications-archive>`__, `visit the DEA website <https://www.dea.ga.gov.au/>`__.
+      `Visit the DEA website <https://www.dea.ga.gov.au/>`_
+
+      `Get our newsletter <https://www.dea.ga.gov.au/news/dea-newsletter-and-communications-archive>`_
 
    .. container::
 

diff --git a/docs/_templates/home-v2.rst b/docs/_templates/home-v2.rst
@@ -0,0 +1,73 @@
+.. rst-class:: home-page
+
+======================================================================================================================================================
+{{ data.title }}
+======================================================================================================================================================
+
+The knowledge hub brings together information about Digital Earth Austalia's products and services, allowing you to utilise our free and open-source satellite imagery archive.
+
+.. container:: card-list icons
+   :name: data-products
+
+   .. rubric:: Data Products
+
+   Browse our catalogue of data products to find supporting information and ways to access the data.
+
+   .. grid:: 2 2 3 5
+      :gutter: 3
+
+      {% for item in data.data_product_themes %}
+      .. grid-item-card:: :fas:`{{ item.icon }}`
+         :link: {{ item.link }}
+
+         {{ item.name }}
+      {% endfor %}
+
+.. container:: showcase-panel bg-gradient-primary
+   :name: user-guides
+
+   .. container::
+
+      .. rubric:: User Guides
+
+      Find documentation, step-by-step instructions, and DEA publications on a variety of topics.
+
+      `Visit the User Guides </guides/>`_
+
+   .. container::
+
+      .. image:: /_files/pages/dea-hero.jpg
+
+.. container:: showcase-panel bg-gradient-forest reverse
+   :name: dea-notebooks
+
+   .. container::
+
+      .. rubric:: DEA Notebooks
+
+      Explore visual walkthroughs that show how to analyse our data using Python, including the use our DEA Tools package.
+
+      `Visit the DEA Notebooks </notebooks/README/>`_
+
+   .. container::
+
+      .. image:: /_files/cmi/Kakadu-Mary_TCW-percentiles-wide_1.jpg
+
+.. container:: showcase-panel
+   :name: about-dea
+
+   .. container::
+
+      .. rubric:: About Digital Earth Australia
+
+      `Digital Earth Australia <https://www.dea.ga.gov.au/>`_ (DEA) is a program of `Geoscience Australia <https://www.ga.gov.au/>`_, an entity of the Australian Government.
+
+      It is our mission is to embed satellite imagery and data into decisions that support a sustainable Australian environment, a resilient society, and a strong economy.
+
+      `Visit the DEA website <https://www.dea.ga.gov.au/>`_
+
+      `Follow our newsletter <https://www.dea.ga.gov.au/news/dea-newsletter-and-communications-archive>`_
+
+   .. container::
+
+      .. image:: /_files/themes/sea-ocean-and-coast.* 
diff --git a/docs/_templates/product-v1.rst b/docs/_templates/product-v1.rst
@@ -341,7 +341,6 @@
 
           {% for item in valid_old_versions %}
           * - `v{{ item.version }}: {{ item.title }} </data/old-version/{{ item.slug }}/>`_
-            - {{ item.release_date or "" }}
           {% endfor %}
        {% else %}
        No old versions available.

diff --git a/docs/data/product/dea-fractional-cover-landsat/_data.yaml b/docs/data/product/dea-fractional-cover-landsat/_data.yaml
@@ -63,7 +63,6 @@ old_versions:
   - version: 2.2.1
     title: DEA Fractional Cover (Landsat, DEPRECATED)
     slug: dea-fractional-cover-landsat-2.2.1
-    release_date: null
 
 # Settings
 

diff --git a/docs/data/product/dea-fractional-cover-percentiles-landsat/_data.yaml b/docs/data/product/dea-fractional-cover-percentiles-landsat/_data.yaml
@@ -57,7 +57,6 @@ old_versions:
   - version: 2.2.1
     title: DEA Fractional Cover Percentiles (Landsat, DEPRECATED)
     slug: dea-fractional-cover-percentiles-landsat-2.2.1
-    release_date: null
 
 # Settings
 

diff --git a/docs/data/product/dea-surface-reflectance-landsat-5-tm/_data.yaml b/docs/data/product/dea-surface-reflectance-landsat-5-tm/_data.yaml
@@ -61,7 +61,6 @@ old_versions:
   - version: 2.0.0
     title: DEA Surface Reflectance NBAR (Landsat, DEPRECATED)
     slug: dea-surface-reflectance-nbar-landsat-2.0.0
-    release_date: null
 
 # Settings
 

diff --git a/docs/data/product/dea-surface-reflectance-landsat-7-etm/_data.yaml b/docs/data/product/dea-surface-reflectance-landsat-7-etm/_data.yaml
@@ -61,7 +61,6 @@ old_versions:
   - version: 2.0.0
     title: DEA Surface Reflectance NBART (Landsat, DEPRECATED)
     slug: dea-surface-reflectance-nbart-landsat-2.0.0
-    release_date: null
 
 # Settings
 

diff --git a/docs/data/product/dea-surface-reflectance-nbart-landsat-8-oli-tirs/_data.yaml b/docs/data/product/dea-surface-reflectance-nbart-landsat-8-oli-tirs/_data.yaml
@@ -61,7 +61,6 @@ old_versions:
   - version: 2.0.0
     title: DEA Surface Reflectance NBART (Landsat, DEPRECATED)
     slug: dea-surface-reflectance-nbart-landsat-2.0.0
-    release_date: null
 
 # Settings
 

diff --git a/docs/data/product/dea-water-observations-landsat/_data.yaml b/docs/data/product/dea-water-observations-landsat/_data.yaml
@@ -63,7 +63,6 @@ old_versions:
   - version: 2.1.5
     title: DEA Water Observations (Landsat, DEPRECATED)
     slug: dea-water-observations-landsat-2.1.5
-    release_date: null
 
 # Settings
 

diff --git a/docs/guides/index.md b/docs/guides/index.md
@@ -2,11 +2,11 @@
 
 &nbsp;
 
-# Digital Earth Australia User Guide
+# Digital Earth Australia User Guides
 
 Digital Earth Australia is an analysis platform for satellite imagery and other Earth observations.
 
-For more information, see the [DEA Web Site](http://www.ga.gov.au/dea).
+For more information, see the [DEA website](http://www.ga.gov.au/dea).
 
 Digital Earth Australia is currently in beta for users with accounts on the National Computational Infrastructure (NCI) or the Digital Earth Australia Sandbox (see the [Setup introduction](/guides/setup/README/) page).
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,2 +1,2 @@
 .. datatemplate:yaml:: _data.yaml
-   :template: home-v1.rst
+   :template: home-v2.rst