diff --git a/coldfront/plugins/ifx/templates/plugins/ifx/billing_records.html b/coldfront/plugins/ifx/templates/plugins/ifx/billing_records.html index af59e93eb..156afe1cf 100644 --- a/coldfront/plugins/ifx/templates/plugins/ifx/billing_records.html +++ b/coldfront/plugins/ifx/templates/plugins/ifx/billing_records.html @@ -3,6 +3,14 @@ {% load crispy_forms_tags %} {% load static %} +{% block ifx_head %} + + + + + +{% endblock %} + {% block title %} Billing Records {% endblock %} @@ -10,15 +18,6 @@ {% block content %}
+

Billing Records

@@ -299,9 +387,9 @@
- + - +
@@ -309,6 +397,9 @@
+
+ +

@@ -316,6 +407,8 @@ + + diff --git a/coldfront/plugins/ifx/templates/plugins/ifx/calculate_billing_month.html b/coldfront/plugins/ifx/templates/plugins/ifx/calculate_billing_month.html index de19046f4..db386b09d 100644 --- a/coldfront/plugins/ifx/templates/plugins/ifx/calculate_billing_month.html +++ b/coldfront/plugins/ifx/templates/plugins/ifx/calculate_billing_month.html @@ -3,6 +3,14 @@ {% load crispy_forms_tags %} {% load static %} +{% block ifx_head %} + + + + + +{% endblock %} + {% block title %} Calculate Billing Month {% endblock %} @@ -10,23 +18,20 @@ {% block content %}
+

Calculate Billing Month

@@ -135,11 +179,11 @@
- + - - - + + +
@@ -167,7 +211,7 @@

-
Id State User Lab
+
diff --git a/coldfront/plugins/ifx/views.py b/coldfront/plugins/ifx/views.py index 4bdee1be5..97cbffe5a 100644 --- a/coldfront/plugins/ifx/views.py +++ b/coldfront/plugins/ifx/views.py @@ -12,6 +12,7 @@ from django.db import connection from django.conf import settings from django.core.exceptions import PermissionDenied +from django.urls import reverse from django_q.tasks import async_task from rest_framework.decorators import api_view, permission_classes, authentication_classes from rest_framework.response import Response @@ -79,7 +80,9 @@ def billing_records(request): ''' if not request.user.is_superuser: raise PermissionDenied - return render(request, 'plugins/ifx/billing_records.html') + delete_url = reverse('billing-record-detail', kwargs={'pk': 0}) + token = request.user.auth_token.key + return render(request, 'plugins/ifx/billing_records.html', { 'delete_url': delete_url, 'auth_token': token }) @api_view(['GET',]) @authentication_classes([TokenAuthentication, SessionAuthentication, BasicAuthentication]) diff --git a/coldfront/templates/common/base.html b/coldfront/templates/common/base.html index f8f88968a..b7299a14a 100644 --- a/coldfront/templates/common/base.html +++ b/coldfront/templates/common/base.html @@ -44,6 +44,8 @@ + {% block ifx_head %}{% endblock %} + {% block title %}FAS Research Computing | HARVARD UNIVERSITY {% endblock %}
ID