Skip to content

Commit bedb231

Browse files
authored
Merge pull request #140 from UCL-ARC/development
Updating production
2 parents 46a72dc + 0317c26 commit bedb231

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# Museum of Dreams Website Project
1+
# Museum of Dreams Project - Website
2+
![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)
3+
4+
5+
6+
27

38
The production website is hosted at http://museumofdreamworlds.eu-west-2.elasticbeanstalk.com/ and built from the `main` branch
49

@@ -13,7 +18,7 @@ Development should be done locally and pushed to the staging website where resea
1318
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).
1419

1520
```
16-
python3 -m venv modvenv
21+
python venv modvenv
1722
source modvenv/bin/activate
1823
1924
pip install -r requirements-base.txt

mod_app/admin/film_admin.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from django.contrib import admin
33
from django.db import models
44
from django.template.defaultfilters import truncatechars_html
5-
from django.utils.html import format_html
5+
from django.utils.html import format_html, mark_safe
66
import html
77

88
from mod_app.admin.link_admin import (
@@ -117,7 +117,8 @@ def safe_comments(self, obj):
117117
safe_comments.short_description = "Comments"
118118

119119
def safe_alt_titles(self, obj):
120-
return format_html(str(obj.alt_titles))
120+
formatted_titles = mark_safe(str(obj.alt_titles).replace(",", ",<br>"))
121+
return format_html(formatted_titles)
121122

122123
safe_alt_titles.allow_tags = True
123124
safe_alt_titles.short_description = "Alt Titles"

mod_app/admin/link_admin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class SourceInline(PreviewMixin, admin.TabularInline):
1212
"grp-closed",
1313
]
1414
verbose_name = "Source"
15-
verbose_name_plural = "Sources"
15+
verbose_name_plural = "Sources of Adaptations"
1616

1717

1818
class VideoInline(PreviewMixin, admin.TabularInline):

mod_app/static/admin/css/custom.css

+5
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@
66
padding: 0.1rem;
77
}
88
}
9+
10+
th.column-safe_alt_titles,
11+
.field-safe_alt_titles {
12+
max-width: 10rem;
13+
}

0 commit comments

Comments
 (0)