Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logo block and about page updates #148

Merged
merged 18 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added webapp/home/static/logos/footer/NCI_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 77 additions & 17 deletions webapp/home/templates/home/snippets/about/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ <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/">Galaxy Project Community Hub for more information.</a>
</p>

<hr>

<h3 id="acknowledgement-statement">
Expand Down Expand Up @@ -36,43 +40,99 @@ <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>,
</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://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-grayscalelogo-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>
PatCapon39 marked this conversation as resolved.
Show resolved Hide resolved

<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 '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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand All @@ -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>
Expand Down
56 changes: 12 additions & 44 deletions webapp/home/templates/home/snippets/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,14 @@

<div class="container logo">
<div class="text-center">
<a href="https://www.biocommons.org.au" target="_blank">
<img src="{% static 'logos/footer/au-biocommons-2.png' %}" />
<a href="https://www.education.gov.au/ncris" target="_blank">
<img src="{% static 'logos/footer/NCRIS-PROVIDER.png' %}" />
</a>

<a href="https://www.qcif.edu.au" target="_blank">
<img src="{% static 'logos/footer/qcif-2.png' %}" />
</a>

<a href="https://www.unimelb.edu.au" target="_blank">
<img src="{% static 'logos/footer/unimelb-2.svg' %}" />
</a>

<a href="https://www.aarnet.edu.au" target="_blank">
<img src="{% static 'logos/footer/aarnet.png' %}" />
</a>
</div>

<div class="text-center second">
<a href="https://www.uq.edu.au" target="_blank">
<img src="{% static 'logos/footer/uq-grayscale.png' %}" />
</a>

<a href="https://ardc.edu.au" target="_blank">
<img src="{% static 'logos/footer/ardc-grayscale.png' %}" />
<a href="https://bioplatforms.com/" target="_blank">
<img src="{% static 'BIO-RGB_Full-POS.png' %}" />
PatCapon39 marked this conversation as resolved.
Show resolved Hide resolved
</a>

<a href="https://bioplatforms.com" target="_blank">
<img src="{% static 'logos/footer/bpa-grayscale.png' %}" />
</a>

<a href="https://nci.org.au" target="_blank">
<img src="{% static 'logos/footer/nci-grayscale.png' %}" />
</a>

<a href="https://pawsey.org.au" target="_blank">
<img src="{% static 'logos/footer/pawsey-grayscale.png' %}" />
</a>

<a href="https://www.dese.gov.au/ncris" target="_blank">
<img src="{% static 'logos/footer/ncris-grayscale.png' %}" />
</a>

<a href="https://www.qld.gov.au" target="_blank">
<img src="{% static 'logos/footer/qld-gov.png' %}" />
<a href="https://www.biocommons.org.au/" target="_blank">
<img src="{% static 'Australian-Biocommons-Logo-Tagline-Infrastructure-RGB-no-padding.png' %}" />
neoformit marked this conversation as resolved.
Show resolved Hide resolved
</a>
</div>
</div>
Expand All @@ -78,14 +42,15 @@ <h6>SITE LINKS</h6>
<div class="col-md-6">
<small>
<a href="/request">Support</a> <br>
<a href="/about">About</a>a> <br>
PatCapon39 marked this conversation as resolved.
Show resolved Hide resolved
<a href="/about#acknowledgement-statement">Acknowledging Galaxy Australia</a> <br>
<a href="/about#feature-catalogue">Feature catalogue</a> <br>
<a href="/about#terms-of-service">Terms and conditions</a>
<a href="/about#feature-catalogue">Feature catalogue</a>
</small>
</div>

<div class="col-md-6">
<small>
<a href="/about#terms-of-service">Terms and conditions</a> <br>
<a href="/about#data-privacy">Privacy and data collection</a> <br>
<a href="/about#acceptable-use">Acceptable use</a> <br>
<a href="/about#service-levels">Service levels</a>
Expand All @@ -100,6 +65,7 @@ <h6>SITE LINKS</h6>
<h6>ACKNOWLEDGEMENTS</h6>
<p class="tight">
<small>
Galaxy Australia acknowledges operational and computational support from its <a href="/about#operational-partners"> partner organisations </a>. <br>
PatCapon39 marked this conversation as resolved.
Show resolved Hide resolved
We acknowledge and pay respect to the Elders and Traditional Owners
of the lands on which our partner organisations stand.
</small>
Expand All @@ -119,6 +85,8 @@ <h6>CONNECT</h6>

<a href="https://twitter.com/galaxyaustralia" target="_blank">
<i class="fab fa-twitter"></i>
<a href="https://www.linkedin.com/products/australianbiocommons-galaxyaustralia/" target="_blank">
<i class="fab fa-linkedin"></i>
</a>
</p>
</div>
Expand Down
Loading