Merge branch 'dev' of github.com:usegalaxy-au/galaxy-media-site into dev

usegalaxy-au · Aug 29, 2024 · b55f16f · b55f16f
2 parents 7709199 + 5b53b72
commit b55f16f
Show file tree

Hide file tree

Showing 12 changed files with 150 additions and 117 deletions.
diff --git a/webapp/home/static/home/css/main.css b/webapp/home/static/home/css/main.css
@@ -73,6 +73,7 @@ nav.embedded .navbar-collapse {
 
 /* Footer */
 footer {
+  max-width: 100vw;
   margin-top: 10vw;
   padding-bottom: 1rem;
 }
@@ -99,7 +100,7 @@ footer .links h6 {
   font-weight: bold;
   margin-bottom: 1.5rem;
 }
-footer .links a {
+.plain-links a {
   color: inherit;
   white-space: nowrap;
 }
@@ -274,7 +275,21 @@ h6.header {
 }
 
 /* Responsive */
-@media (max-width: 992px) {
+@media (max-width: 1110px) {
+  #footer-links-row {
+    margin: auto;
+    flex-direction: column;
+    max-width: 500px;
+  }
+  #footer-links-row > .col-md-auto {
+    margin: 1rem 0;
+  }
+  #footer-galaxy-logo {
+    display: none;
+  }
+}
+
+@media (max-width: 1110px) {
   :root {
     font-size: 14px;
   }
@@ -290,9 +305,6 @@ h6.header {
     flex-wrap: wrap;
     margin-bottom: 25px;
   }
-  #footer-galaxy-logo {
-    display: none;
-  }
   footer .col-md-6 {
     min-width: fit-content;
   }

diff --git a/webapp/home/static/logos/footer/ARDC_Nectar_Research_Cloud_RGB.png b/webapp/home/static/logos/footer/ARDC_Nectar_Research_Cloud_RGB.png
diff --git a/...gos/footer/Australian-Biocommons-Logo-Tagline-Infrastructure-RGB-no-padding.png b/...gos/footer/Australian-Biocommons-Logo-Tagline-Infrastructure-RGB-no-padding.png
diff --git a/webapp/home/static/logos/footer/BIO-RGB_Full-POS.png b/webapp/home/static/logos/footer/BIO-RGB_Full-POS.png
diff --git a/webapp/home/static/logos/footer/Microsoft_Azure_Logo.svg.png b/webapp/home/static/logos/footer/Microsoft_Azure_Logo.svg.png
diff --git a/webapp/home/static/logos/footer/NCI_logo.png b/webapp/home/static/logos/footer/NCI_logo.png
diff --git a/webapp/home/static/logos/footer/NCRIS-PROVIDER.png b/webapp/home/static/logos/footer/NCRIS-PROVIDER.png
diff --git a/webapp/home/static/logos/footer/pawsey-logo-beige.png b/webapp/home/static/logos/footer/pawsey-logo-beige.png
diff --git a/webapp/home/templates/home/snippets/about/about.html b/webapp/home/templates/home/snippets/about/about.html
@@ -1,3 +1,5 @@
+{% load static %}
+
 <h1> About Galaxy Australia </h1>
 
 <p class="lead">
@@ -9,6 +11,12 @@ <h1> About Galaxy Australia </h1>
   <a href="/request">Please just ask!</a>
 </p>
 
+<p>
+  Galaxy Australia is part of the usegalaxy.* initiative. Visit the
+  <a href="https://galaxyproject.org/usegalaxy/" target="_blank">Galaxy Project Community Hub</a>
+  for more information.
+</p>
+
 <hr>
 
 <h3 id="acknowledgement-statement">
@@ -36,43 +44,103 @@ <h3 id="acknowledgement-statement">
 <hr>
 
 <h3 id="operational-partners">
-  Galaxy Australia Operational Partners
+  Operational Partners
 </h3>
 
 <p>
 Australian BioCommons (hosted by
-  <a href="https://www.unimelb.edu.au/" target="_blank">The University of Melbourne</a>)
+  <a href="https://www.unimelb.edu.au/" target="_blank">the University of Melbourne</a>)
   operates Galaxy Australia in collaboration with
   <a href="https://www.qcif.edu.au/" target="_blank">QCIF</a>,
   <a href="https://www.unimelb.edu.au/" target="_blank">The University of Melbourne</a>
   and
