Skip to content

Issues/307 #331

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.

Sign up for GitHub

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

Merged
zebulasampedro merged 4 commits into from
Aug 29, 2018
Merged

Issues/307 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7652c27
Starting to redesign user-facing pages.
zebulasampedro Aug 28, 2018
1c3428b
Redirect authed users to project management page. Closes #310, closes…
zebulasampedro Aug 29, 2018
c7bb670
Revised placement and content on jumbotrons. Closes #306.
zebulasampedro Aug 29, 2018
04a6f70
Finished minimizing jumbotron use and content. Closes #307.
zebulasampedro Aug 29, 2018
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
33 changes: 0 additions & 33 deletions rcamp/rcamp/accounts/templates/account-request-intent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,6 @@
<link href="/static/css/account-request.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Account Request</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Request an account with University of Colorado Boulder Research Computing.</p>
{% endblock %}
{% block jumbotron_button %}
<p><a data-toggle="modal" href="#helpmodal"
class="btn btn-primary btn-lg" role="button">Definitions &amp; Form Help &raquo;</a></p>
{% endblock %}

{% block modal_title %}
<h4 class="modal-title">Definitions &amp; Form Help</h4>
{% endblock %}
{% block modal_body %}
<ul class="list-group">
<li class="list-group-item">
<strong>Summit supercomputing cluster (2016)</strong>
<p>Summit is a heterogeneous supercomputing cluster based primarily on the Intel Xeon "Haswell" CPU, with secondary NVidia Tesla K80 and high-memory resources and, in the future, an Intel Xeon Phi "knights landing" MIC resource. It replaces Janus as Research Computing's flagship computational resource. All nodes sit on a first-generation Intel Omni-Path Architecture interconnect which also provides access to an IBM GPFS Parallel scratch file system. <a href="https://www.colorado.edu/rc/resources/summit">Learn more about Summit.</a></p>
</li>
<li class="list-group-item">
<strong>Blanca "condo" compute cluster</strong>
<p>The Research Computing Condo Computing service offers researchers the opportunity to purchase and own compute nodes that will be operated as part of the Blanca compute cluster. The aggregate cluster is made available to all condo partners while maintaining priority for the owner of each node. <a href="https://www.colorado.edu/rc/resources/blanca">Learn more about Blanca.</a></p>
</li>
<li class="list-group-item">
<strong>PetaLibrary/active disk storage</strong>
<p>The PetaLibrary/active storage service is mounted at <code>/work/</code> on all Research Computing computational systems. This storage may be used by compute workloads, but it is not designed to be performant under I/O-intensive applications or parallel writes. <a href="https://www.colorado.edu/rc/resources/petalibrary">Learn more about PetaLibrary.</a></p>
</li>
<li class="list-group-item">
<strong>PetaLibrary/archive long-term disk+tape storage</strong>
<p>PetaLibrary/archive is a hierarchical storage system that dynamically and simultaneously manages data on both disk and tape storage systems while presenting all data as part of a single, unified filesystem namespace. This provides good performance when accessing frequently-used data while remaining cost-effective for storing large quantities of archive data. <a href="https://www.colorado.edu/rc/resources/petalibrary">Learn more about PetaLibrary.</a></p>
</li>
</ul>
{% endblock %}

{% block container %}
<div class="mailto-help">
Questions about the account request process?
Expand Down
24 changes: 6 additions & 18 deletions rcamp/rcamp/accounts/templates/account-request-org-select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,13 @@
<link href="/static/css/account-request.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Account Request</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Request a Research Computing account.</p>
{% endblock %}

{% block jumbotron_button %}
<p><a data-toggle="modal" href="#helpmodal"
class="btn btn-primary btn-lg" role="button">Terms &amp; Conditions &raquo;</a></p>
{% endblock %}

{% block modal_title %}
<h2 class="modal-title">Terms &amp; Conditions</h2>
{% endblock %}

{% block modal_body %}
{% include "terms-and-conditions.html" %}
{% endblock %}

