Updating style assets

mod_app/admin/bibliography_admin.py

@@ -18,7 +18,7 @@ class Meta:
 @admin.register(BibliographyItem)
 class BibliographyItemAdmin(admin.ModelAdmin):
     model = BibliographyItem
-    list_display = ["safe_citation", "annotation"]
+    list_display = ["safe_citation"]
     form = BIAdminForm
 
     def safe_citation(self, obj):

mod_app/admin/film_admin.py

@@ -114,17 +114,12 @@ def safe_temporary_images(self, obj):
 
     def preview_video(self, obj):
         if obj.videos.first():
-            if obj.videos.first().file:
-                return format_html(
-                    '<video width="150" height="120" controls><source src="{}" type="video/mp4"></video>',
-                    obj.videos.first().file.url,
-                )
-            else:
-                return format_html(
-                    '<video width="150" height="120" controls ><source src="{}" type="video/mp4"></video>',
-                    obj.videos.first(),
-                )
-            # previously tried to use youtube but that seems to be more tricky than expected and may not be used
+            # format for working with mediacentral embeds
+            return format_html(
+                '<div"><iframe src="{}" frameborder="0"  scrolling="no" allowfullscreen></iframe></div>',
+                obj.videos.first(),
+            )
+        # previously tried to use youtube but that seems to be more tricky than expected and may not be used
         else:
             return "-"
 

mod_app/admin/link_admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from mod_app.utils.mixins import PreviewMixin, s3BrowserButtonMixin
 
-from ..models import *
+from mod_app.models import *
 
 
 class SourceInline(PreviewMixin, admin.TabularInline):
@@ -14,14 +14,15 @@ class SourceInline(PreviewMixin, admin.TabularInline):
     ]
 
 
-class VideoInline(PreviewMixin, s3BrowserButtonMixin, admin.TabularInline):
+class VideoInline(PreviewMixin, admin.TabularInline):
     model = Video
     extra = 1
     classes = [
         "inline-inline",
         "grp-collapse",
         "grp-closed",
     ]
+    exclude = ("file",)
 
 
 class ScriptInline(PreviewMixin, s3BrowserButtonMixin, admin.TabularInline):
@@ -115,9 +116,9 @@ class OtherLinkInline(PreviewMixin, admin.TabularInline):
 
 
 @admin.register(Video)
-class VideoAdmin(PreviewMixin, s3BrowserButtonMixin, admin.ModelAdmin):
+class VideoAdmin(PreviewMixin, admin.ModelAdmin):
     search_fields = ["description", "url"]
-    list_display = ["description", "film", "file", "url", "preview"]
+    list_display = ["description", "film", "url", "preview"]
 
 
 @admin.register(Source)

mod_app/models/bibliography_model.py

@@ -19,7 +19,3 @@ def __str__(self):
         null=True,
         help_text="Please use Harvard reference list style. Examples: Author surname, initial. (year). 'Title of article/book/website/photograph'. Available at: URL or DOI where applicable (date accessed). Please note that the website or photo title should be italicised. For more detailed information and examples visit: https://www5.open.ac.uk/library/referencing-and-plagiarism/quick-guide-to-harvard-referencing-cite-them-right",
     )
-    annotation = RichTextField(
-        null=True,
-        help_text="Notes on how this item was helpful or relevant, for example.",
-    )

mod_app/static/css/analysis.css

@@ -1,5 +1 @@
 /* for analysis list and detail pages */
-
-.card-area {
-  margin-top: 2rem;
-}

mod_app/static/css/bibliography.css

@@ -1,19 +1,26 @@
 .bibliography__area {
-  margin: 2rem 1rem;
-}
-.bibliography__item {
-  margin-bottom: 1rem;
-  display: flex;
-  columns: 2;
+  margin: 1vw 6vw;
 
-  > :first-child {
-    flex: 0 0 75%; /* shorthand for flex-grow, flex-shrink, and flex-basis */
-  }
+  .bibliography__item {
+    margin-bottom: 1rem;
+    padding-inline-start: 1vw;
+    display: flex;
+    columns: 2;
+
+    > :first-child {
+      flex: 0 0 75%;
+    }
 
-  > :last-child {
-    flex: 1; /* The second column takes the remaining space */
+    > :last-child {
+      flex: 1; /* The second column takes the remaining space */
+    }
+  }
+  .ro {
+    /* odd rows get a colour to make things more readable */
+    background-color: var(--cyan-0);
   }
 }
+
 .bib__ref-list {
   font-size: 0.7rem;
 }

mod_app/static/css/film.css

@@ -19,24 +19,6 @@
   font-size: 1rem;
 }
 
