Skip to content

Commit

Permalink
Update other project and experiment links
Browse files Browse the repository at this point in the history
  • Loading branch information
@uoa-noel
uoa-noel committed Jul 4, 2024
1 parent 51e2a3b commit aa5b4ed
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 42 deletions.
5 changes: 3 additions & 2 deletions tardis/apps/projects/templates/ajax/owned_proj_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
<div class="row">
<div class="col-md-8 px-1 pb-1">
<input type="hidden" class="proj-index" value="{{ forloop.counter }}">
<a class="explink"
href="{% url 'tardis.apps.projects.view_project' proj.id %}">{{ proj.name }}</a>
<span class="card-title">{{ proj.name }}</span>
</div>
<div class="col">
<div class="projectbadges" id="badge-{{proj.id}}"></div>
Expand All @@ -36,6 +35,8 @@
</div>
</div>
</div>
<a class="btn btn-light mt-3 w-100"
href="{% url 'tardis.apps.projects.view_project' proj.id %}">View Project</a>
</div>
</div>
{% empty %}
Expand Down
9 changes: 4 additions & 5 deletions tardis/apps/projects/templates/my_projects.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@

{% block content %}

<div id="content" class="container-fluid">
<main id="content" class="container">
<div class="row">
<div class="col-md-12">
<h3 class="d-block d-sm-none">Projects</h3>
<div class="col-md-12 page-header">
{% if not disable_creation_forms %}
<div class="pull-right pb-1">
{% if perms.tardis_portal.add_project %}
Expand All @@ -25,7 +24,7 @@ <h3 class="d-block d-sm-none">Projects</h3>
</div> <!-- class="pull-right" -->
{% endif %}
<div class="pull-left">
<h3 class="d-none d-sm-block" style="text-align: center">Projects</h3>
<h1 class="mb-1">Projects</h1>
</div>
</div> <!-- class="col-md-12" -->
</div> <!-- class="row" -->
Expand Down Expand Up @@ -58,7 +57,7 @@ <h4><strong>{{ owned_projects.count }}</strong>
{% endif %}
</div> <!-- class="col-md-12" -->
</div> <!-- class="row" -->
</div> <!-- id="content" -->
</main> <!-- id="content" -->

<input type="hidden" id="proj-expand-accordion" value="{{ proj_expand_accordion }}">
{% render_bundle 'my_projects' %}
Expand Down
17 changes: 7 additions & 10 deletions tardis/apps/projects/templates/public_projects.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@

{% block content %}

