Create staging.py

ads/templates/ads/gpt_placement_tag.html

@@ -13,10 +13,12 @@
             </script>          
         </div>
     </div>
+    {% comment %}
     {% if size == "box" %}
         <a href='http://ubyssey.ca/volunteer' target="_blank">
             <div class="o-hidden o-replacement o-replacement--{{ size }}{% if div_class %} o-replacement--{{ div_class }}{% endif %}" style="background-image:url({% static 'ubyssey/images/house/volunteer.jpg' %});">
             </div>
         </a>
     {% endif %}
+    {% endcomment %}
 </div>

ads/templatetags/ubyssey_ad_filters.py

@@ -24,7 +24,7 @@ def inject_ads(value, is_mobile):
 
     # Break down content into paragraphs
     soup = BeautifulSoup(value, 'html.parser')
-    paragraphs = soup.select(".article-content > p")
+    paragraphs = soup.select("p:not(div > p)")
 
     if PARAGRAPHS_PER_AD < len(paragraphs): # If the article is somehow too short for even one ad, it doesn't get any
         x = range(0, len(paragraphs), PARAGRAPHS_PER_AD)

archive/templates/archive/objects/article_list.html

@@ -9,10 +9,10 @@
 	<div class="o-article__left">
 		<a class="o-article__image" href="{% pageurl article %}">
 			{% if article.featured_media.first.image %}
-				{% image article.featured_media.first.image fill-340x238-c100 format-webp %}
+				{% image article.featured_media.first.image fill-340x238-c100 format-webp 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="Thumbnail" />
+				alt="{{article.featured_media.first.alt_text}}" />
 			{% endif %}
 		</a>
 	</div>

article/migrations/0024_articlepage_disclaimer.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1 on 2024-05-09 00:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('article', '0023_merge_20240416_1049'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='articlepage',
+            name='disclaimer',
+            field=models.TextField(blank=True, default='', help_text="Use this format: <br>This is an opinion letter.</br> It does not reflect the opinions of The Ubyssey as a whole. You can submit an opinion <a href='ubyssey.ca/pages/submit-an-opinion'>here</a>."),
+        ),
+    ]

