From d37c7fd53ea54053f20da7e26ebd622ab60edc05 Mon Sep 17 00:00:00 2001 From: tubbdoose Date: Sat, 21 Oct 2023 02:56:22 +0000 Subject: [PATCH] changed webp to onthefly, commented out creepy mixpanel --- archive/templates/archive/objects/article_list.html | 2 +- article/templates/article/objects/author_card.html | 2 +- article/templates/article/objects/author_pinned.html | 2 +- .../article/objects/blog_column-latest.html | 2 +- article/templates/article/objects/blog_column.html | 2 +- article/templates/article/objects/cover_story.html | 4 ++-- article/templates/article/objects/default.html | 2 +- .../templates/article/objects/featured_media.html | 2 +- .../templates/article/objects/infinitefeed_item.html | 2 +- article/templates/article/objects/top_article.html | 2 +- authors/templates/authors/author_page.html | 2 +- config/settings/base.py | 6 ------ .../sidebar/sidebar_image_link_block.html | 2 +- .../sidebar/sidebar_single_issue_block.html | 2 +- ubyssey/static_src/src/js/main.js | 12 ++++++------ ubyssey/urls.py | 5 ----- 16 files changed, 20 insertions(+), 31 deletions(-) diff --git a/archive/templates/archive/objects/article_list.html b/archive/templates/archive/objects/article_list.html index 0d0598a40..e5b50ee24 100644 --- a/archive/templates/archive/objects/article_list.html +++ b/archive/templates/archive/objects/article_list.html @@ -9,7 +9,7 @@
{% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-340x238-c100 %} + {% image article.featured_media.first.image fill-340x238-c100 format-webp %} {% elif article.featured_media.first.video %} Thumbnail diff --git a/article/templates/article/objects/author_card.html b/article/templates/article/objects/author_card.html index 58d5df166..a6ad2bcc5 100644 --- a/article/templates/article/objects/author_card.html +++ b/article/templates/article/objects/author_card.html @@ -5,7 +5,7 @@
{% if author.author.image and author.author.display_image %}
- {% image author.author.image width-200 class="author_image" %} + {% image author.author.image width-200 format-webp class="author_image" %}
{% endif %} diff --git a/article/templates/article/objects/author_pinned.html b/article/templates/article/objects/author_pinned.html index 48d2b7cd0..9b7369af4 100644 --- a/article/templates/article/objects/author_pinned.html +++ b/article/templates/article/objects/author_pinned.html @@ -10,7 +10,7 @@
{% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-340x238-c100 %} + {% image article.featured_media.first.image fill-340x238-c100 format-webp %} {% else %} {% endif %} diff --git a/article/templates/article/objects/blog_column-latest.html b/article/templates/article/objects/blog_column-latest.html index 98f38a09a..fe556ba9a 100644 --- a/article/templates/article/objects/blog_column-latest.html +++ b/article/templates/article/objects/blog_column-latest.html @@ -15,7 +15,7 @@ {% if article.featured_media.first %} {% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-250x250-c100 %} + {% image article.featured_media.first.image fill-250x250-c100 format-webp %} {% elif article.featured_media.first.video %} diff --git a/article/templates/article/objects/blog_column.html b/article/templates/article/objects/blog_column.html index a0a8ae73e..a3ca763e8 100644 --- a/article/templates/article/objects/blog_column.html +++ b/article/templates/article/objects/blog_column.html @@ -15,7 +15,7 @@ {% if article.featured_media.first %} {% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-250x250-c100 %} + {% image article.featured_media.first.image fill-250x250-c100 format-webp %} {% elif article.featured_media.first.video %} diff --git a/article/templates/article/objects/cover_story.html b/article/templates/article/objects/cover_story.html index 18fd8239e..290221c43 100644 --- a/article/templates/article/objects/cover_story.html +++ b/article/templates/article/objects/cover_story.html @@ -9,11 +9,11 @@
{% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-661x462-c100 %} + {% image article.featured_media.first.image fill-661x462-c100 format-webp %} {% elif article.featured_media.first.video %} {% else %} - {% image article.featured_media fill-661x462-c100 %} + {% image article.featured_media fill-661x462-c100 format-webp %} {% endif %}
diff --git a/article/templates/article/objects/default.html b/article/templates/article/objects/default.html index fda487cc1..056d64253 100644 --- a/article/templates/article/objects/default.html +++ b/article/templates/article/objects/default.html @@ -7,7 +7,7 @@
{% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-340x238-c100 %} + {% image article.featured_media.first.image fill-340x238-c100 format-webp %} {% else %} {% endif %} diff --git a/article/templates/article/objects/featured_media.html b/article/templates/article/objects/featured_media.html index af36dd93e..5f10a4dd4 100644 --- a/article/templates/article/objects/featured_media.html +++ b/article/templates/article/objects/featured_media.html @@ -6,7 +6,7 @@ {% with featured_media.first as featured_image_object %}
{% image featured_image_object.image original as original_image %} - {% image featured_image_object.image width-500 as featured_image %} + {% image featured_image_object.image width-500 format-webp as featured_image %}
- {% image article.featured_media.first.image fill-340x238-c100 %} + {% image article.featured_media.first.image fill-340x238-c100 format-webp %} {% if label %} {% if article|get_label %} diff --git a/article/templates/article/objects/top_article.html b/article/templates/article/objects/top_article.html index 1d1fc6407..8fe1df553 100644 --- a/article/templates/article/objects/top_article.html +++ b/article/templates/article/objects/top_article.html @@ -11,7 +11,7 @@ {% if article.featured_media.first %} {% if article.featured_media.first.image %} - {% image article.featured_media.first.image fill-250x250-c100 %} + {% image article.featured_media.first.image fill-250x250-c100 format-webp %} {% elif article.featured_media.first.video %} {% endif %} diff --git a/authors/templates/authors/author_page.html b/authors/templates/authors/author_page.html index ee083cdee..e7fdde72f 100644 --- a/authors/templates/authors/author_page.html +++ b/authors/templates/authors/author_page.html @@ -19,7 +19,7 @@
{% if self.image %} - {% image self.image width-350 as pfp %} + {% image self.image width-350 format-webp as pfp %}
{% endif %}
diff --git a/config/settings/base.py b/config/settings/base.py index 30e877102..c428ea1f7 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -306,12 +306,6 @@ WAGTAILIMAGES_IMAGE_MODEL = 'images.UbysseyImage' -WAGTAILIMAGES_FORMAT_CONVERSIONS = { - 'png': 'webp', - 'jpeg': 'webp', - 'bmp': 'webp', - 'webp': 'webp', -} # wagtailmenus settings WAGTAILMENUS_ACTIVE_CLASS = 'current' # used for css in e.g. navigation/header.html diff --git a/infinitefeed/templates/infinitefeed/sidebar/sidebar_image_link_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_image_link_block.html index 5408b4db0..6540399a9 100644 --- a/infinitefeed/templates/infinitefeed/sidebar/sidebar_image_link_block.html +++ b/infinitefeed/templates/infinitefeed/sidebar/sidebar_image_link_block.html @@ -2,7 +2,7 @@ {% if self.link %} {% endif %} -{% image self.image width-320 %} +{% image self.image width-320 format-webp %} {% if self.link %} {% endif %} \ No newline at end of file diff --git a/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html index 218e0615c..20f2ed58a 100644 --- a/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html +++ b/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html @@ -3,7 +3,7 @@

