diff --git a/webapp/home/static/home/css/main.css b/webapp/home/static/home/css/main.css index f052e6ed..fb6955e6 100644 --- 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 new file mode 100644 index 00000000..17ffb2a1 Binary files /dev/null and b/webapp/home/static/logos/footer/ARDC_Nectar_Research_Cloud_RGB.png differ diff --git a/webapp/home/static/logos/footer/Australian-Biocommons-Logo-Tagline-Infrastructure-RGB-no-padding.png b/webapp/home/static/logos/footer/Australian-Biocommons-Logo-Tagline-Infrastructure-RGB-no-padding.png new file mode 100644 index 00000000..bba07db8 Binary files /dev/null and b/webapp/home/static/logos/footer/Australian-Biocommons-Logo-Tagline-Infrastructure-RGB-no-padding.png differ diff --git a/webapp/home/static/logos/footer/BIO-RGB_Full-POS.png b/webapp/home/static/logos/footer/BIO-RGB_Full-POS.png new file mode 100644 index 00000000..dc11f78d Binary files /dev/null and b/webapp/home/static/logos/footer/BIO-RGB_Full-POS.png differ diff --git a/webapp/home/static/logos/footer/Microsoft_Azure_Logo.svg.png b/webapp/home/static/logos/footer/Microsoft_Azure_Logo.svg.png new file mode 100644 index 00000000..bc5dbc54 Binary files /dev/null and b/webapp/home/static/logos/footer/Microsoft_Azure_Logo.svg.png differ diff --git a/webapp/home/static/logos/footer/NCI_logo.png b/webapp/home/static/logos/footer/NCI_logo.png new file mode 100644 index 00000000..90139ddb Binary files /dev/null and b/webapp/home/static/logos/footer/NCI_logo.png differ diff --git a/webapp/home/static/logos/footer/NCRIS-PROVIDER.png b/webapp/home/static/logos/footer/NCRIS-PROVIDER.png new file mode 100644 index 00000000..8dae190f Binary files /dev/null and b/webapp/home/static/logos/footer/NCRIS-PROVIDER.png differ diff --git a/webapp/home/static/logos/footer/pawsey-logo-beige.png b/webapp/home/static/logos/footer/pawsey-logo-beige.png new file mode 100644 index 00000000..b3d5a92a Binary files /dev/null and b/webapp/home/static/logos/footer/pawsey-logo-beige.png differ diff --git a/webapp/home/templates/home/snippets/about/about.html b/webapp/home/templates/home/snippets/about/about.html index b4000485..cdc5e11e 100644 --- a/webapp/home/templates/home/snippets/about/about.html +++ b/webapp/home/templates/home/snippets/about/about.html @@ -1,3 +1,5 @@ +{% load static %} +

About Galaxy Australia

@@ -9,6 +11,12 @@

About Galaxy Australia

Please just ask!

+

+ Galaxy Australia is part of the usegalaxy.* initiative. Visit the + Galaxy Project Community Hub + for more information. +

+

@@ -36,43 +44,103 @@

- Galaxy Australia Operational Partners + Operational Partners

Australian BioCommons (hosted by - The University of Melbourne) + the University of Melbourne) operates Galaxy Australia in collaboration with QCIF, The University of Melbourne and - AARNet. - The service is underpinned by computational resources provided by - The University of Melbourne, + AARNet.
+ This service forms part of the national Australian BioCommons infrastructure. +

+ + +
+ +

+ Computational Partners +

+ +

+Galaxy Australia is underpined by computational resources provided by + AARNet, + ARDC Nectar Research Cloud, + the University of Melbourne, QCIF, Pawsey Supercomputing Research Centre, National Computational Infrastructure, - AARNet, - ARDC Nectar Research Cloud, and Microsoft Azure.

+
-

- The usegalaxy.* initiative +

+ Funding

- Galaxy Australia is one of the large Galaxy servers that make up the usegalaxy.* initiative. Along with Galaxy Europe (usegalaxy.eu) and Galaxy Main in the USA (usegalaxy.org), the usegalaxy.* 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. -

- -

- We do this via a network of globally distributed - data servers +Galaxy Australia is supported by funding from + the University of Melbourne and - open-source code. - For more information on usegalaxy.* see the - Galaxy Project Community Hub + Bioplatforms Australia. + Bioplatforms are enabled by + NCRIS.

+ diff --git a/webapp/home/templates/home/snippets/about/data-privacy.html b/webapp/home/templates/home/snippets/about/data-privacy.html index 41538976..f8800ad6 100644 --- a/webapp/home/templates/home/snippets/about/data-privacy.html +++ b/webapp/home/templates/home/snippets/about/data-privacy.html @@ -100,22 +100,6 @@

Privacy Policy and Data Collection

-
  • - - CloudStor app data - -
      -
    1. - If you choose to link Galaxy Australia with - CloudStor, - we retain the CloudStor username and App password you shared with us. -
      2. -
    2. - This data is transmitted to AARNet when you use the Galaxy Australia - CloudStor integration to upload or download data. -
      3. -
    -
    • -
  • 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 index ecb786ef..b25e36b0 100644 --- 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 @@

    Terms of service

    workbench - 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 Australian BioCommons @@ -114,7 +114,7 @@

    Terms of service

    1. - 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,
      1. to alter, delete or block access to content that it deems to be inappropriate, and @@ -135,7 +135,7 @@

        Terms of service

        1. - 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 https://usegalaxy.org.au/ website and communicating the update to registered account holders.
          2. diff --git a/webapp/home/templates/home/snippets/footer.html b/webapp/home/templates/home/snippets/footer.html index 5d962966..6cfbc0b1 100644 --- a/webapp/home/templates/home/snippets/footer.html +++ b/webapp/home/templates/home/snippets/footer.html @@ -11,50 +11,14 @@ @@ -63,7 +27,7 @@