Merge pull request #138 from UCL-ARC/fix/pop-out-aws

Fixing popout on aws not finding static files

Author: acholyn

mod_app/static/ckeditor/ckeditor/plugins/popout/plugin.js

@@ -7,8 +7,7 @@ CKEDITOR.plugins.add("popout", {
         var newWindow = window.open("", "_blank", "width=800,height=600");
         // make sure new editor gets config
         var originalConfig = editor.config;
-        var ckeditorBasePath = "/static/ckeditor/ckeditor/";
-
+        var ckeditorBasePath = `${editor.config.staticUrl}ckeditor/ckeditor/`;
         // styling and qol bits
         var btnStyle =
           "background-color: #23a1cc; border: none;border-radius: 4px; color: white; padding: 1rem 1.2rem; text-align: center; text-decoration: none; display: flex; font-size: 16px; margin: 0.8rem; cursor: pointer; justify-self: center";

mod_app/views.py

@@ -1,6 +1,5 @@
 import boto3
 import re
-
 from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
 from django.shortcuts import render

museum_of_dreams_project/settings/aws.py

@@ -57,3 +57,5 @@
 
 
 S3_BROWSER_SETTINGS = "djangoS3Browser"
+
+CKEDITOR_CONFIGS["default"]["staticUrl"] = f"{STATIC_URL}"

museum_of_dreams_project/settings/base.py

@@ -155,6 +155,7 @@
         "filebrowserBrowseUrl": "/view_bucket_items/",
         "versionCheck": False,
         "language": "en-gb",
+        "staticUrl": f"/{STATIC_URL}",
     },
 }