+
{% if allocation_change.status.name == 'Pending' %}
-
-
+
+
{% endif %}
-
diff --git a/coldfront/core/allocation/templates/allocation/allocation_change_list.html b/coldfront/core/allocation/templates/allocation/allocation_change_list.html
index 7afd32432..60063c0da 100644
--- a/coldfront/core/allocation/templates/allocation/allocation_change_list.html
+++ b/coldfront/core/allocation/templates/allocation/allocation_change_list.html
@@ -14,7 +14,7 @@
Allocation Change Requests
-
+
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 @@
Allocation Change Requests
{% for change in allocation_change_list %}
{{change.pk}} |
- {{ change.created|date:"M. d, Y" }} |
+ {{ change.created|date:"Y-m-d" }} |
{{change.allocation.project.title|truncatechars:50}} |
{{change.allocation.project.pi.first_name}} {{change.allocation.project.pi.last_name}}
({{change.allocation.project.pi.username}}) |
@@ -51,7 +51,7 @@ Allocation Change Requests
diff --git a/coldfront/core/allocation/templates/allocation/allocation_create.html b/coldfront/core/allocation/templates/allocation/allocation_create.html
index aba1fef3b..4ca5ce657 100644
--- a/coldfront/core/allocation/templates/allocation/allocation_create.html
+++ b/coldfront/core/allocation/templates/allocation/allocation_create.html
@@ -13,7 +13,7 @@
Request New Allocation Project: {{ project.title }}
-The following {% settings_value 'CENTER_NAME' %}
+ 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 @@ Request New Allocation Project: {{ project.title }}
- By clicking submit you agree to the Terms and Conditions.
+ By clicking submit you agree to the Terms and Conditions.
@@ -39,8 +39,8 @@ Request New Allocation Project: {{ project.title }}
@@ -49,13 +49,13 @@ Add New Account Name
@@ -67,7 +67,7 @@ Add New Account Name
var resources_with_eula = {{ resources_with_eula | safe }};
$(document).ready(function () {
- $(' Select All Users').insertAfter($("#div_id_users > label"))
+ $(' Select All Users').insertAfter($("#div_id_users > label"))
$("#id_resource").trigger('change');
$("#selectAll").click(function () {
diff --git a/coldfront/core/allocation/templates/allocation/allocation_delete_invoice_note.html b/coldfront/core/allocation/templates/allocation/allocation_delete_invoice_note.html
index c56f6cd01..bdde88ffe 100644
--- a/coldfront/core/allocation/templates/allocation/allocation_delete_invoice_note.html
+++ b/coldfront/core/allocation/templates/allocation/allocation_delete_invoice_note.html
@@ -21,7 +21,7 @@ Delete invoice notes for allocation to {{allocation.get_resources_as_string}
-
+
|
Note |
Author |
diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html
index b459f0488..ae1bed39b 100644
--- a/coldfront/core/allocation/templates/allocation/allocation_detail.html
+++ b/coldfront/core/allocation/templates/allocation/allocation_detail.html
@@ -34,7 +34,7 @@ Allocation Detail
Allocation Information
@@ -104,12 +104,12 @@ Allocation Information
{{ allocation.end_date }}
{% endif %}
{% if allocation.is_locked and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
-
+
Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} - Not renewable
{% elif is_allowed_to_update_project and ALLOCATION_ENABLE_ALLOCATION_RENEWAL and allocation.status.name == 'Active' and allocation.expires_in <= 60 and allocation.expires_in >= 0 %}
-
+
Expires in {{allocation.expires_in}} day{{allocation.expires_in|pluralize}} - Click to renew
@@ -128,11 +128,11 @@ Allocation Information
Created: |
- {{ allocation.created|date:"M. d, Y" }} |
+ {{ allocation.created|date:"Y-m-d" }} |
Last Modified: |
- {{ allocation.modified|date:"M. d, Y" }} |
+ {{ allocation.modified|date:"Y-m-d" }} |
{% if request.user.is_superuser or request.user.is_staff %}
@@ -161,10 +161,10 @@ Allocation Information
{% if request.user.is_superuser %}
-
+
{% if allocation.status.name == 'New' or allocation.status.name == 'Renewal Requested' %}
- Approve
- Deny
+ Approve
+ Deny
{% endif %}
Update
{% endif %}
@@ -177,7 +177,7 @@ Allocation Information
|