From aa5b4ede0d9fb61bba5c1125935c27c0aceb58c4 Mon Sep 17 00:00:00 2001
From: Noel <noel.zeng@auckland.ac.nz>
Date: Thu, 30 May 2024 16:55:34 +1200
Subject: [PATCH] Update other project and experiment links

---
 .../templates/ajax/owned_proj_list.html        |  5 +++--
 .../apps/projects/templates/my_projects.html   |  9 ++++-----
 .../projects/templates/public_projects.html    | 17 +++++++----------
 .../tardis_portal/ajax/exps_list.html          |  4 ++--
 .../templates/tardis_portal/my_data.html       | 10 +++++-----
 .../templates/tardis_portal/public_data.html   | 18 ++++++------------
 .../templates/tardis_portal/shared.html        | 11 +++++------
 7 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/tardis/apps/projects/templates/ajax/owned_proj_list.html b/tardis/apps/projects/templates/ajax/owned_proj_list.html
index 5a0882fc8..2edd191ef 100644
--- a/tardis/apps/projects/templates/ajax/owned_proj_list.html
+++ b/tardis/apps/projects/templates/ajax/owned_proj_list.html
@@ -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>
@@ -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 %}
diff --git a/tardis/apps/projects/templates/my_projects.html b/tardis/apps/projects/templates/my_projects.html
index e8dffc98b..5d07fe867 100644
--- a/tardis/apps/projects/templates/my_projects.html
+++ b/tardis/apps/projects/templates/my_projects.html
@@ -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 %}
@@ -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" -->
@@ -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' %}
diff --git a/tardis/apps/projects/templates/public_projects.html b/tardis/apps/projects/templates/public_projects.html
index f1288f788..b2ef295aa 100644
--- a/tardis/apps/projects/templates/public_projects.html
+++ b/tardis/apps/projects/templates/public_projects.html
@@ -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">
@@ -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>
@@ -119,6 +114,8 @@ <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 %}
@@ -126,7 +123,7 @@ <h4><strong>{{ public_projects.count }}</strong>
     {% endif %}
     </div>
   </div>
-</div>
+</main>
 <script type="text/javascript">
 $(function() {
     $("#projects .accordion-body").collapse({parent:"#projects", toggle: true});
diff --git a/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html b/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
index 4c5bbf61d..2bd26a899 100644
--- a/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
+++ b/tardis/tardis_portal/templates/tardis_portal/ajax/exps_list.html
@@ -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>
@@ -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 %}
diff --git a/tardis/tardis_portal/templates/tardis_portal/my_data.html b/tardis/tardis_portal/templates/tardis_portal/my_data.html
index ddd83560d..a6a9d3ba6 100644
--- a/tardis/tardis_portal/templates/tardis_portal/my_data.html
+++ b/tardis/tardis_portal/templates/tardis_portal/my_data.html
@@ -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 %}
@@ -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" -->
@@ -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' %}
diff --git a/tardis/tardis_portal/templates/tardis_portal/public_data.html b/tardis/tardis_portal/templates/tardis_portal/public_data.html
index bfd5b7251..5369a8146 100644
--- a/tardis/tardis_portal/templates/tardis_portal/public_data.html
+++ b/tardis/tardis_portal/templates/tardis_portal/public_data.html
@@ -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">
@@ -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>
@@ -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>
@@ -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});
diff --git a/tardis/tardis_portal/templates/tardis_portal/shared.html b/tardis/tardis_portal/templates/tardis_portal/shared.html
index 3e729dbdc..91cdbb261 100644
--- a/tardis/tardis_portal/templates/tardis_portal/shared.html
+++ b/tardis/tardis_portal/templates/tardis_portal/shared.html
@@ -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 %}
@@ -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">
@@ -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' %}