Revamp of Notes

coldfront/config/base.py

@@ -28,7 +28,9 @@
 LANGUAGE_CODE = ENV.str('LANGUAGE_CODE', default='en-us')
 TIME_ZONE = ENV.str('TIME_ZONE', default='America/New_York')
 USE_I18N = True
-USE_L10N = True
+USE_L10N = False
+DATE_FORMAT = 'Y-m-d'
+DATETIME_FORMAT = 'Y-m-d H:i'
 USE_TZ = True
 
 #------------------------------------------------------------------------------
@@ -53,13 +55,13 @@
 # Hack to fix fontawesome. Will be fixed in version 6
 sys.modules['fontawesome_free'] = __import__('fontawesome-free')
 INSTALLED_APPS += [
+    'crispy_bootstrap5',
     'crispy_forms',
     'sslserver',
     'django_q',
     'simple_history',
     'fontawesome_free',
 ]
-
 # ColdFront Apps
 INSTALLED_APPS += [
     'coldfront.core.user',
@@ -134,7 +136,10 @@
     else:
         raise ImproperlyConfigured('SITE_TEMPLATES should be a path to a directory')
 
-CRISPY_TEMPLATE_PACK = 'bootstrap4'
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
+
+CRISPY_TEMPLATE_PACK = "bootstrap5"
+
 SETTINGS_EXPORT = []
 
 STATIC_URL = '/static/'

coldfront/config/urls.py

@@ -25,6 +25,8 @@
     path('grant/', include('coldfront.core.grant.urls')),
     path('publication/', include('coldfront.core.publication.urls')),
     path('research-output/', include('coldfront.core.research_output.urls')),
+    path('note/', include('coldfront.core.note.urls')),
+
 ]
 
 

coldfront/core/allocation/forms.py

@@ -36,7 +36,7 @@ def __init__(self, request_user, project_pk,  *args, **kwargs):
         if user_query_set:
             self.fields['users'].choices = ((user.user.username, "%s %s (%s)" % (
                 user.user.first_name, user.user.last_name, user.user.username)) for user in user_query_set)
-            self.fields['users'].help_text = '<br/>Select users in your project to add to this allocation.'
+            self.fields['users'].help_text = '<Select users in your project to add to this allocation.'
         else:
             self.fields['users'].widget = forms.HiddenInput()
 
@@ -47,11 +47,11 @@ def __init__(self, request_user, project_pk,  *args, **kwargs):
                 self.fields['allocation_account'].choices = (((account.name, account.name))
                                                              for account in allocation_accounts)
 
-            self.fields['allocation_account'].help_text = '<br/>Select account name to associate with resource. <a href="#Modal" id="modal_link">Click here to create an account name!</a>'
+            self.fields['allocation_account'].help_text = '<Select account name to associate with resource. <a href="#Modal" id="modal_link">Click here to create an account name!</a>'
         else:
             self.fields['allocation_account'].widget = forms.HiddenInput()
 
-        self.fields['justification'].help_text = '<br/>Justification for requesting this allocation.'
+        self.fields['justification'].help_text = 'Justification for requesting this allocation.'
 
 
 class AllocationUpdateForm(forms.Form):

coldfront/core/allocation/templates/allocation/allocation_account_list.html

@@ -11,7 +11,7 @@
 {% block content %}
 <h2>Allocation Accounts</h2>
 
-<div class="card mb-3 bg-light">
+<div class="card mb-3">
   <div class="card-body">
     <a class="btn btn-success" href="{% url 'add-allocation-account' %}" role="button"><i class="fas fa-plus" aria-hidden="true"></i> Add Allocation Account</a>
   </div>

coldfront/core/allocation/templates/allocation/allocation_add_users.html

@@ -22,7 +22,7 @@ <h2>Add users to allocation for project: {{allocation.project.title}}</h2>
             <thead>
               <tr>
                 <th>
-                  <input type="checkbox" class="check" id="selectAll">
+                  <input type="checkbox" class="form-check-input" id="selectAll">
                 </th>
                 <th scope="col">#</th>
                 <th scope="col">Username</th>

coldfront/core/allocation/templates/allocation/allocation_allocationattribute_delete.html

