Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions rcamp/accounts/templates/account-request-intent.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Contact us
</a>
or view our
<a href="https://github.com/ResearchComputing/Research-Computing-User-Tutorials/wiki">
<a href="https://curc.readthedocs.io/en/latest/">
Documentation.
</a>
</div>
Expand Down Expand Up @@ -179,7 +179,7 @@
<div class="checkbox">
<label>
<input id="id_reason_blanca" class="reason-checkbox" type="checkbox" name="reason_blanca" {% if form.reason_blanca.value %}checked{% endif %}>
My research group has purchased nodes in the <strong>Blanca Cluster</strong>, or I plan to purchase Blanca nodes for use with my project. <a href="https://www.colorado.edu/rc/resources/blanca">Learn more about Blanca.</a>
My research group has purchased condo nodes, either on Summit or in the <strong>Blanca Cluster</strong>, or I plan to purchase Blanca nodes for use with my project <em>(Summit condo is no longer available for purchase).</em> <a href="https://www.colorado.edu/rc/resources/blanca">Learn more about Blanca.</a>
</label>
</div>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion rcamp/accounts/templates/account-request-org-select.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>Account Request</h1>

<legend>Please select your organization to begin.</legend>
<div class="alert alert-info" role="alert">
If you're an RMACC user and do not see your organization listed, please follow our documentation for <a href="https://github.com/ResearchComputing/Research-Computing-User-Tutorials/wiki/RMACC-Access-to-Summit">RMACC Access to Summit <span class="glyphicon glyphicon-new-window"></span></a>.
If you're an RMACC user and do not see your organization listed, please follow our documentation for <a href="https://curc.readthedocs.io/en/latest/access/rmacc.html">RMACC Access to Summit <span class="glyphicon glyphicon-new-window"></span></a>.
</div>

<div class="list-group">
Expand Down
4 changes: 2 additions & 2 deletions rcamp/accounts/templates/account-request-verify-csu.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Contact us
</a>
or view our
<a href="https://github.com/ResearchComputing/Research-Computing-User-Tutorials/wiki">
<a href="https://curc.readthedocs.io/en/latest/">
Documentation.
</a>
</div>
Expand Down Expand Up @@ -44,7 +44,7 @@
<div class="form-group">
{% endif %}
<div class="col-sm-12">
<p id="ucb-login-help"><i class="fa fa-info-circle" aria-hidden="true"></i> CSU users use their CSU EID as username. Password is <code>csu_password,duo_key</code> or <code>csu_password,push.</code></p>
<p id="ucb-login-help"><i class="fa fa-info-circle" aria-hidden="true"></i> CSU users use their CSU EID as username. Password is <code>csu_password,duo_key</code> or <code>csu_password,push</code>.</p>
</div>
<label class="col-sm-2 control-label" for="id_username">CSU EID Username</label>
<div class="col-sm-8">
Expand Down
2 changes: 1 addition & 1 deletion rcamp/accounts/templates/account-request-verify-ucb.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Contact us
</a>
or view our
<a href="https://github.com/ResearchComputing/Research-Computing-User-Tutorials/wiki">
<a href="https://curc.readthedocs.io/en/latest/">
Documentation.
</a>
</div>
Expand Down
22 changes: 22 additions & 0 deletions rcamp/projects/templates/project-detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@

{% if user in object.managers.all %}
<legend>References and publications for {{ object.project_id }}</legend>

<div class="mailto-help">
<small>
RMACC Summit must be acknowledged in any published or presented work for which results were obtained using RMACC Summit. Take a look at our <a href="https://www.colorado.edu/rc/resources/summit/citations">citation instructions.</a>
</small>
</div>


<ul class="list-group">
{% for reference in references %}
<a href="{% url 'projects:reference-detail' project_pk=object.pk pk=reference.pk %}" class="list-group-item">
Expand All @@ -100,6 +108,20 @@ <h4 class="list-group-item-heading">Add reference</h4>

{% if user in object.managers.all %}
<legend>Allocations and Requests for {{ object.project_id }}</legend>

<div class="mailto-help">
<small>
When you receive an account you will automatically be assigned a general share for your organization, which is a great place to run smaller jobs or to use to test and benchmark your code. General share users have a lower priority. To receive higher priority, you can apply for an allocation to run on our systems. Questions about projects and allocations?
<a href="mailto:rc-help@colorado.edu?subject=Question%20About%20Project%20Creation">
Contact us
</a>
or view our
<a href="https://www.colorado.edu/rc/userservices/allocations">
allocations documentation.
</a>
</small>
</div>

<ul class="list-group">
{% for allocation_request in allocation_requests %}
<a href="{% url 'projects:allocation-request-detail' project_pk=object.pk pk=allocation_request.pk %}" class="list-group-item">
Expand Down
14 changes: 14 additions & 0 deletions rcamp/projects/templates/project-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ <h1>My Projects</h1>
</ol>

<legend>My Projects</legend>

<div class="mailto-help">
<small>
Projects are how you manage Allocations, membership, requests, and references for your usage of Research Computing resources. Questions about projects and allocations?
<a href="mailto:rc-help@colorado.edu?subject=Question%20About%20Project%20Creation">
Contact us
</a>
or view our
<a href="https://www.colorado.edu/rc/userservices/allocations">
allocations documentation.
</a>
</small>
</div>

<ul class="list-group">
{% for project in object_list %}
<a href="{% url 'projects:project-detail' project.pk %}" class="list-group-item">
Expand Down