{% block container %}
<div class="row">
<div class="jumbotron text-center">
<h1>Account Request</h1>
<p>Request a Research Computing account.</p>
</div>
</div>

<legend>Please select your organization to begin.</legend>
<div class="alert alert-info" role="alert">
Expand Down
22 changes: 11 additions & 11 deletions rcamp/rcamp/accounts/templates/account-request-review.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<link href="/static/css/org-select.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Account Request Submitted</h1>{% endblock %}
{% block jumbotron_subheading %}
{% if account_request.status != 'a' %}
<p>We will review your request within 7 days.</p>
{% else %}
<p>Welcome to Research Computing!</p>
{% endif %}
{% endblock %}
{% block jumbotron_button %}
{% endblock %}

{% block container %}
<div class="row">
<div class="jumbotron text-center">
<h1>Account Request Submitted</h1>
{% if account_request.status != 'a' %}
<p>We will review your request within 7 days.</p>
{% else %}
<p>Welcome to Research Computing!</p>
{% endif %}
</div>
</div>

<div class="mailto-help">
Questions about your request?
<a href="mailto:rc-help@colorado.edu?subject=Question%20About%20Submitted%20Request%20(%23{{account_request.id}})">
Expand Down
25 changes: 0 additions & 25 deletions rcamp/rcamp/accounts/templates/account-request-verify-csu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,6 @@
<link href="/static/css/account-request.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Account Request</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Request an account with University of Colorado Boulder Research Computing.</p>
{% endblock %}
{% block jumbotron_button %}
<p><a data-toggle="modal" href="#helpmodal"
class="btn btn-primary btn-lg" role="button">Definitions &amp; Form Help &raquo;</a></p>
{% endblock %}

{% block modal_title %}
<h4 class="modal-title">Definitions &amp; Form Help</h4>
{% endblock %}
{% block modal_body %}
<ul class="list-group">
<li class="list-group-item">
<strong>Organization Credentials</strong>
<p>The request form requires that you successfully authenticate against
the organization with which you are affiliated to verify your identity.
The organization credentials should be the username/password pair you
to access your organization's resources.
</p>
</li>
</ul>
{% endblock %}

{% block container %}
<div class="mailto-help">
Questions about the account request process?
Expand Down
25 changes: 0 additions & 25 deletions rcamp/rcamp/accounts/templates/account-request-verify-ucb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,6 @@
<link href="/static/css/account-request.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Account Request</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Request an account with University of Colorado Boulder Research Computing.</p>
{% endblock %}
{% block jumbotron_button %}
<p><a data-toggle="modal" href="#helpmodal"
class="btn btn-primary btn-lg" role="button">Definitions &amp; Form Help &raquo;</a></p>
{% endblock %}

{% block modal_title %}
<h4 class="modal-title">Definitions &amp; Form Help</h4>
{% endblock %}
{% block modal_body %}
<ul class="list-group">
<li class="list-group-item">
<strong>Organization Credentials</strong>
<p>The request form requires that you successfully authenticate against
the organization with which you are affiliated to verify your identity.
The organization credentials should be the username/password pair you
to access your organization's resources.
</p>
</li>
</ul>
{% endblock %}

{% block container %}
<div class="mailto-help">
Questions about the account request process?
Expand Down
9 changes: 9 additions & 0 deletions rcamp/rcamp/lib/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.shortcuts import redirect


def handler404(request):
Expand All @@ -14,3 +15,11 @@ def handler500(request):
context_instance=RequestContext(request))
response.status_code = 500
return response

def index_view(request):
if request.user.is_authenticated():
return redirect('projects:project-list')

context_instance = RequestContext(request)
response = render_to_response('index.html', {}, context_instance=context_instance)
return response
15 changes: 7 additions & 8 deletions rcamp/rcamp/projects/templates/allocation-request-create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
<link href="/static/css/projects.css" type="text/css" media="all" rel="stylesheet">
{% endblock %}