-  <a href="https://www.aarnet.edu.au/" target="_blank">AARNet</a>.
-  The service is underpinned by computational resources provided by
-  <a href="https://www.unimelb.edu.au/" target="_blank">The University of Melbourne</a>,
+  <a href="https://www.aarnet.edu.au/" target="_blank">AARNet</a>.<br>
+  This service forms part of the national Australian BioCommons infrastructure.
+</p>
+<div class="container logo">
+    <div class="text-center">
+      <a href="https://www.biocommons.org.au" target="_blank">
+        <img src="{% static 'logos/footer/au-biocommons' %}" />
+      </a>
+      <a href="https://www.unimelb.edu.au" target="_blank">
+        <img src="{% static 'logos/footer/unimelb-2.svg' %}" />
+      </a>
+      <a href="https://www.qcif.edu.au" target="_blank">
+        <img src="{% static 'logos/footer/qcif-2.png' %}" />
+      </a>
+      <a href="https://www.aarnet.edu.au" target="_blank">
+        <img src="{% static 'logos/footer/aarnet.png' %}" />
+      </a>
+    </div>
+</div>
+
+<hr>
+
+<h3 id="computational-partners">
+  Computational Partners
+</h3>
+
+<p>
+Galaxy Australia is underpined by computational resources provided by
+  <a href="https://www.aarnet.edu.au/" target="_blank">AARNet</a>,
+  <a href="https://ardc.edu.au/services/ardc-nectar-research-cloud/" target="_blank">ARDC Nectar Research Cloud</a>,
+  <a href="https://www.unimelb.edu.au/" target="_blank">the University of Melbourne</a>,
   <a href="https://www.qcif.edu.au/" target="_blank">QCIF</a>,
   <a href="https://pawsey.org.au/" target="_blank">Pawsey Supercomputing Research Centre</a>,
   <a href="https://nci.org.au/" target="_blank">National Computational Infrastructure</a>,
-  <a href="https://www.aarnet.edu.au/" target="_blank">AARNet</a>,
-  <a href="https://ardc.edu.au/services/ardc-nectar-research-cloud/" target="_blank">ARDC Nectar Research Cloud</a>,
   and
   <a href="https://azure.microsoft.com/" target="_blank">Microsoft Azure</a>.
 </p>
+<div class="container logo">
+ <div class="text-center">
+   <a href="https://www.aarnet.edu.au" target="_blank">
+      <img src="{% static 'logos/footer/aarnet.png' %}" />
+   </a> 
+   <a href="https://ardc.edu.au/services/ardc-nectar-research-cloud/" target="_blank">
+      <img src="{% static 'logos/footer/ARDC_Nectar_Research_Cloud_RGB.png' %}" />
+   </a>
+   <a href="https://www.unimelb.edu.au" target="_blank">
+      <img src="{% static 'logos/footer/unimelb-2.svg' %}" />
+  </a>
+  <a href="https://www.qcif.edu.au" target="_blank">
+      <img src="{% static 'logos/footer/qcif-2.png' %}" />
+  </a>
+    <a href="https://nci.org.au" target="_blank">
+        <img src="{% static 'logos/footer/NCI_logo.png' %}" />
+    </a>
+    <a href="https://pawsey.org.au" target="_blank">
+        <img src="{% static 'logos/footer/pawsey-logo-beige.png' %}" />
+    </a>
+     <a href="https://azure.microsoft.com/en-au" target="_blank">
+        <img src="{% static 'logos/footer/Microsoft_Azure_Logo.svg.png' %}" />
+      </a>
+    </div>
+  </div>
 
 <hr>
 
-<h3 id="usegalaxy">
-  The usegalaxy.* initiative
+<h3 id="funding">
+  Funding
 </h3>
 
 <p>
