Implement RAC Style Library into Aurora

README.md

@@ -114,7 +114,7 @@ instead:
 
 ## API
 
-Aurora comes with a RESTful API, built using the Django Rest Framework. In addition to interacting with the API via your favorite command-line client, you can also use the browsable API interface available in the application.
+Aurora comes with a RESTful API, built using the Django Rest Framework, accessible via any command-line client.
 
 ### Authentication
 
@@ -153,7 +153,7 @@ contains code which demonstrates this flow (see the `authorize` method in
 
 ## Django Admin Configuration
 
-Aurora comes with the default [Django admin site](https://docs.djangoproject.com/en/1.11/ref/contrib/admin/). Only users with superuser privileges are able to view this interface, which can be accessed by clicking on the profile menu and selecting "Administration".
+Aurora comes with the default [Django admin site](https://docs.djangoproject.com/en/1.11/ref/contrib/admin/). Only users with superuser privileges are able to view this interface, available via the "Admin" navigation menu.
 
 In addition to allowing for the manual creation and deletion of certain objects, this interface also allows authorized users to edit system values which are used by the application, including the human-readable strings associated with Bag Log Codes. Care should be taken when making changes in the Django admin interface, particularly the creation or deletion of objects, since they can have unintended consequences.
 

aurora/settings.py

@@ -83,13 +83,14 @@
 WSGI_APPLICATION = "aurora.wsgi.application"
 
 REST_FRAMEWORK = {
-    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination",
-    "PAGE_SIZE": 50,
     "DEFAULT_AUTHENTICATION_CLASSES": (
         # "rest_framework_jwt.authentication.JSONWebTokenAuthentication",
         "bag_transfer.authentication.CognitoAppAuthentication",
         "rest_framework.authentication.SessionAuthentication",
     ),
+    'DEFAULT_RENDERER_CLASSES': (
+        'rest_framework.renderers.JSONRenderer',
+    )
 }
 
 # Database
@@ -164,10 +165,10 @@
 
 # Content Security Policy
 CSP_DEFAULT_SRC = ("'self'", 'https://rockarch.matomo.cloud/')
-CSP_IMG_SRC = ("'self'")
-CSP_STYLE_SRC = ("'self'", "'unsafe-inline'", 'https://cdnjs.cloudflare.com/', 'https://fonts.googleapis.com/')
-CSP_SCRIPT_SRC = ("'self'", "'unsafe-inline'", "'unsafe-eval'", 'https://cdnjs.cloudflare.com/', 'https://oss.maxcdn.com/', 'https://cdn.matomo.cloud/', 'https://cdn.datatables.net/')
-CSP_FONT_SRC = ("'self'", 'https://fonts.gstatic.com', 'https://cdnjs.cloudflare.com/')
+CSP_IMG_SRC = ("'self'", 'https://assets.rockarch.org/')
+CSP_STYLE_SRC = ("'self'", "'unsafe-inline'", 'https://assets.rockarch.org/')
+CSP_SCRIPT_SRC = ("'self'", "'unsafe-inline'", "'unsafe-eval'", 'https://cdn.matomo.cloud/', 'https://cdn.datatables.net/')
+CSP_FONT_SRC = ("'self'", 'https://assets.rockarch.org/')
 
 # Transfer settings
 S3_USE = config.S3_USE
@@ -227,27 +228,6 @@
 # Matomo Analytics configs
 MTM_ID = config.MTM_ID
 
-# List of colors used in dashboard for record types
-RECORD_TYPE_COLORS = [
-    "#f56954",
-    "#00a65a",
-    "#f39c12",
-    "#00c0ef",
-    "#3c8dbc",
-    "#d2d6de",
-    "#f56954",
-    "#00a65a",
-    "#f39c12",
-    "#00c0ef",
-    "#3c8dbc",
-    "#d2d6de",
-    "#f56954",
-    "#00a65a",
-    "#f39c12",
-    "#00c0ef",
-    "#3c8dbc",
-    "#d2d6de",
-]
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 

bag_transfer/accession/forms.py

@@ -19,21 +19,21 @@ class Meta:
         }
         help_texts = {}
         widgets = {
-            "title": forms.widgets.TextInput(attrs={"class": "form-control"}),
+            "title": forms.widgets.TextInput(),
             "start_date": forms.widgets.DateInput(
-                attrs={"class": "form-control", "type": "date"}
+                attrs={"type": "date"}
             ),
             "end_date": forms.widgets.DateInput(
-                attrs={"class": "form-control", "type": "date"}
+                attrs={"type": "date"}
             ),
             "description": forms.widgets.Textarea(
-                attrs={"class": "form-control", "rows": 3}
+                attrs={"rows": 3}
             ),
             "access_restrictions": forms.widgets.Textarea(
-                attrs={"class": "form-control", "rows": 3}
+                attrs={"rows": 3}
             ),
             "use_restrictions": forms.widgets.Textarea(
-                attrs={"class": "form-control", "rows": 3}
+                attrs={"rows": 3}
             ),
             "resource": forms.widgets.HiddenInput(),
             "accession_number": forms.widgets.HiddenInput(),
@@ -52,7 +52,7 @@ class Meta:
     fields=("name", "type"),
     extra=0,
     widgets={
-        "name": forms.widgets.TextInput(attrs={"class": "form-control col-sm-8"}),
-        "type": forms.widgets.Select(attrs={"class": "form-control"}),
+        "name": forms.widgets.TextInput(),
+        "type": forms.widgets.Select(),
     },
 )

bag_transfer/appraise/views.py

@@ -53,12 +53,7 @@ def get(self, request, *args, **kwargs):
                 except Transfer.DoesNotExist as e:
                     rdata["emess"] = e
                     return self.render_to_json_response(rdata)
-
-                if request.GET.get("req_form") == "detail":
-                    rdata["object"] = upload.id
-                    rdata["success"] = 1
-
-                elif (
+                if (
                     request.GET.get("req_form") == "appraise" and request.user.can_appraise()
                 ):
                     if request.GET.get("req_type") == "decision":
@@ -96,10 +91,9 @@ def get_filter_method(self):
         return self.FILTER_ICONTAINS
 
     def appraise_buttons(self, transfer):
-        buttons = '<a type="button" class="transfer-detail btn btn-xs btn-warning" data-toggle="modal" data-target="#modal-detail" aria-expanded="false" href="#">Details</a>'
         if self.request.user.can_appraise():
             if transfer.appraisal_note:
-                btn_class = "btn-primary"
+                btn_class = "btn btn--xs btn--light-blue"
                 note_class = "edit-note"
                 aria_label = 'aria-label="Note exists"'
                 note_text = "Edit"
@@ -108,10 +102,9 @@ def appraise_buttons(self, transfer):
                 note_class = ""
                 aria_label = ""
                 note_text = "Add"
-            buttons = '<a type=button class="btn btn-xs btn-primary appraisal-accept" href="#">Accept</a>\
-                       <a type="button" class="btn btn-xs btn-danger appraisal-reject" href="#">Reject</a>\
-                       <a type="button" class="appraisal-note btn btn-xs {} {}" data-toggle="modal" data-target="#modal-appraisal-note" href="#" {}>{} Note</a>\
-                       <a type="button" class="transfer-detail btn btn-xs btn-warning" data-toggle="modal" data-target="#modal-detail" aria-expanded="false" href="#">Details</a>'.format(
+            buttons = '<button class="btn btn--xs btn--blue appraisal-accept">Accept</button>\
+                       <button class="btn btn--xs btn--orange appraisal-reject">Reject</button>\
+                       <button class="btn btn--xs btn--light-blue appraisal-note {} {}" "data-target="#modal-appraisal-note" {}>{} Note</button>'.format(
                 btn_class, note_class, aria_label, note_text
             )
         return buttons