article/migrations/0025_remove_articlepage_fw_optional_subtitle_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.1 on 2024-05-18 00:30
+
+from django.db import migrations, models
+import images.models
+import wagtail.blocks
+import wagtail.documents.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+import wagtail.snippets.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('article', '0024_articlepage_disclaimer'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='articlepage',
+            name='fw_optional_subtitle',
+        ),
+        migrations.AddField(
+            model_name='articlefeaturedmediaorderable',
+            name='alt_text',
+            field=models.TextField(blank=True, default='', help_text='For accessibility to screen reader users, enter a description of this image. Included any relevant text inside the image.'),
+        ),
+        migrations.AddField(
+            model_name='articlepage',
+            name='title_tag',
+            field=models.CharField(blank=True, default='', help_text='This appears above the title. It mimics the title tags in the print issue.', max_length=255, verbose_name='Title Tag (Optional)'),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='content',
+            field=wagtail.fields.StreamField([('richtext', wagtail.blocks.RichTextBlock(help_text='Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields', label='Rich Text Block')), ('plaintext', wagtail.blocks.TextBlock(help_text='Warning: Rich Text Blocks preferred! Plain text primarily exists for importing old Dispatch text.', label='Plain Text Block')), ('dropcap', wagtail.blocks.TextBlock(help_text='DO NOT USE - Legacy block. Create a block where special dropcap styling with be applied to the first letter and the first letter only.\n\nThe contents of this block will be enclosed in a <p class="drop-cap">...</p> element, allowing its targetting for styling.\n\nNo RichText allowed.', label='Dropcap Block', template='article/stream_blocks/dropcap.html')), ('video', wagtail.blocks.StructBlock([('video_embed', wagtail.embeds.blocks.EmbedBlock(blank=False, null=False)), ('title', wagtail.blocks.CharBlock(max_length=255, required=False)), ('caption', wagtail.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.blocks.CharBlock(max_length=255, required=False))], help_text='Use this to credit or caption videos that will only be associated with this current article, rather than entered into our video library. You can also embed videos in a Rich Text Block.', label='Credited/Captioned One-Off Video')), ('audio', wagtail.blocks.StructBlock([('caption', wagtail.blocks.CharBlock(required=False)), ('audio', wagtail.documents.blocks.DocumentChooserBlock(help_text='Must be mp3 format', required=True))])), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('style', wagtail.blocks.ChoiceBlock(choices=[('default', 'Default'), ('left', 'Left'), ('right', 'Right')])), ('width', wagtail.blocks.ChoiceBlock(choices=[('full', 'Full'), ('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')])), ('caption', wagtail.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.blocks.CharBlock(max_length=255, required=False)), ('alt_text', wagtail.blocks.CharBlock(help_text='For accessibility to screen reader users, enter a description of this image. Included any relevant text inside the image.', max_length=255, required=False))])), ('raw_html', wagtail.blocks.RawHTMLBlock(help_text="WARNING: DO NOT use this unless you really know what you're doing!", label='Raw HTML Block')), ('quote', wagtail.blocks.StructBlock([('content', wagtail.blocks.CharBlock(required=True)), ('source', wagtail.blocks.CharBlock(required=False)), ('audio', wagtail.documents.blocks.DocumentChooserBlock(help_text='optional, must be mp3 format', required=False))])), ('gallery', wagtail.snippets.blocks.SnippetChooserBlock(target_model=images.models.GallerySnippet, template='article/stream_blocks/gallery.html')), ('header_link', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('id', wagtail.blocks.CharBlock(help_text='Intended to be shared with a page link button so that clicking the button will scroll the user to this header'))])), ('header_menu', wagtail.blocks.StructBlock([('list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('id', wagtail.blocks.CharBlock(help_text='Intended to be shared with a header so that this button will send the user to the section of the page with said header')), ('colour', wagtail.blocks.CharBlock(default='0071c9'))], label='Page Link')))])), ('visual_essay', wagtail.blocks.StructBlock([('view', wagtail.blocks.StructBlock([('view', wagtail.blocks.ChoiceBlock(choices=[('vs-side-by-side', 'Side By Side'), ('vs-over-image', 'Text Over Image')]))])), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.StructBlock([('block', wagtail.blocks.RichTextBlock(help_text='Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields', label='Rich Text Block')), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='doc-full')), ('image', wagtail.blocks.StructBlock([('block', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('style', wagtail.blocks.ChoiceBlock(choices=[('default', 'Default'), ('left', 'Left'), ('right', 'Right')])), ('width', wagtail.blocks.ChoiceBlock(choices=[('full', 'Full'), ('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')])), ('caption', wagtail.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.blocks.CharBlock(max_length=255, required=False)), ('alt_text', wagtail.blocks.CharBlock(help_text='For accessibility to screen reader users, enter a description of this image. Included any relevant text inside the image.', max_length=255, required=False))])), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='image')), ('video', wagtail.blocks.StructBlock([('block', wagtail.blocks.StructBlock([('video_embed', wagtail.embeds.blocks.EmbedBlock(blank=False, null=False)), ('title', wagtail.blocks.CharBlock(max_length=255, required=False)), ('caption', wagtail.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.blocks.CharBlock(max_length=255, required=False))], help_text='Use this to credit or caption videos that will only be associated with this current article, rather than entered into our video library. You can also embed videos in a Rich Text Block.', label='Credited/Captioned One-Off Video')), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='media')), ('audio', wagtail.blocks.StructBlock([('block', wagtail.blocks.StructBlock([('caption', wagtail.blocks.CharBlock(required=False)), ('audio', wagtail.documents.blocks.DocumentChooserBlock(help_text='Must be mp3 format', required=True))])), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='media')), ('raw_html', wagtail.blocks.StructBlock([('block', wagtail.blocks.RawHTMLBlock(help_text="WARNING: DO NOT use this unless you really know what you're doing!", label='Raw HTML Block')), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='code')), ('quote', wagtail.blocks.StructBlock([('block', wagtail.blocks.StructBlock([('content', wagtail.blocks.CharBlock(required=True)), ('source', wagtail.blocks.CharBlock(required=False)), ('audio', wagtail.documents.blocks.DocumentChooserBlock(help_text='optional, must be mp3 format', required=False))])), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='openquote')), ('header_link', wagtail.blocks.StructBlock([('block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('id', wagtail.blocks.CharBlock(help_text='Intended to be shared with a page link button so that clicking the button will scroll the user to this header'))])), ('side', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='title')), ('gap', wagtail.blocks.StructBlock([('id', wagtail.blocks.CharBlock(required=False)), ('height', wagtail.blocks.IntegerBlock(default=0, min_value=0, required=True))])), ('switch_view', wagtail.blocks.StructBlock([('view', wagtail.blocks.ChoiceBlock(choices=[('vs-side-by-side', 'Side By Side'), ('vs-over-image', 'Text Over Image')]))]))]))]))], blank=True, null=True, use_json_field=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='disclaimer',
+            field=models.TextField(blank=True, default='', help_text="Use this format: <strong>This is an opinion letter.</strong> It does not reflect the opinions of The Ubyssey as a whole. You can submit an opinion at <a href='ubyssey.ca/pages/submit-an-opinion'>ubyssey.ca/pages/submit-an-opinion</a>."),
+        ),
+    ]

article/migrations/0026_alter_articlepage_disclaimer.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.1 on 2024-05-18 02:34
+
+from django.db import migrations
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('article', '0025_remove_articlepage_fw_optional_subtitle_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articlepage',
+            name='disclaimer',
+            field=wagtail.fields.RichTextField(blank=True, default='', help_text='Used for Opinion articles or when corrections are made'),
+        ),
+    ]

article/models.py

@@ -44,7 +44,7 @@
 )
 
 from wagtail import blocks
