Merge pull request #140 from UCL-ARC/development

Updating production

Author: acholyn

README.md

@@ -1,4 +1,9 @@
-# Museum of Dreams Website Project
+# Museum of Dreams Project - Website
+![Static Badge](https://img.shields.io/badge/built_with-Django_4.2-blue) ![Static Badge](https://img.shields.io/badge/OpenProps-1883e3) ![Static Badge](https://img.shields.io/badge/CKEditor4-8a2be2) ![Static Badge](https://img.shields.io/badge/hosted-232F3E?logo=amazonwebservices)
+
+
+
+
 
 The production website is hosted at http://museumofdreamworlds.eu-west-2.elasticbeanstalk.com/ and built from the `main` branch
 
@@ -13,7 +18,7 @@ Development should be done locally and pushed to the staging website where resea
 To work on this project as is, clone the repo into an appropriate folder (eg. `museum_of_dreams_project`). Create a venv at the top level and start it. Then install the requirements and launch the app. We use `requirements-base.txt` as AWS looks for `requirements.txt` and we don't need to install MySQL locally (we use a local sqlite db).
 
 ```
-python3 -m venv modvenv
+python venv modvenv
 source modvenv/bin/activate
 
 pip install -r requirements-base.txt

mod_app/admin/film_admin.py

@@ -2,7 +2,7 @@
 from django.contrib import admin
 from django.db import models
 from django.template.defaultfilters import truncatechars_html
-from django.utils.html import format_html
+from django.utils.html import format_html, mark_safe
 import html
 
 from mod_app.admin.link_admin import (
@@ -117,7 +117,8 @@ def safe_comments(self, obj):
     safe_comments.short_description = "Comments"
 
     def safe_alt_titles(self, obj):
-        return format_html(str(obj.alt_titles))
+        formatted_titles = mark_safe(str(obj.alt_titles).replace(",", ",<br>"))
+        return format_html(formatted_titles)
 
     safe_alt_titles.allow_tags = True
     safe_alt_titles.short_description = "Alt Titles"

mod_app/admin/link_admin.py

@@ -12,7 +12,7 @@ class SourceInline(PreviewMixin, admin.TabularInline):
         "grp-closed",
     ]
     verbose_name = "Source"
-    verbose_name_plural = "Sources"
+    verbose_name_plural = "Sources of Adaptations"
 
 
 class VideoInline(PreviewMixin, admin.TabularInline):

mod_app/static/admin/css/custom.css

@@ -6,3 +6,8 @@
     padding: 0.1rem;
   }
 }
+
+th.column-safe_alt_titles,
+.field-safe_alt_titles {
+  max-width: 10rem;
+}