Merge branch 'develop'

ucb-rit · Oct 4, 2022 · 4e25b29 · 4e25b29
2 parents 6504746 + 807349d
commit 4e25b29
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/coldfront/core/portal/templates/portal/allocation_by_fos.html b/coldfront/core/portal/templates/portal/allocation_by_fos.html
@@ -3,7 +3,7 @@
   <table id="fos-table" class="table table-bordered">
     <thead>
       <tr>
-        <th scope="col">UCB Campus Division or Department</th>
+        <th scope="col">Division or Department</th>
         <th scope="col">Active Allocation Count</th>
         <th scope="col">User Count</th>
       </tr>

diff --git a/coldfront/core/project/forms.py b/coldfront/core/project/forms.py
@@ -24,7 +24,7 @@ class ProjectSearchForm(forms.Form):
     """
     LAST_NAME = 'Last Name (PI)'
     USERNAME = 'Username (PI)'
-    FIELD_OF_SCIENCE = 'UCB Campus Division or Department'
+    FIELD_OF_SCIENCE = 'Division or Department'
     PROJECT_TITLE = 'Project Title'
     PROJECT_NAME = 'Project Name'
     CLUSTER_NAME = 'Cluster Name'

diff --git a/coldfront/core/project/templates/project/project_archive.html b/coldfront/core/project/templates/project/project_archive.html
@@ -25,7 +25,7 @@ <h4 class="card-title">
     </ul>
     <br>
     <p class="card-text text-justify"><strong>Description: </strong>{{ project.description }}</p>
-<!--    <p class="card-text text-justify"><strong>UCB Campus Division or Department: </strong>{{ project.field_of_science }}</p>-->
+<!--    <p class="card-text text-justify"><strong>Division or Department: </strong>{{ project.field_of_science }}</p>-->
     <p class="card-text text-justify"><strong>Status: </strong>{{ project.status}}</p>
   </div>
 </div>

diff --git a/coldfront/core/project/templates/project/project_archived_list.html b/coldfront/core/project/templates/project/project_archived_list.html
@@ -52,7 +52,7 @@ <h1>Archived Projects</h1><hr>
         </th>
         <th scope="col">Title and Description</th>
 <!--        <th scope="col" class="text-nowrap">-->
-<!--          UCB Campus Division or Department-->
+<!--          Division or Department-->
 <!--          <a href="?order_by=field_of_science&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>-->
 <!--          <a href="?order_by=field_of_science&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>-->
 <!--        </th>-->

diff --git a/coldfront/core/project/templates/project/project_detail.html b/coldfront/core/project/templates/project/project_detail.html
@@ -121,7 +121,7 @@ <h2 class="d-inline">
       <strong>Cluster: </strong>
       {{ cluster_name }}
     </p>
-<!--    <p class="card-text text-justify"><strong>UCB Campus Division or Department: </strong>{{ project.field_of_science }}</p>-->
+<!--    <p class="card-text text-justify"><strong>Division or Department: </strong>{{ project.field_of_science }}</p>-->
     <p class="card-text text-justify"><strong>Project Status: </strong>{{ project.status }}
         {% if project.last_project_review and  project.last_project_review.status.name == 'Pending'%}
           <span class="badge badge-pill badge-info">project review pending</span>

diff --git a/coldfront/core/project/templates/project/project_join_list.html b/coldfront/core/project/templates/project/project_join_list.html
@@ -117,7 +117,7 @@ <h1>Join a Project</h1><hr>
         <th scope="col">Title</th>
         <th scope="col">Cluster</th>
 <!--        <th scope="col" class="text-nowrap">-->
-<!--          UCB Campus Division or Department-->
+<!--          Division or Department-->
 <!--          <a href="?order_by=field_of_science&direction=asc&{{filter_parameters}}">-->
 <!--            <span class="accessibility-link-text">Sort by Ascending Field of Science</span>-->
 <!--            <i class="fas fa-sort-up"></i>-->

diff --git a/coldfront/core/project/templates/project/project_list.html b/coldfront/core/project/templates/project/project_list.html
@@ -97,7 +97,7 @@ <h1>{{ PROGRAM_NAME_SHORT }} Cluster Projects</h1><hr>
         <th scope="col">Title</th>
         <th scope="col">Cluster</th>
 <!--        <th scope="col" class="text-nowrap">-->
-<!--          UCB Campus Division or Department-->
+<!--          Division or Department-->
 <!--          <a href="?order_by=field_of_science&direction=asc&{{filter_parameters}}">-->
 <!--            <span class="accessibility-link-text">Sort by Ascending Department</span>-->
 <!--            <i class="fas fa-sort-up"></i>-->

diff --git a/coldfront/core/project/templates/project/project_request/savio/project_request_card.html b/coldfront/core/project/templates/project/project_request/savio/project_request_card.html
@@ -79,7 +79,7 @@ <h2>
     </p>
     {% endif %}
 <!--    <p class="card-text text-justify">-->
-<!--      <strong>UCB Campus Division or Department: </strong>-->
+<!--      <strong>Division or Department: </strong>-->
 <!--      {{ savio_request.project.field_of_science }}-->
 <!--    </p>-->
     <p class="card-text text-justify">

diff --git a/coldfront/core/project/templates/project/project_request/vector/project_request_card.html b/coldfront/core/project/templates/project/project_request/vector/project_request_card.html
@@ -57,7 +57,7 @@ <h2>
       {{ vector_request.project.description }}
     </p>
 <!--    <p class="card-text text-justify">-->
-<!--      <strong>UCB Campus Division or Department: </strong>-->
+<!--      <strong>Division or Department: </strong>-->
 <!--      {{ vector_request.project.field_of_science }}-->
 <!--    </p>-->
     <p class="card-text text-justify">

diff --git a/coldfront/core/user/templates/user/user_projects_managers.html b/coldfront/core/user/templates/user/user_projects_managers.html
@@ -40,7 +40,7 @@ <h2 class="d-inline">{{ project.title }}</h2>
       {% endif %}
     </p>
     <p class="card-text text-justify"><strong>Description: </strong>{{ project.description }}</p>
-<!--    <p class="card-text text-justify"><strong>UCB Campus Division or Department: </strong>{{ project.field_of_science }}</p>-->
+<!--    <p class="card-text text-justify"><strong>Division or Department: </strong>{{ project.field_of_science }}</p>-->
     <p class="card-text text-justify"><strong>Project Status: </strong>{{ project.status }} </p>
 
   <!-- End Project Heading -->