-from wagtail.fields import StreamField
+from wagtail.fields import StreamField, RichTextField
 from wagtail.models import Page, PageManager, Orderable
 from wagtail.documents.models import Document
 from wagtail.documents.blocks import DocumentChooserBlock
@@ -266,6 +266,8 @@ class ArticleFeaturedMediaOrderable(Orderable):
 
     caption = models.TextField(blank=True, null=False, default='')
     credit = models.TextField(blank=True, null=False, default='')
+    alt_text = models.TextField(blank=True, null=False, default='',
+        help_text="For accessibility to screen reader users, enter a description of this image. Included any relevant text inside the image.")
     # style = models.CharField(max_length=255, blank=True, null=False, default='')
     # width = models.CharField(max_length=255, blank=True, null=False, default='')
     image = models.ForeignKey(
@@ -295,6 +297,7 @@ class ArticleFeaturedMediaOrderable(Orderable):
             [
                 FieldPanel("caption"),
                 FieldPanel("credit"),
+                FieldPanel("alt_text"),
             ],
             heading="Caption/Credits",
         ),
@@ -532,6 +535,13 @@ class ArticlePage(RoutablePageMixin, SectionablePage, UbysseyMenuMixin):
     )
     tags = ClusterTaggableManager(through='article.ArticlePageTag', blank=True)
 
+    disclaimer = RichTextField(
+        null=False,
+        blank=True,
+        default='',
+        help_text = "Used for Opinion articles or when corrections are made"
+    )
+
     # template #TODO
 
     #-----Promote panel stuff------
@@ -611,12 +621,12 @@ class ArticlePage(RoutablePageMixin, SectionablePage, UbysseyMenuMixin):
         max_length=255,
     )
 
-    fw_optional_subtitle = models.CharField(
+    title_tag = models.CharField(
         null=False,
         blank=True,
         default='',
-        verbose_name='Subtitle (Optional)',
-        help_text="When there is a \"special feature\" or full-width style article, sometime we want to add a subtitle alongside the title",
+        verbose_name='Title Tag (Optional)',
+        help_text="This appears above the title. It mimics the title tags in the print issue.",
         max_length=255,
     )
 
@@ -750,6 +760,13 @@ def get_template(self, request):
             heading="Featured Media",
             classname="collapsible",
         ),
+        MultiFieldPanel(
+            [
+                FieldPanel("disclaimer")
+            ],
+            heading="Disclaimer",
+            classname="collapsible",
+        ),
     ] + UbysseyMenuMixin.menu_content_panels # content_panels
 
     promote_panels = Page.promote_panels + [
@@ -838,7 +855,7 @@ def get_template(self, request):
                     help_text='This field is used to set variations on the \"Full-Width Story\" and similar layouts.',
                 ),
                 FieldPanel('fw_alternate_title'),
-                FieldPanel('fw_optional_subtitle'),
+                FieldPanel('title_tag'),
                 FieldPanel('fw_above_cut_lede'),
             ],
             heading = "Optional Header/Banner Fields",
@@ -1071,7 +1088,7 @@ def get_section_articles(self, order='-explicit_published_at') -> QuerySet:
 
         return section_articles
 
-    def get_suggested(self, number_suggested=6):
+    def get_suggested(self, number_suggested=3):
         """
         Defines the title and articles in the suggested box
         """
@@ -1081,12 +1098,14 @@ def get_suggested(self, number_suggested=6):
 
         if self.category == None or len(category_articles) == 0:
             suggested = {}
-            suggested['title'] = "From " + self.get_parent().title
+            suggested['title'] = self.get_parent().title
             suggested['articles'] = section_articles[:number_suggested]
+            suggested['link'] = self.get_parent().url
         elif len(section_articles) > 0:
             suggested = {}
-            suggested['title'] = "From " + self.get_parent().title + " - " + self.category.title
+            suggested['title'] = self.category.title
             suggested['articles'] = category_articles[:number_suggested]
+            suggested['link'] = self.category.section_page.url + "category/" + self.category.slug
         else:
             suggested = False