{% block jumbotron_heading %}<h1>Request an allocation</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Request a compute time allocation for {{ project.project_id }}</p>
{% endblock %}

{% block jumbotron_button %}
{% endblock %}

{% block container %}
<div class="row">
<div class="jumbotron text-center">
<h1>Request an allocation</h1>
<p>Request a compute time allocation for {{ project.project_id }}</p>
</div>
</div>

<div class="row">
<ol class="breadcrumb">
<li><a href="{% url 'index' %}">Index</a></li>
Expand Down
5 changes: 0 additions & 5 deletions rcamp/rcamp/projects/templates/allocation-request-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<link href="/static/css/projects.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Allocation Requests for {{ project.project_id }}</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Review your allocation requests.</p>
{% endblock %}

{% block container %}
<div class="row">
<ol class="breadcrumb">
Expand Down
12 changes: 7 additions & 5 deletions rcamp/rcamp/projects/templates/project-create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
<link href="/static/css/selector.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Create a new project</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Create a new Research Computing project.</p>
{% endblock %}

{% block container %}
<div class="row">
<div class="jumbotron text-center">
<h1>Create a new project</h1>
<p>Create a new Research Computing project.</p>
</div>
</div>

<ol class="breadcrumb">
<li><a href="{% url 'index' %}">Index</a></li>
<li><a href="{% url 'projects:project-list' %}">My Projects</a></li>
Expand Down
5 changes: 0 additions & 5 deletions rcamp/rcamp/projects/templates/project-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<link href="/static/css/projects.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>My Projects</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Review, manage, and request projects.</p>
{% endblock %}

{% block container %}
<div class="row">

Expand Down
5 changes: 0 additions & 5 deletions rcamp/rcamp/projects/templates/project-edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
<link href="/static/css/selector.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>Edit project</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Edit project {{ object.project_id }}</p>
{% endblock %}

{% block container %}
<div class="mailto-help">
Questions about editing your project?
Expand Down
12 changes: 7 additions & 5 deletions rcamp/rcamp/projects/templates/project-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
<link href="/static/css/projects.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>My Projects</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Review, manage, and request projects.</p>
{% endblock %}

{% block container %}
<div class="row">
<div class="jumbotron text-center">
<h1>My Projects</h1>
<p>Review, manage, and request projects.</p>
</div>
</div>

<div class="row">

<ol class="breadcrumb">
Expand Down
12 changes: 7 additions & 5 deletions rcamp/rcamp/projects/templates/reference-create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
<link href="/static/css/projects.css" type="text/css" media="all" rel="stylesheet">
{% endblock %}

{% block jumbotron_heading %}<h1>Add a new reference</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Add a new reference to project {{ project.project_id }}</p>
{% endblock %}

{% block container %}
<div class="row">
<div class="jumbotron text-center">
<h1>Add a new reference</h1>
<p>Add a new reference to project {{ project.project_id }}</p>
</div>
</div>

<ol class="breadcrumb">
<li><a href="{% url 'index' %}">Index</a></li>
<li><a href="{% url 'projects:project-list' %}">My Projects</a></li>
Expand Down
5 changes: 0 additions & 5 deletions rcamp/rcamp/projects/templates/reference-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<link href="/static/css/projects.css" rel="stylesheet"/>
{% endblock %}

{% block jumbotron_heading %}<h1>References for {{ project.project_id }}</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Review and manage your references.</p>
{% endblock %}

{% block container %}
<div class="row">
<ol class="breadcrumb">
Expand Down
5 changes: 0 additions & 5 deletions rcamp/rcamp/projects/templates/reference-edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<link href="/static/css/projects.css" type="text/css" media="all" rel="stylesheet">
{% endblock %}

{% block jumbotron_heading %}<h1>Edit reference</h1>{% endblock %}
{% block jumbotron_subheading %}
<p>Edit existing reference for project {{ project.project_id }}</p>
{% endblock %}

{% block container %}
<div class="mailto-help">
Questions about references?
Expand Down
Loading