-  <strong>Galaxy Australia</strong> is one of the large Galaxy servers that make up the <strong>usegalaxy.*</strong> initiative. Along with <strong>Galaxy Europe</strong> (<a href="https://usegalaxy.eu" target="_blank">usegalaxy.eu</a>) and <strong>Galaxy Main</strong> in the USA (<a href="https://usegalaxy.org" target="_blank">usegalaxy.org</a>), the <strong>usegalaxy.*</strong> servers aim to provide a global publicly available bioinformatics resource, present a similar look and feel, similar installed tool sets and reference data and indices.
-</p>
-
-<p>
-  We do this via a network of globally distributed
-  <a href="https://galaxyproject.org/admin/reference-data-repo/" target="_blank">data servers</a>
+Galaxy Australia is supported by funding from
+  <a href="https://www.unimelb.edu.au/" target="_blank">the University of Melbourne</a>
   and
-  <a href="https://github.com/usegalaxy-au" target="_blank">open-source code</a>.
-  For more information on <strong>usegalaxy.*</strong> see the
-  <a href="https://galaxyproject.org/usegalaxy/" target="_blank">Galaxy Project Community Hub</a>
+  <a href="https://bioplatforms.com/" target="_blank">Bioplatforms Australia</a>.
+  Bioplatforms are enabled by
+  <a href="https://www.education.gov.au/ncris" target="_blank">NCRIS</a>.
 </p>
+<div class="container logo">
+ <div class="text-center">
+   <a href="https://www.unimelb.edu.au" target="_blank">
+      <img src="{% static 'logos/footer/unimelb-2.svg' %}" />
+  </a>
+  <a href="https://bioplatforms.com/" target="_blank">
+      <img src="{% static 'logos/footer/BIO-RGB_Full-POS.png' %}" />
+  </a>
+  <a href="https://www.education.gov.au/ncris" target="_blank">
+      <img src="{% static 'logos/footer/NCRIS-PROVIDER.png' %}" />
+  </a>
+ </div>
+</div>
diff --git a/webapp/home/templates/home/snippets/about/data-privacy.html b/webapp/home/templates/home/snippets/about/data-privacy.html
@@ -100,22 +100,6 @@ <h3>Privacy Policy and Data Collection</h3>
     </ol>
   </li>
 
-  <li>
-    <span class="lead fw-bold">
-      CloudStor app data
-    </span>
-    <ol>
-      <li>
-        If you choose to link Galaxy Australia with
-        <a href="https://cloudstor.aarnet.edu.au/" target="_blank">CloudStor</a>,
-        we retain the CloudStor username and App password you shared with us.
-      </li>
-      <li>
-        This data is transmitted to AARNet when you use the Galaxy Australia - CloudStor integration to upload or download data.
-      </li>
-    </ol>
-  </li>
-
   <li>
     <span class="lead fw-bold">
       Data you upload and share

diff --git a/webapp/home/templates/home/snippets/about/terms-of-service.html b/webapp/home/templates/home/snippets/about/terms-of-service.html
@@ -5,7 +5,7 @@ <h1>Terms of service</h1>
   <a href="https://biotools.readthedocs.io/en/latest/curators_guide.html#workbench" target="_blank">
     workbench
   </a>
-  for manipulating, analysing and interpreting life science data. The service is offered by the
+  for manipulating, analysing and interpreting life science data. The service is offered by
   <a href="https://www.biocommons.org.au/" target="_blank">
     Australian BioCommons
   </a>
@@ -114,7 +114,7 @@ <h1>Terms of service</h1>
 
     <ol>
       <li>
-        The Australian BioCommons reserves the right, without notice, at its sole discretion and without liability,
+        Australian BioCommons reserves the right, without notice, at its sole discretion and without liability,
         <ol>
           <li>
             to alter, delete or block access to content that it deems to be inappropriate, and
@@ -135,7 +135,7 @@ <h1>Terms of service</h1>
 
     <ol>
       <li>
-        These Terms of Use are subject to change by the Australian BioCommons at any time and without notice, other than through posting the updated Terms of Use on the
+        These Terms of Use are subject to change by Australian BioCommons at any time and without notice, other than through posting the updated Terms of Use on the
         <a href="https://usegalaxy.org.au/" target="_blank">https://usegalaxy.org.au/</a>
         website and communicating the update to registered account holders.
       </li>