{{ self.date }}

{% if self.show_image and self.image %} - {% image self.image width-350 as mag %} + {% image self.image width-350 format-webp as mag %} {% endif %} diff --git a/ubyssey/static_src/src/js/main.js b/ubyssey/static_src/src/js/main.js index ca98eeac5..59efc7662 100644 --- a/ubyssey/static_src/src/js/main.js +++ b/ubyssey/static_src/src/js/main.js @@ -1,4 +1,4 @@ -import * as mp from './modules/Mixpanel'; +// import * as mp from './modules/Mixpanel'; //commented out because creepy af import upcomingEvents from './widgets/upcoming-events'; // self-executing js anonymous function @@ -23,11 +23,11 @@ import upcomingEvents from './widgets/upcoming-events'; //initializeGallery() // Track page views through Mixpanel (for articles & for non-article pages) - if ($('.js-article').length) { - mp.pageView('article', $('.js-article'), 1) // article pages - } else { - mp.pageView(); // non-article pages - } + //if ($('.js-article').length) { + // mp.pageView('article', $('.js-article'), 1) // article pages + //} else { + // mp.pageView(); // non-article pages + //} //listeners for magazine & culture dropdowns in mobile header pop up $('#magazine-mobile').click(function () { diff --git a/ubyssey/urls.py b/ubyssey/urls.py index 1673447ac..a9b69091b 100644 --- a/ubyssey/urls.py +++ b/ubyssey/urls.py @@ -20,11 +20,6 @@ urlpatterns = [] -settings.WAGTAILIMAGES_FORMAT_CONVERSIONS = { - 'jpeg': 'webp', - 'png': 'webp', - 'webp': 'webp', -} if settings.DEBUG: import debug_toolbar