Merge branch 'develop' into adding-a-loader

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-buster
+FROM python:3.10-bullseye
 COPY . /workspaces/ubyssey.ca/
 WORKDIR /workspaces/ubyssey.ca/
 # Installs some basics

article/models.py

@@ -748,6 +748,8 @@ def get_template(self, request):
             return "article/article_page_supplement_2024_science.html"
         elif self.layout == 'femme-2024':
             return "article/supplements/article_page_supplement_2024_femme.html"
+        elif self.layout == 'nocturne-2024':
+            return "article/supplements/article_page_supplement_2024_nocturne.html"
 
         return "article/article_page.html"
 
@@ -880,6 +882,7 @@ def get_template(self, request):
                             ('guide-2024', 'Guide (2024 style)'),
                             ('science-2024', 'Science Supplement (2024)'),
                             ('femme-2024', 'Femme Culture Special Issue (2024)'),
+                            ('nocturne-2024', 'Nocturne Features Supplement (2024)'),
                         ],
                     ),
                 ),

article/templates/article/objects/cover_story.html

@@ -19,9 +19,11 @@
   </div>
   {% endif %}
   <div class="o-article__right">
-    <mark class="o-article__headline" id="coverstory" >
-      <a href="{% pageurl article %}">{{ article.title|safe }}</a>
-    </mark>
+    <div class="o-article__headline">
+      <mark id="coverstory" >
+        <a href="{% pageurl article %}">{{ article.title|safe }}</a>
+      </mark>
+    </div>
     <div class="o-article__meta">
       <p class="o-article__snippet">{% if article.lede %}{{article.lede|safe}}{% else %}{{article.search_description|safe}}{% endif %}</p>
       <div class="o-article__byline">

article/templates/article/objects/share_bar.html

@@ -4,6 +4,11 @@
     <a href="#" class="share-link c-share_space" title="Copy Link to Clipboard"><ion-icon name="link" aria-hidden="true"></ion-icon><span id="custom-tooltip">copied!</span></i></a>
     <a href="#" class="share-mastodon c-share_space" title="Share to Mastodon"><ion-icon name="logo-mastodon" aria-hidden="true"></ion-icon></i></a> 
     <a href="#" class="share-facebook c-share_space" title="Share to Facebook"><ion-icon name="logo-facebook" aria-hidden="true"></ion-icon></i></a>
+    <a href="#" class="share-bsky c-share_space" title="Share to Bluesky">
+        <svg viewBox="0 0 600 530" version="1.1" xmlns="http://www.w3.org/2000/svg">
+            <path d="m135.72 44.03c66.496 49.921 138.02 151.14 164.28 205.46 26.262-54.316 97.782-155.54 164.28-205.46 47.98-36.021 125.72-63.892 125.72 24.795 0 17.712-10.155 148.79-16.111 170.07-20.703 73.984-96.144 92.854-163.25 81.433 117.3 19.964 147.14 86.092 82.697 152.22-122.39 125.59-175.91-31.511-189.63-71.766-2.514-7.3797-3.6904-10.832-3.7077-7.8964-0.0174-2.9357-1.1937 0.51669-3.7077 7.8964-13.714 40.255-67.233 197.36-189.63 71.766-64.444-66.128-34.605-132.26 82.697-152.22-67.108 11.421-142.55-7.4491-163.25-81.433-5.9562-21.282-16.111-152.36-16.111-170.07 0-88.687 77.742-60.816 125.72-24.795z"/>
+        </svg>
+    </a> 
     <a href="#" class="share-twitter c-share_space" title="Share to Twitter"><ion-icon name="logo-twitter" aria-hidden="true"></ion-icon></i></a>
     <a href="#" class="share-reddit c-share_space" title="Share to Reddit"><ion-icon name="logo-reddit" aria-hidden="true"></ion-icon></i></a> 
 </span>

article/templates/article/objects/top_article.html

@@ -7,12 +7,31 @@
 {% if article %}
   <article class="o-article o-article--top_article{% if padded %} o-article--padded{% endif %}">
     <div class="o-article__left">
+      <div class="o-article__above-headline">
+        <a href="{{article|get_section_link}}" class="o-article__section-tag">{{article|get_section_title}}</a>
+        {% if article.title_tag %}
+          <div class="top_article-title-tag">{{article.title_tag}}//</div>
+        {% elif article.category %}
+          <div class="top_article-title-tag">{{article.category.title}}//</div>
+        {% endif %}
+      </div>  
+      <h2 class="o-article__headline">
+        <a href="{% pageurl article %}">{{ article.title|safe }}</a>
+      </h2>
+      <div class="o-article__byline">
+        <span class="o-article__author">{{ article.get_authors_split_out_visual_bylines|safe }}</span>
+        <span> &nbsp;&nbsp; </span>
+        <span class="o-article__published">{{ article.explicit_published_at|display_pubdate }}</span>
+      </div>
+    </div>
+
+    <div class="o-article__right">
       <a href="{{article|get_section_link}}" class="o-article__section-tag">{{article|get_section_title}}</a>
       <div class="o-article__meta__image">
         {% if article.featured_media.first %}
             <a class="o-article__image" href="{% pageurl article %}">
               {% if article.featured_media.first.image %}
-              {% image article.featured_media.first.image fill-150x150-c100 format-webp loading='lazy' alt=article.featured_media.first.alt_text %}
+              {% image article.featured_media.first.image fill-168x168-c100 format-webp loading='lazy' alt=article.featured_media.first.alt_text %}
               {% elif article.featured_media.first.video %}
               <img src='http://img.youtube.com/vi/{{ article.featured_media.first.video.url|youtube_embed_id|safe }}/0.jpg' alt="{{article.featured_media.first.alt_text}}">
               {% endif %}
@@ -29,22 +48,5 @@
 
       </div>
     </div>
-    <div class="o-article__right">
-
-      {% if article.title_tag %}
-        <div class="top_article-title-tag">{{article.title_tag}}//</div>
-      {% elif article.category %}
-        <div class="top_article-title-tag">{{article.category.title}}//</div>
-      {% endif %}
-
-      <h2 class="o-article__headline">
-        <a href="{% pageurl article %}">{{ article.title|safe }}</a>
-      </h2>
-      <div class="o-article__byline">
-        <span class="o-article__author">{{ article.get_authors_split_out_visual_bylines|safe }}</span>
-        <span> &nbsp;&nbsp; </span>
-        <span class="o-article__published">{{ article.explicit_published_at|display_pubdate }}</span>
-      </div>
-    </div>
   </article>
 {% endif %}