-.page__description {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 2rem;
-}
-/* pagination */
-.button--toggle-pagination {
-  float: right;
-}
-.pagination {
-  margin-inline: auto;
-  text-align: center;
-  margin-top: 1rem;
-  .current {
-    display: block;
-  }
-}
-
 /***************** detail ***************/
 .top-level {
   display: flex;
@@ -89,17 +71,12 @@
 
 /*************** for tabs *******************/
 
-.tabs-container {
-  display: flex;
-  height: 100vh;
-}
-
 .tab-titles {
   width: 20vw;
   padding: 10px;
-  flex-direction: column;
   box-sizing: border-box;
-  position: fixed;
+  position: sticky;
+  top: 0px;
 
   [name="tab-group"] {
     opacity: 0;
@@ -132,4 +109,6 @@
   padding: 10px;
   border: 1px solid var(--cream);
   margin-left: 20vw;
+  position: static;
+  top: 0;
 }

mod_app/static/css/image-styles.css

@@ -3,25 +3,31 @@
 
 #title__logo-img {
   float: left;
-  margin-left: 1vw;
+  margin-left: 6vw;
   width: 15vw;
-}
-#title__logo-text {
-  width: 25vw;
-  transform: translateY(-0.5rem);
+  transform: translateY(-0.8rem) scale(85%);
+
+  @media screen and (max-width: 767px) {
+    display: none;
+  }
 }
 
 .footer-logo {
   /* this contains the logo image and text */
-  margin-inline: 3vw;
-  transform: translateY(-2.5rem);
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  @media screen and (max-width: 767px) {
+    display: none;
+  }
 }
 #footer__logo-img {
-  float: left;
   width: 8vw;
-  transform: translateY(0.5rem);
 }
-#footer__logo-text {
-  width: 15vw;
-  /* transform: translateY(-5rem); */
+
+.dlm {
+  filter: invert(1);
+}
+body.lm .dlm {
+  filter: none;
 }

mod_app/static/css/imports.css

@@ -1,47 +1,38 @@
 /* Other css files */
+@import url("utility-classes.css");
 @import url("image-styles.css");
 @import url("palette.css");
 @import url("carousel.css");
 @import url("film.css");
 @import url("bibliography.css");
 @import url("analysis.css");
-@import url("utility-classes.css");
 @import url("s3-browser.css");
 @import url("animations.css");
 
 /* open props */
 @import url("open-props.min.css");
 
 /**************** Google Fonts + MUI **********************/
-/* Gruppo, Josefin Sans, Noto Serif, Open Sans, Playfair Display, Monoton */
-@import url("https://fonts.googleapis.com/css2?family=Gruppo&family=Josefin+Sans&family=Noto+Serif&family=Open+Sans&family=Playfair+Display&family=Monoton&family=Montserrat&display=swap");
+/* Gruppo, Open Sans, Playfair Display, Montserrat */
+@import url("https://fonts.googleapis.com/css2?family=Gruppo&family=Noto+Serif&family=Open+Sans&family=Playfair+Display&family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap");
 @import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0");
 
-/**************** Engebrechtre Font *******************/
-@font-face {
-  font-family: "Engebrechtre";
-  src: url("../fonts/engebrechtre/engebrechtre_rg.otf") format("opentype");
-}
+/**************** Agency FB Font *******************/
 @font-face {
-  font-family: "Engebrechtre";
-  font-style: italic;
-  src: url("../fonts/engebrechtre/engebrechtre_rg_it.otf") format("opentype");
+  font-family: "Agency FB";
+  font-weight: normal;
+  font-style: normal;
+  src: url("../fonts/agencyfb/agencyfb_reg.ttf") format("truetype");
 }
 @font-face {
-  font-family: "Engebrechtre";
-  font-style: bold, italic;
-  src: url("../fonts/engebrechtre/engebrechtre_bd_it.otf") format("opentype");
-}
-@font-face {
-  font-family: "Engebrechtre";
+  font-family: "Agency FB";
+  font-weight: bold;
   font-style: bold;
-  src: url("../fonts/engebrechtre/engebrechtre_bd.otf") format("opentype");
+  src: url("../fonts/agencyfb/agencyfb_bold.ttf") format("truetype");
 }
 
-/*************** Standing Room Only Font  **************/
-
+/****************** Impact Font ******************/
 @font-face {
-  font-family: "Standing Room Only";
-  src: url("../fonts/standingroomonly/StandingRoomOnlyNF.otf")
-    format("opentype");
+  font-family: "Impact";
+  src: url("../fonts/impact/impact.ttf") format("truetype");
 }