Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<h2>
<img src="{{ static('img/logos/mozilla/ads/Mozilla_Ads_Logo.svg') }}" alt="{{ ftl('footer-refresh-mozilla-ads') }}" width="250" height="33" class="moz24-footer-advertising-logo">
</h2>
{% if ftl_has_messages('footer-refresh-extend-reach') %}
<p>{{ ftl('footer-refresh-extend-reach') }}</p>
{% if ftl_has_messages('footer-refresh-add-trust-to') or ftl_has_messages('footer-refresh-extend-reach') %}
<p>{{ ftl('footer-refresh-add-trust-to', fallback='footer-refresh-extend-reach') }}</p>
{% endif %}
<a class="moz24-footer-advertising-link" href="{{ url('mozorg.advertising.landing') }}" data-link-position="footer" data-link-text="Learn more">
<span class="mzp-c-button-icon-text">{{ ftl('footer-refresh-learn-more-about-mozilla-ads', fallback='footer-refresh-learn-more-about-mozilla-advertising') }}</span>
Expand Down
7 changes: 3 additions & 4 deletions bedrock/base/templates/macros-m24.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
Macro Parameters:
author: Author of the media.
class: String providing modifier class(es) to the item.
image: Thumbnail image. Can pass an <img> element, resp_img or picture Python helpers.
link_attributes: A generic parameter to add any extra attributes to the CTA link, such as target, rel, or data attributes for GA tracking. Note that the quotes will pass through unescaped.
link_url (Required): String or url helper function provides href value for item.
preview: Blurb / summary of the media. (usually a translation id wrapped in ftl function).
Expand All @@ -81,7 +80,6 @@
{% macro springboard_item(
author=None,
class=None,
image=None,
link_attributes=None,
link_url=None,
preview=None,
Expand All @@ -93,10 +91,11 @@
<li class="m24-c-springboard-item {{ class }}">
<a href="{{ link_url }}" class="m24-c-springboard-link" {{ link_attributes }}>
<div class="m24-c-springboard-thumb">
{{ image }}
{% if type_icon %}
<span class="m24-c-springboard-icon m24-c-springboard-icon-{{ type_icon|lower }}"></span>
{% endif %}
</div>
<div class="m24-c-springboard-type">
{% if type_icon %}<span class="m24-c-springboard-icon m24-c-springboard-icon-{{ type_icon|lower }}"></span>{% endif %}
{{ type }}
</div>
<div class="m24-c-springboard-author">{{ author }}</div>
Expand Down
3 changes: 2 additions & 1 deletion bedrock/mozorg/templates/mozorg/home/home-m24.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@
{% include 'mozorg/home/includes/m24/donate.html'%}
{% include 'mozorg/home/includes/m24/ai-gallery.html'%}
{% include 'mozorg/home/includes/m24/media-springboard.html'%}
{% include 'mozorg/home/includes/m24/data-collective.html'%}
{% if ftl_has_messages('m24-home-state-of-mozilla', 'm24-home-mozilla-is-reinventing-itself', 'm24-home-read-the-report') %}
{% include 'mozorg/home/includes/m24/showcase-som.html'%}
{% else %}
{% include 'mozorg/home/includes/m24/showcase.html'%}
{% endif %}
{% include 'mozorg/home/includes/m24/issues-gallery.html'%}

{% include 'mozorg/home/includes/m24/outside-the-fox.html'%}
</main>

{% endblock %}
Expand Down
300 changes: 174 additions & 126 deletions bedrock/mozorg/templates/mozorg/home/includes/m24/ai-gallery.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

<div class="m24-t-gray" id="data-collective">
<div class="m24-c-donate">
<h2 class="m24-c-donate-title">{{ ftl('m24-home-mozilla-data-collective') }}</h2>
<div class="m24-c-donate-info">
<p>{{ ftl('m24-home-mozilla-create-curate-control') }}</p>
<p>{{ ftl('m24-home-mozilla-data-collective-is') }}</p>
<p><a href="https://datacollective.mozillafoundation.org/{{ utm_params }}" class="m24-c-cta" data-cta-text="Join Mozilla Data Collective">{{ ftl('m24-home-join-mozilla-data') }}</a></p>
Comment thread
wen-2018 marked this conversation as resolved.
</div>
<div class="m24-c-donate-media">
{{ resp_img(
url='img/home/2024/collective-1450.png',
srcset={
"img/home/2024/collective-375.png": "375w",
"img/home/2024/collective-573.png": "573w",
"img/home/2024/collective-720.png": "720w",
"img/home/2024/collective-976.png": "976w",
"img/home/2024/collective-1128.png": "1128w",
"img/home/2024/collective-1232.png": "1232w",
"img/home/2024/collective-1450.png": "1450w",
},
sizes={
"(min-width: 768px)": "calc((100vw - 32px) / 2)",
"(min-width: 1311px)": "calc((100vw - 64px) / 2)",
"(min-width: 1440px)": "680px",
"default": "calc(100vw - 32px)",
},
optional_attributes={
'width': '1450',
'height': '725',
}
) }}
</div>
</div>
</div>

<div class="m24-c-transition m24-t-top-gray m24-t-bottom-pink"><hr></div>
Original file line number Diff line number Diff line change
Expand Up @@ -11,44 +11,45 @@
<h2 class="m24-c-intro-title">{{ ftl('m24-home-explore-issues-shaping') }}</h2>
</header>
<div class="m24-c-gallery-container">

{{ gallery_tile(
class='m24-l-grid-half',
image=picture(
url="img/home/2024/issues/pni-720.jpg",
sources=[
{
"srcset" : {
"img/home/2024/issues/pni-1024.jpg": "1024w",
"img/home/2024/issues/pni-1232.jpg": "1232w",
"img/home/2024/issues/pni-1360.jpg": "1360w",
"img/home/2024/issues/pni-1450.jpg": "1450w",
"img/home/2024/issues/pni-375.jpg": "375w",
"img/home/2024/issues/pni-688.jpg": "688w",
"img/home/2024/issues/pni-720.jpg": "720w",
"img/home/2024/issues/pni-976.jpg": "976w",
{% if ftl_has_messages('m24-home-the-validation-machines', 'm24-home-in-the-atlantic', 'm24-home-read-more' ) %}
{{ gallery_tile(
class='m24-l-grid-half',
image=picture(
url="img/home/2024/issues/validation-720.jpg",
sources=[
{
"srcset" : {
"img/home/2024/issues/validation-1024.jpg": "1024w",
"img/home/2024/issues/validation-1232.jpg": "1232w",
"img/home/2024/issues/validation-1360.jpg": "1360w",
"img/home/2024/issues/validation-1450.jpg": "1450w",
"img/home/2024/issues/validation-375.jpg": "375w",
"img/home/2024/issues/validation-688.jpg": "688w",
"img/home/2024/issues/validation-720.jpg": "720w",
"img/home/2024/issues/validation-976.jpg": "976w",
},
'sizes': {
"(min-width: 768px)": "calc((100vw - 32px) / 2)",
"(min-width: 1311px)": "calc((100vw - 64px) / 2)",
"(min-width: 1440px)": "680px",
"default": "calc(100vw - 32px)",
},
},
'sizes': {
"(min-width: 768px)": "calc((100vw - 32px) / 2)",
"(min-width: 1311px)": "calc((100vw - 64px) / 2)",
"(min-width: 1440px)": "680px",
"default": "calc(100vw - 32px)",
},
},
],
optional_attributes={
"loading": "lazy",
"alt": ftl('m24-home-alt-pni'),
"width": "1450",
"height": "725",
}
),
title=ftl('m24-home-privacy-not-included'),
desc=ftl('m24-home-search-our-reviews'),
link_url='https://foundation.mozilla.org/privacynotincluded/' + utm_params,
cta_text=ftl('m24-home-pni-search-now'),
link_attributes='rel="external" target="_blank" data-link-text="Search now"',
) }}
],
optional_attributes={
"loading": "lazy",
"alt": ftl('m24-home-alt-validation'),
"width": "1450",
"height": "725",
}
),
title=ftl('m24-home-the-validation-machines'),
desc=ftl('m24-home-in-the-atlantic'),
link_url='https://www.theatlantic.com/ideas/archive/2025/10/validation-ai-raffi-krikorian/684764/' + utm_params,
cta_text=ftl('m24-home-read-more'),
link_attributes='rel="external" target="_blank" data-link-text="Read more about The Validation Machines"',
) }}
{% endif %}

{{ gallery_tile(
class='m24-l-grid-half',
Expand Down Expand Up @@ -90,5 +91,3 @@ <h2 class="m24-c-intro-title">{{ ftl('m24-home-explore-issues-shaping') }}</h2>

</div>
</section>

<div class="m24-c-transition m24-t-top-light m24-t-bottom-dark-alt"><hr></div>
Loading