<div id="content" class="container-fluid">
<main id="content" class="container">
<div class="row">
<div class="col-md-12">
<h3 class="d-block d-sm-none">Projects</h3>
<div class="pull-left">
<h3 class="d-none d-sm-block" style="text-align: center">Projects</h3>
</div>
<div class="col-md-12 page-header">
<h1 class="mb-1">Projects</h1>
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -43,9 +40,7 @@ <h4><strong>{{ public_projects.count }}</strong>
data-bs-toggle="collapse" onclick="$('#collapse{{proj.id}}').collapse('toggle');">
<div class="row">
<div class="col-md-8 px-1 pb-1">
<a class="card-title projlink"
href="{% url 'tardis.apps.projects.view_project' proj.id %}">{{ proj.name }}
</a>
<span class="card-title">{{ proj.name }}</span>
</div>
<div class="col">
<div class="projectbadges" id="badge-{{proj.id}}"></div>
Expand Down Expand Up @@ -119,14 +114,16 @@ <h4><strong>{{ public_projects.count }}</strong>
</div>
</div>
</div>
<a class="btn btn-light mt-3 w-100"
href="{% url 'tardis.apps.projects.view_project' proj.id %}">View Project</a>
</div>
</div>
{% endfor %}
</div>
{% endif %}
</div>
</div>
</div>
</main>
<script type="text/javascript">
$(function() {
$("#projects .accordion-body").collapse({parent:"#projects", toggle: true});
Expand Down
4 changes: 2 additions & 2 deletions tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
<div class="row">
<div class="col-md-8 px-1 pb-1">
<input type="hidden" class="exp-index" value="{{ forloop.counter }}">
<a class="explink"
href="{% url 'tardis_portal.view_experiment' exp.id %}">{{ exp.title }}</a>
<span class="card-title">{{ exp.title }}</span>
</div>
<div class="col">
<div class="badges" id="badge-{{exp.id}}"></div>
Expand All @@ -47,6 +46,7 @@
</div>
</div>
</div>
<a class="btn btn-light mt-3 w-100" href="{% url 'tardis_portal.view_experiment' exp.id %}">View Experiment</a>
</div>
</div>
{% empty %}
Expand Down
10 changes: 5 additions & 5 deletions tardis/tardis_portal/templates/tardis_portal/my_data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

{% block content %}

<div id="content" class="container-fluid">
<main id="content" class="container">
<div class="row">
<div class="col-md-12">
<h3 class="d-block d-sm-none">Experiments</h3>
<div class="col-md-12 page-header">
<!-- <h1 class="d-block d-sm-none">Experiments</h1> -->
{% if not disable_creation_forms %}
<div class="pull-right pb-1">
{% if perms.tardis_portal.add_experiment %}
Expand All @@ -26,7 +26,7 @@ <h3 class="d-block d-sm-none">Experiments</h3>
</div> <!-- class="pull-right" -->
{% endif %}
<div class="pull-left">
<h3 class="d-none d-sm-block" style="text-align: center">Experiments</h3>
<h1 class="mb-1">Experiments</h1>
</div>
</div> <!-- class="col-md-12" -->
</div> <!-- class="row" -->
Expand Down Expand Up @@ -59,7 +59,7 @@ <h4><strong>{{ owned_experiments.count }}</strong>
{% endif %}
</div> <!-- class="col-md-12" -->
</div> <!-- class="row" -->
</div> <!-- id="content" -->
</main> <!-- id="content" -->

<input type="hidden" id="exps-expand-accordion" value="{{ exps_expand_accordion }}">
{% render_bundle 'tardis_portal_my_data' %}
Expand Down
18 changes: 6 additions & 12 deletions tardis/tardis_portal/templates/tardis_portal/public_data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,9 @@

{% block content %}

<div id="content" class="container-fluid">
<div class="row">
<div class="col-md-12">
<h3 class="d-block d-sm-none">Experiments</h3>
<div class="pull-left">
<h3 class="d-none d-sm-block" style="text-align: center">Experiments</h3>
</div>
</div>
<main id="content" class="container">
<div class="page-header">
<h1 class="mb-1">Experiments</h1>
</div>
<div class="row">
<div class="col-md-12">
Expand Down Expand Up @@ -44,9 +39,7 @@ <h4><strong>{{ public_experiments.count }}</strong>
data-bs-toggle="collapse" onclick="$('#collapse{{exp.id}}').collapse('toggle');">
<div class="row">
<div class="col-md-8 px-1 pb-1">
<a class="card-title explink"
href="{% url 'tardis_portal.view_experiment' exp.id %}">{{ exp.title }}
</a>
<span class="card-title">{{ exp.title }}</span>
</div>
<div class="col">
<div class="badges" id="badge-{{exp.id}}"></div>
Expand Down Expand Up @@ -126,6 +119,7 @@ <h4><strong>{{ public_experiments.count }}</strong>
{% endfor %}
</div>
</div>
<a class="btn btn-light mt-3 w-100" href="{% url 'tardis_portal.view_experiment' exp.id %}">View Experiment</a>
</div>
</div>
</div>
Expand All @@ -134,7 +128,7 @@ <h4><strong>{{ public_experiments.count }}</strong>
{% endif %}
</div>
</div>
</div>
</main>
<script type="text/javascript">
$(function() {
$("#experiments .accordion-body").collapse({parent:"#experiments", toggle: true});
Expand Down
11 changes: 5 additions & 6 deletions tardis/tardis_portal/templates/tardis_portal/shared.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
{% load capture %}

{% block content %}
<div id="content" class="container-fluid">
<main id="content" class="container">
<div class="row">
<div class="col-md-12">
<h3 class="d-block d-sm-none">Experiments</h3>
<div class="page-header col-md-12">
{% if not disable_creation_forms %}
<div class="pull-right pb-1">
{% if perms.tardis_portal.add_experiment %}
Expand All @@ -24,9 +23,9 @@ <h3 class="d-block d-sm-none">Experiments</h3>
</div> <!-- class="pull-right" -->
{% endif %}
<div class="pull-left">
<h3 class="d-none d-sm-block" style="text-align: center">Experiments</h3>
<h1 class="mb-1">Experiments</h3>
</div>
</div> <!-- class="col-md-12" -->
</div> <!-- class="col-md-12" -->
</div> <!-- class="row" -->

<div class="row">
Expand Down Expand Up @@ -55,7 +54,7 @@ <h4><strong>{{ shared_experiments.count }}</strong>
{% endif %}
</div> <!-- class="col-md-12" -->
</div> <!-- class="row" -->
</div> <!-- id="content" -->
</main> <!-- id="content" -->

<input type="hidden" id="exps-expand-accordion" value="{{ exps_expand_accordion }}">
{% render_bundle 'tardis_portal_shared' %}
Expand Down

0 comments on commit aa5b4ed

Please sign in to comment.