Revert "Revert "Redesign!!!""

This reverts commit a14d986.

ads/models.py

@@ -90,7 +90,7 @@ class AdTagSettings(ClusterableModel, BaseSetting):
  ),
  MultiFieldPanel(
  [
- InlinePanel("home_sidebar_placements", label="Home sidebar placement tags"),
+ InlinePanel("home_sidebar_placements", label="Sidebar placement tags"),
  ],
  heading="Sidebar Placement Tags"
  ),

ads/templatetags/ubyssey_ad_filters.py

@@ -23,7 +23,8 @@ def inject_ads(value, is_mobile):
  is_mobile = True
 
  # Break down content into paragraphs
- paragraphs = value.split("</p>")
+ soup = BeautifulSoup(value, 'html.parser')
+ paragraphs = soup.select(".article-content > 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)
@@ -44,11 +45,9 @@ def inject_ads(value, is_mobile):
  'size' : size,
  }
  ad_string = render_to_string('ads/advertisement_inline.html', context=ad_context)
- paragraphs[n] = ad_string + paragraphs[n]
+ paragraphs[n].insert_after(BeautifulSoup(ad_string, 'html.parser'))
 
- # Assemble our text back with injected HTML
- value = "</p>".join(paragraphs)
- return value
+ return soup.prettify()
 
 @register.filter(name='specify_homepage_sidebar_ads')
 @stringfilter

ads/templatetags/ubyssey_ad_tags.py

@@ -30,12 +30,12 @@ def gpt_define_tag(slug, is_mobile=False) -> dict:
  'skyscraper' : '[[300, 250], [300, 600]]',
  'banner': '[468, 60]',
  'leaderboard': '[[728, 90], [970, 90]]',
- 'mobile-leaderboard': '[300, 50]'
+ 'mobile-leaderboard': '[320, 50]'
  }
  if is_mobile and "Intra_Article" in ad_slot.dfp:
  return {
  'div_id' : ad_slot.div_id,
- 'dfs' : ad_slot.dfs,
+ 'dfp' : ad_slot.dfp,
  'size' : SIZES['mobile-leaderboard'],
  }
  else:

archive/migrations/0002_sectionpageorderables.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.11 on 2023-07-11 11:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wagtailcore', '0066_collection_management_permissions'),
+ ('archive', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='SectionPageOrderables',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('sort_order', models.IntegerField(blank=True, editable=False, null=True)),
+ ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='sections_filters', to='archive.archivepage')),
+ ('section_filter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.page', verbose_name='Page Link')),
+ ],
+ options={
+ 'ordering': ['sort_order'],
+ 'abstract': False,
+ },
+ ),
+ ]

archive/migrations/0003_auto_20230711_2106.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.11 on 2023-07-12 04:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wagtailcore', '0066_collection_management_permissions'),
+ ('section', '0003_sectionpage_use_parent_colour'),
+ ('archive', '0002_sectionpageorderables'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='sectionpageorderables',
+ name='section_filter',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.page', verbose_name='Section Page'),
+ ),
+ migrations.CreateModel(
+ name='MagazineOrderables',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('sort_order', models.IntegerField(blank=True, editable=False, null=True)),
+ ('magazine_filter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='section.categorysnippet', verbose_name='Magazine')),
+ ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='magazines_filters', to='archive.archivepage')),
+ ],
+ options={
+ 'ordering': ['sort_order'],
+ 'abstract': False,
+ },
+ ),
+ ]

archive/migrations/0004_spooforderables.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.11 on 2023-07-12 04:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('section', '0003_sectionpage_use_parent_colour'),
+ ('archive', '0003_auto_20230711_2106'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='SpoofOrderables',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('sort_order', models.IntegerField(blank=True, editable=False, null=True)),
+ ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='spoofs_filters', to='archive.archivepage')),
+ ('spoof_filter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='section.categorysnippet', verbose_name='Spoof')),
+ ],
+ options={
+ 'ordering': ['sort_order'],
+ 'abstract': False,
+ },
+ ),
+ ]