@@ -22,7 +22,7 @@ <h2>Delete allocation attributes from allocation for project: {{allocation.proje
             <thead>
               <tr>
                 <th>
-                  <input type="checkbox" class="check" id="selectAll">
+                  <input type="checkbox" class="form-check-input" id="selectAll">
                 </th>
                 <th scope="col">Name</th>
                 <th scope="col">Value</th>

coldfront/core/allocation/templates/allocation/allocation_change.html

@@ -13,7 +13,7 @@
 <h2>Request change to {{ allocation.get_parent_resource }} for project: {{ allocation.project.title }}</h2>
 <hr>
 
-<p class="text-justify">
+<p>
   Request changes to an existing allocation using the form below. For each change
   you must provide a justification.
 </p>
@@ -53,7 +53,7 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
                 <td>
                   {{ allocation.end_date }}
                   {% if allocation.is_locked and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
-                  <span class="badge badge-warning"><i class="far fa-clock" aria-hidden="true"></i>
+                  <span class="badge bg-warning"><i class="far fa-clock" aria-hidden="true"></i>
                     Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} - Not renewable
                   </span>
                   {% endif %}
@@ -73,11 +73,11 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
             </tr>
             <tr>
               <th scope="row" class="text-nowrap">Created:</th>
-              <td>{{ allocation.created|date:"M. d, Y" }}</td>
+              <td>{{ allocation.created|date:"Y-m-d" }}</td>
             </tr>
             <tr>
               <th scope="row" class="text-nowrap">Last Modified:</th>
-              <td>{{ allocation.modified|date:"M. d, Y" }}</td>
+              <td>{{ allocation.modified|date:"Y-m-d" }}</td>
             </tr>
             <tr>
               {% if allocation.is_locked %}

coldfront/core/allocation/templates/allocation/allocation_change_detail.html

@@ -74,7 +74,7 @@ <h3 class="d-inline"><i class="fas fa-list" aria-hidden="true"></i> Allocation I
                 <td>
                   {{ allocation_change.allocation.end_date }}
                   {% if allocation_change.allocation.is_locked and allocation_change.allocation.status.name == 'Approved' and allocation_change.allocation.expires_in <= 60 and allocation_change.allocation.expires_in >= 0 %}
-                  <span class="badge badge-warning"><i class="far fa-clock" aria-hidden="true"></i>
+                  <span class="badge bg-warning"><i class="far fa-clock" aria-hidden="true"></i>
                     Expires in {{allocation_change.allocation.expires_in}} day{{allocation_change.allocation.expires_in|pluralize}} - Not renewable
                   </span>
                   {% endif %}
@@ -94,11 +94,11 @@ <h3 class="d-inline"><i class="fas fa-list" aria-hidden="true"></i> Allocation I
             </tr>
             <tr>
               <th scope="row" class="text-nowrap">Change Requested:</th>
-              <td>{{ allocation_change.created|date:"M. d, Y" }}</td>
+              <td>{{ allocation_change.created|date:"Y-m-d" }}</td>
             </tr>
             <tr>
               <th scope="row" class="text-nowrap">Change Last Modified:</th>
-              <td>{{ allocation_change.modified|date:"M. d, Y" }}</td>
+              <td>{{ allocation_change.modified|date:"Y-m-d" }}</td>
             </tr>
             <tr>
               {% if allocation_change.allocation.is_locked %}
@@ -141,7 +141,7 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Alloc
                     {% if request.user.is_superuser %}
                       <td>
                         {{form.new_value}}
-                        <a href="{% url 'allocation-attribute-change-delete' form.change_pk.value %}" class="float-right confirm-delete">
+                        <a href="{% url 'allocation-attribute-change-delete' form.change_pk.value %}" class="float-end confirm-delete">
                           <i class="far fa-trash-alt fa-lg"></i>
                         </a>
                       </td>
@@ -170,7 +170,7 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Alloc
     </div>
   </div>
 
-  <p class="card-text text-justify">{{allocation_change_form.justification | as_crispy_field}}</p>
+  <p class="card-text">{{allocation_change_form.justification | as_crispy_field}}</p>
 
   <hr/>
 
@@ -184,12 +184,12 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Actio
 
             {% csrf_token %}
             {{note_form.notes | as_crispy_field}}
-            <div style="float: right;">
+            <div style="float:right;">
               {% if allocation_change.status.name == 'Pending' %}
-                <button type="submit" name="action" value="approve" class="btn btn-success mr-1">Approve</button>
-                <button type="submit" name="action" value="deny" class="btn btn-danger mr-1">Deny</button>
+                <button type="submit" name="action" value="approve" class="btn btn-success me-1">Approve</button>
+                <button type="submit" name="action" value="deny" class="btn btn-danger me-1">Deny</button>
               {% endif %}
-                <button type="submit" name="action" value="update" class="btn btn-primary float-right">
+                <button type="submit" name="action" value="update" class="btn btn-primary float-end">
                 <i class="fas fa-sync" aria-hidden="true"></i> Update
               </button>
             </div>

coldfront/core/allocation/templates/allocation/allocation_change_list.html

@@ -14,7 +14,7 @@ <h2>Allocation Change Requests</h2>
 
 <hr>
 
-<p class="text-justify"> 
+<p> 
   For each allocation change request below, there is the option to activate the allocation request and to view the allocation change's detail page.
   If a change request is only for an extension to the allocation, they can be approved on this page. However if the change request includes changes to
   the allocation's attributes, the request must be reviewed and acted upon in its detail page.
@@ -38,7 +38,7 @@ <h2>Allocation Change Requests</h2>
         {% for change in allocation_change_list %}
           <tr>
             <td>{{change.pk}}</td>
-            <td>{{ change.created|date:"M. d, Y" }}</td>
+            <td>{{ change.created|date:"Y-m-d" }}</td>
             <td><a href="{% url 'project-detail' change.allocation.project.pk %}">{{change.allocation.project.title|truncatechars:50}}</a></td>
             <td>{{change.allocation.project.pi.first_name}} {{change.allocation.project.pi.last_name}}
               ({{change.allocation.project.pi.username}})</td>
@@ -51,7 +51,7 @@ <h2>Allocation Change Requests</h2>
             <td class="text-nowrap">
                 <form method="post" action="{% url 'allocation-change-detail' change.pk %}">
               {% if change.allocationattributechangerequest_set.all %}
-                <button class="btn btn-success mr-1" aria-disabled="true" 
+                <button class="btn btn-success me-1" aria-disabled="true" 
                 style="
                       cursor: not-allowed;
                       opacity: 0.6;
@@ -61,7 +61,7 @@ <h2>Allocation Change Requests</h2>
               {% else %}
                   {% csrf_token %}
                   <input type="hidden" name="end_date_extension" value="{{ change.end_date_extension }}" />
-                  <button type="submit" name="action" value="approve" class="btn btn-success mr-1">Approve</button>
+                  <button type="submit" name="action" value="approve" class="btn btn-success me-1">Approve</button>
               {% endif %}
                 <a href="{% url 'allocation-change-detail' change.pk %}" class="btn btn-primary mr-1">Details</a>
                 </form>

coldfront/core/allocation/templates/allocation/allocation_create.html

@@ -13,7 +13,7 @@
 <h2>Request New Allocation <br><small>Project: {{ project.title }}</small></h2>
 <hr>
 
-<p class="text-justify">The following {% settings_value 'CENTER_NAME' %}
+<p>The following {% settings_value 'CENTER_NAME' %}
   resources are available to request for this project. If you need access to
   more than one of these, please submit a separate allocation request for each
   resource. For each request you must provide the justification for how you
@@ -26,7 +26,7 @@ <h2>Request New Allocation <br><small>Project: {{ project.title }}</small></h2>
   <div id="eula-div" style="display: none;">
     <textarea style="display:none;min-width:100%" id="eula"  rows="15"></textarea>
     <br>
-    <p class="font-weight-bold">By clicking submit you agree to the Terms and Conditions.</p>
+    <p class="fw-bold">By clicking submit you agree to the Terms and Conditions.</p>
   </div>
 
   <input class="btn btn-primary" type="submit" value="Submit" />
@@ -39,8 +39,8 @@ <h2>Request New Allocation <br><small>Project: {{ project.title }}</small></h2>
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title" id="exampleModalLabel">Add New Account Name</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+          <!-- <span aria-hidden="true">&times;</span> -->
         </button>
       </div>
       <div class="modal-body">
@@ -49,13 +49,13 @@ <h5 class="modal-title" id="exampleModalLabel">Add New Account Name</h5>
         <form id="allocation_account_form">
           {{AllocationAccountForm |crispy}}
           <button id="myFormSubmit" class="btn btn-primary" type="submit">Submit</button>
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
         </form>
       </div>
     </div>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
     <button type="button" class="btn btn-primary">Send message</button>
   </div>
 </div>
@@ -67,7 +67,7 @@ <h5 class="modal-title" id="exampleModalLabel">Add New Account Name</h5>
   var resources_with_eula = {{ resources_with_eula | safe }};
 
   $(document).ready(function () {
-    $('<br><input id="selectAll" class="check" type="checkbox"> <strong>Select All Users</strong>').insertAfter($("#div_id_users > label"))
+    $('<br><input id="selectAll" class="form-check-input" type="checkbox"> <strong>Select All Users</strong>').insertAfter($("#div_id_users > label"))
     $("#id_resource").trigger('change');
 
     $("#selectAll").click(function () {

coldfront/core/allocation/templates/allocation/allocation_delete_invoice_note.html

@@ -21,7 +21,7 @@ <h3>Delete invoice notes for allocation to {{allocation.get_resources_as_string}
           <thead>
             <tr>
               <th>
-                <input type="checkbox" class="check" id="selectAll">
+                <input type="checkbox" class="form-check-input" id="selectAll">
               </th>
               <th scope="col">Note</th>
               <th scope="col">Author</th>