Skip to content

Commit

Permalink
Merge branch 'main' of github.com:usegalaxy-au/galaxy-media-site
Browse files Browse the repository at this point in the history
  • Loading branch information
neoformit committed Aug 28, 2023
2 parents 30ad7d4 + 0778e5d commit 4021193
Show file tree
Hide file tree
Showing 6 changed files with 227 additions and 144 deletions.
2 changes: 2 additions & 0 deletions webapp/home/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ class CellRangerRequestForm(BaseAccessRequestForm):
name = forms.CharField()
email = forms.EmailField(validators=[validators.institutional_email])
institution = forms.CharField()
agree_terms = forms.BooleanField()
agree_usage = forms.BooleanField()


ACCESS_FORMS = {
Expand Down
64 changes: 1 addition & 63 deletions webapp/home/templates/home/requests/access/alphafold.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,69 +33,7 @@ <h2> Galaxy Australia AlphaFold 2 Access Request </h2>

{{ form.non_field_errors }}

<div class="row mb-10">
<div class="col-sm-12">
<label for="nameInput" class="form-label">Name</label>
{{ form.name.errors }}
<input class="form-control" id="nameInput" type="text" name="name"
value="{{form.name.value|default_if_none:''}}" required
>
</div>

<div class="col-sm-12">
<label for="emailInput" class="form-label">Galaxy account email</label>
{{ form.email.errors }}

<input class="form-control" id="emailInput" type="email" name="email"
value="{{form.email.value|default_if_none:''}}"
aria-describedby="emailHelp"
onclick="$('#emailHelp').show();"
required
autocomplete="off"
>

<div
class="form-text"
id="emailHelp"
style="display: none;"
data-bs-toggle="tooltip"
data-bs-placement="bottom"
data-bs-title='Go to User > Preferences > Manage information to see your registered email address on usegalaxy.org.au'
>
<div class="alert alert-danger">
<ul style="margin: 0;">
<li>
Your Galaxy Australia account must be registered to this email
for us to provide access
</li>
<li>
Access will be provided only to recognised
<a href="/institutions">
Australian institution email addresses
</a>
</li>
<ul>
</div>
</div>
</div>

<div class="col-sm-12">
<label for="institutionInput" class="form-label">Institution</label>
{{ form.institution.errors }}
<input
class="form-control"
id="institutionInput"
name="institution"
type="text"
value="{{form.institution.value|default_if_none:''}}"
aria-describedby="institutionHelp"
required
/>
<div class="form-text" id="institutionHelp">
Your department, organization or research institute
</div>
</div>
</div>
{% include 'home/requests/access/snippets/personal-details-fields.html' %}

<div class="row mb-10">
<p class="lead">
Expand Down
129 changes: 129 additions & 0 deletions webapp/home/templates/home/requests/access/cellranger.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{% extends 'home/header.html' %}

{% load static %}


{% block head %}
<link rel="stylesheet" href="{% static 'home/css/requests.css' %}">
<link rel="stylesheet" href="{% static 'home/css/request-form.css' %}">
{% endblock %}


{% block content %}
<main class="container mt-4">

<div class="mb-10">
<h2> Galaxy Australia CellRanger Access Request </h2>
<small>
<a href="/request">
<span class="material-icons">arrow_back</span>
Back to support menu
</a>
</small>
</div>

<p class="lead">
Cell Ranger is a set of analysis pipelines, from 10X Genomics, that process Chromium single cell data to align reads, generate feature-barcode matrices, perform clustering and other secondary analysis.
</p>

<p>
The following Cell Ranger tools are available on Galaxy Australia:
</p>

<p>
<code>cellranger mkfastq</code>
demultiplexes raw base call (BCL) files generated by Illumina sequencers into FASTQ files. It is a wrapper around Illumina's bcl2fastq, with additional features that are specific to 10x Genomics libraries and a simplified sample sheet format.
</p>

<p>
<code>cellranger count</code>
takes FASTQ files from cellranger mkfastq and performs alignment, filtering, barcode counting, and UMI counting. It uses the Chromium cellular barcodes to generate feature-barcode matrices, determine clusters, and perform gene expression analysis. The count pipeline can take input from multiple sequencing runs on the same GEM well. cellranger count also processes Feature Barcode data alongside Gene Expression reads.
</p>

<p>
<code>cellranger mkgft</code>
a simple utility to filter genes based on their key-value pairs in the GTF attribute column.
</p>

<p class="mb-10">
Cell Ranger is available on Galaxy Australia for Australian researchers. Please apply for access, using your institutional email.
</p>

<form method="post">

{% csrf_token %}

{{ form.non_field_errors }}

{% include 'home/requests/access/snippets/personal-details-fields.html' %}

<div class="row mb-10">
<div class="col-sm-12 mb-5">
<p>
The
<a
href="https://www.10xgenomics.com/end-user-software-license-agreement"
target="_blank"
>
CellRanger End User Licence Agreement
</a>
must be read and acknowledged prior to access being provisioned.
</p>
{{ form.agree_terms.errors }}
<input
class="form-check-input"
id="termsInput"
name="agree_terms"
type="checkbox"
{% if form.agree_terms.value %}checked{% endif %}
/>
<label for="termsInput" class="form-check-label">I accept the terms of the license agreement</label>
</div>

<div class="col-sm-12">
<p>
The use of Cell Ranger is for academic or non-commercial research
purposes. You must agree to this prior to access being provisioned.
</p>
{{ form.agree_usage.errors }}
<input
class="form-check-input"
id="usageInput"
name="agree_usage"
type="checkbox"
{% if form.agree_usage.value %}checked{% endif %}
/>
<label for="usageInput" class="form-check-label">I agree to only use CellRanger for academic or non-commercial research purposes</label>
</div>
</div>

<div class="container mb-10">
<b>Privacy Collection Notice</b>: by completing this form you agree that your
responses will be provided to the Australian BioCommons and Galaxy
Australia and will be used solely for the purposes of determining
suitability for access to the Australian CellRanger Service. Your
responses will be protected against unauthorised access and use; providing
your name is required to enable any follow ups. For more information,
please see the
<a href="https://www.biocommons.org.au/privacy/">
BioCommons Privacy Statement</a>.
</div>

<div class="row mb-10">
<div class="col text-center">
<button class='ga-btn' type="submit"> Submit </button>
</div>
</div>
</form>

</main>
{% endblock %}


{% block script %}
<script src="{% static 'home/js/forms.js' %}"></script>
{% endblock %}


{% block onload %}
{% endblock %}
64 changes: 1 addition & 63 deletions webapp/home/templates/home/requests/access/fgenesh.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,69 +37,7 @@ <h2> Galaxy Australia FGENESH++ Access Request </h2>

{{ form.non_field_errors }}

<div class="row mb-5">
<div class="col-sm-12">
<label for="nameInput" class="form-label">Name</label>
{{ form.name.errors }}
<input class="form-control" id="nameInput" type="text" name="name"
value="{{form.name.value|default_if_none:''}}" required
>
</div>

<div class="col-sm-12">
<label for="emailInput" class="form-label">Galaxy account email</label>
{{ form.email.errors }}

<input class="form-control" id="emailInput" type="email" name="email"
value="{{form.email.value|default_if_none:''}}"
aria-describedby="emailHelp"
onclick="$('#emailHelp').show();"
required
autocomplete="off"
>

<div
class="form-text"
id="emailHelp"
style="display: none;"
data-bs-toggle="tooltip"
data-bs-placement="bottom"
data-bs-title='Go to User > Preferences > Manage information to see your registered email address on usegalaxy.org.au'
>
<div class="alert alert-danger">
<ul style="margin: 0;">
<li>
Your Galaxy Australia account must be registered to this email
for us to provide access
</li>
<li>
Access will be provided only to recognised
<a href="/institutions">
Australian institution email addresses
</a>
</li>
<ul>
</div>
</div>
</div>

<div class="col-sm-12">
<label for="institutionInput" class="form-label">Institution</label>
{{ form.institution.errors }}
<input
class="form-control"
id="institutionInput"
name="institution"
type="text"
value="{{form.institution.value|default_if_none:''}}"
aria-describedby="institutionHelp"
required
/>
<div class="form-text" id="institutionHelp">
Your department, organization or research institute
</div>
</div>
</div>
{% include 'home/requests/access/snippets/personal-details-fields.html' %}

<hr>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<div class="row mb-10">
<div class="col-sm-12">
<label for="nameInput" class="form-label">Name</label>
{{ form.name.errors }}
<input class="form-control" id="nameInput" type="text" name="name"
value="{{form.name.value|default_if_none:''}}" required
>
</div>

<div class="col-sm-12">
<label for="emailInput" class="form-label">Galaxy account email</label>
{{ form.email.errors }}
<input class="form-control" id="emailInput" type="email" name="email"
value="{{form.email.value|default_if_none:''}}"
aria-describedby="emailHelp"
onfocus="$('#emailHelp').show();"
autocomplete="off"
required
>
<div
class="form-text"
id="emailHelp"
style="display: none;"
>
<div class="alert alert-danger">
<ul style="margin: 0;">
<li>
Your Galaxy Australia account must be registered to this email
for us to provide access
</li>
<li>
Go to User > Preferences > Manage information to see your registered
email address on usegalaxy.org.au
</li>
<li>
Access will be provided only to recognised
<a href="/institutions">
Australian institution email addresses
</a>
</li>
<ul>
</div>
</div>
</div>

<div class="col-sm-12">
<label for="institutionInput" class="form-label">Institution</label>
{{ form.institution.errors }}
<input
class="form-control"
id="institutionInput"
name="institution"
type="text"
value="{{form.institution.value|default_if_none:''}}"
aria-describedby="institutionHelp"
required
/>
<div class="form-text" id="institutionHelp">
Your department, organization or research institute
</div>
</div>
</div>
Loading

0 comments on commit 4021193

Please sign in to comment.