Skip to content

Commit

Permalink
Merge branch 'master' into fix/fieldset-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
fsbraun authored Feb 16, 2024
2 parents f393887 + 1858300 commit ebf43dd
Show file tree
Hide file tree
Showing 22 changed files with 183 additions and 210 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% load cms_tags %}
{% spaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }} id="parent-{{ instance.pk|safe }}">
{% for plugin in instance.child_plugin_instances %}
{% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
</{{ instance.tag_type }}>
{% endspaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }} id="parent-{{ instance.pk|safe }}">
{% for plugin in instance.child_plugin_instances %}
{% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
aria-controls="item-{{ instance.pk|safe }}">{{ instance.accordion_item_header }}</button>
</{{ parent.accordion_header_type|default:"h2" }}>
<{{ instance.tag_type }}{{ instance.get_attributes }} id="item-{{ instance.pk|safe }}" aria-labelledby="heading-{{ instance.pk|safe }}" data-bs-parent="#parent-{{ parent.pk|safe }}">
<div class="accordion-body">
<div class="accordion-body">{% endspaceless %}
{% with parent=instance %}
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
{% endwith %}
{% endwith %}{% spaceless %}
</div>
</{{ instance.tag_type }}>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
{% if instance.alert_dismissible %}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{% trans "Close" %}"></button>
{% endif %}
<div>
<div>{% endspaceless %}
{% for plugin in instance.child_plugin_instances %}
{% with parent=instance %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
{% endfor %}{% spaceless %}
</div>
</{{ instance.tag_type }}>
{% endspaceless %}
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
{% load cms_tags %}{% spaceless %}
<span{{ instance.get_attributes }}>{{ instance.badge_text }}</span>
{% endspaceless %}
{% load cms_tags %}<span{{ instance.get_attributes }}>{{ instance.badge_text }}</span>
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{% load cms_tags frontend %}{% spaceless %}
{% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}<div class="col mb-3">{% endif %}
<{{ instance.tag_type }}{{ instance.get_attributes }}>
{% with parent=instance %}
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
{% endwith %}
</{{ instance.tag_type }}>
{% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}</div>{% endif %}
{% endspaceless %}
{% load cms_tags frontend %}
{% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}<div class="col mb-3">{% endif %}
<{{ instance.tag_type }}{{ instance.get_attributes }}>
{% with parent=instance %}
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
{% endwith %}
</{{ instance.tag_type }}>
{% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}</div>{% endif %}
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{% load i18n cms_tags %}{% spaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }}
id="carousel-{{ instance.pk|safe }}"
data-bs-interval="{{ instance.carousel_interval|lower }}"
data-bs-keyboard="{{ instance.carousel_keyboard|lower }}"
data-bs-pause="{{ instance.carousel_pause|lower }}"
data-bs-ride="{% if instance.carousel_ride %}carousel{% else %}false{% endif %}"
data-bs-wrap="{{ instance.carousel_wrap|lower }}"
>
{% if instance.carousel_indicators %}
<div class="carousel-indicators">
{% for plugin in instance.child_plugin_instances %}
<button type="button" data-bs-target="#carousel-{{ instance.pk|safe }}"
data-bs-slide-to="{{ forloop.counter0 }}"
{% if forloop.first %} class="active"{% endif %}>
</button>
{% endfor %}
</div>
{% endif %}
{% load i18n cms_tags %}
<{{ instance.tag_type }}{{ instance.get_attributes }}
id="carousel-{{ instance.pk|safe }}"
data-bs-interval="{{ instance.carousel_interval|lower }}"
data-bs-keyboard="{{ instance.carousel_keyboard|lower }}"
data-bs-pause="{{ instance.carousel_pause|lower }}"
data-bs-ride="{% if instance.carousel_ride %}carousel{% else %}false{% endif %}"
data-bs-wrap="{{ instance.carousel_wrap|lower }}"
>
{% if instance.carousel_indicators %}
<div class="carousel-indicators">
{% for plugin in instance.child_plugin_instances %}
<button type="button" data-bs-target="#carousel-{{ instance.pk|safe }}"
data-bs-slide-to="{{ forloop.counter0 }}"
{% if forloop.first %} class="active"{% endif %}>
</button>
{% endfor %}
</div>
{% endif %}

{% with width=1024 height=768 %}
<div class="carousel-inner">
{% for plugin in instance.child_plugin_instances %}
{% render_plugin plugin %}
{% endfor %}
</div>
{% endwith %}
{% with width=1024 height=768 %}
<div class="carousel-inner">
{% for plugin in instance.child_plugin_instances %}
{% render_plugin plugin %}
{% endfor %}
</div>
{% endwith %}

{% if instance.carousel_controls %}
<button class="carousel-control-prev" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="visually-hidden-focusable">{% trans "Previous" %}</span>
</button>
<button class="carousel-control-next" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden-focusable">{% trans "Next" %}</span>
</button>
{% endif %}
</{{ instance.tag_type }}>{% endspaceless %}
{% if instance.carousel_controls %}
<button class="carousel-control-prev" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="visually-hidden-focusable">{% trans "Previous" %}</span>
</button>
<button class="carousel-control-next" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden-focusable">{% trans "Next" %}</span>
</button>
{% endif %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% load cms_tags easy_thumbnails_tags %}{% spaceless %}
{% if instance.rel_image %}
{% thumbnail instance.rel_image options.size crop=options.crop upscale=options.upscale subject_location=instance.rel_image.subject_location as thumbnail %}
{% load cms_tags easy_thumbnails_tags %}
{% if instance.rel_image %}
{% thumbnail instance.rel_image options.size crop=options.crop upscale=options.upscale subject_location=instance.rel_image.subject_location as thumbnail %}

<img class="d-block w-100" src="{{ thumbnail.url }}" alt="{{ instance.rel_image.default_alt_text|default:'' }}" />
{% else %}
<div class="d-block w-100"
style="aspect-ratio: {{ aspect_ratio }}">
{% for plugin in instance.child_plugin_instances %}
{% render_plugin plugin %}
{% endfor %}
</div>
{% endif %}{% endspaceless %}
<img class="d-block w-100" src="{{ thumbnail.url }}" alt="{{ instance.rel_image.default_alt_text|default:'' }}" />
{% else %}
<div class="d-block w-100"
style="aspect-ratio: {{ aspect_ratio }}">
{% for plugin in instance.child_plugin_instances %}
{% render_plugin plugin %}
{% endfor %}
</div>
{% endif %}
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
{% load cms_tags frontend %}{% spaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }}>
{% if link %}
<a href="{{ link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
{% load cms_tags frontend %}
<{{ instance.tag_type }}{{ instance.get_attributes }}>
{% if link %}
<a href="{{ link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
{% endif %}
{% with image=carousel_image.image %}
{% include "djangocms_frontend/bootstrap5/carousel/default/image.html" %}
{% endwith %}
{% if link %}
</a>
{% endif %}
<div class="carousel-caption d-none d-md-block">
{% if instance.carousel_content %}
{{ instance.carousel_content|html_safe }}
{% endif %}

{% with image=carousel_image.image %}
{% include "djangocms_frontend/bootstrap5/carousel/default/image.html" %}
{% endwith %}

{% if link %}
</a>
{% if instance.rel_image %}
{% for plugin in instance.child_plugin_instances %}
{% render_plugin plugin %}
{% endfor %}
{% endif %}

<div class="carousel-caption d-none d-md-block">
{% if instance.carousel_content %}
{{ instance.carousel_content|html_safe }}
{% endif %}
{% if instance.rel_image %}
{% for plugin in instance.child_plugin_instances %}
{% render_plugin plugin %}
{% endfor %}
{% endif %}
</div>
</{{ instance.tag_type }}>{% endspaceless %}
</div>
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{% load cms_tags frontend %}
{% spaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }}
<{{ instance.tag_type }}{{ instance.get_attributes }}
id="{{ instance.container_identifier }}"
role="tabpanel"
data-bs-parent="#parent-{{ parent.pk|safe }}"
aria-labelledby="trigger-{{ instance.container_identifier }}"
>
aria-labelledby="trigger-{{ instance.container_identifier }}">
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
</{{ instance.tag_type }}>
{% endspaceless %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{% load cms_tags frontend %}
{% spaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }}
<{{ instance.tag_type }}{{ instance.get_attributes }}
id="trigger-{{ instance.trigger_identifier }}"
role="tab"
data-bs-toggle="collapse"
data-bs-target="#{{ instance.trigger_identifier }}"
aria-controls="{{ instance.trigger_identifier }}"
aria-expanded="false"
>
aria-expanded="false">
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
</{{ instance.tag_type }}>
{% endspaceless %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{% load cms_tags frontend %}
{% spaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }}
id="parent-{{ instance.pk|safe }}"
data-bs-children="{{ instance.collapse_siblings }}"
role="tablist"
>
{% with parent=instance %}
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
{% endwith %}
</{{ instance.tag_type }}>
{% endspaceless %}
<{{ instance.tag_type }}{{ instance.get_attributes }}
id="parent-{{ instance.pk|safe }}"
data-bs-children="{{ instance.collapse_siblings }}"
role="tablist"
>
{% with parent=instance %}
{% for plugin in instance.child_plugin_instances %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
{% endwith %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{% load cms_tags frontend %}
{% spaceless %}
{# djlint:off #}
{% if instance.quote_origin %}
<figure{{ instance.get_attributes }}>
<blockquote class="blockquote">
{% else %}
<blockquote{{ instance.get_attributes }}>
{% endif %}
{# djlint:on #}
{% for plugin in instance.child_plugin_instances %}
{% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% empty %}{{ instance.quote_content|html_safe }}{% endfor %}
{# djlint:off #}
</blockquote>
{# djlint:on #}
{% if instance.quote_origin %}
<figcaption class="blockquote-footer">
{{ instance.quote_origin|safe_caption }}
</figcaption>
</figure>
{% endif %}
{% endspaceless %}
{# djlint:off #}
{% if instance.quote_origin %}
<figure{{ instance.get_attributes }}>
<blockquote class="blockquote">
{% else %}
<blockquote{{ instance.get_attributes }}>
{% endif %}
{# djlint:on #}
{% for plugin in instance.child_plugin_instances %}
{% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% empty %}{{ instance.quote_content|html_safe }}{% endfor %}
{# djlint:off #}
</blockquote>
{# djlint:on #}
{% if instance.quote_origin %}
<figcaption class="blockquote-footer">
{{ instance.quote_origin|safe_caption }}
</figcaption>
</figure>
{% endif %}
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{% load i18n cms_tags frontend %}
{% spaceless %}
<figure {{ instance.get_attributes }}>
{% for plugin in instance.child_plugin_instances %}
{% with forloop=parentloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
<figcaption class="figure-caption{% if figure_alignment %} text-{{ figure_alignment }}{% endif %}">{{ instance.figure_caption|safe_caption }}</figcaption>
</figure>
{% endspaceless %}
<figure {{ instance.get_attributes }}>
{% for plugin in instance.child_plugin_instances %}
{% with forloop=parentloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% endfor %}
<figcaption class="figure-caption{% if figure_alignment %} text-{{ figure_alignment }}{% endif %}">{{ instance.figure_caption|safe_caption }}</figcaption>
</figure>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% load cms_tags %}{% spaceless %}
{% load cms_tags %}
<{{ instance.tag_type }}{{ instance.get_attributes }}>
{% for plugin in instance.child_plugin_instances %}
{% if plugin.plugin_type == "CardPlugin" %}<div class="col mb-3">{% endif %}
{% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
{% if plugin.plugin_type == "CardPlugin" %}</div>{% endif %}
{% endfor %}
</{{ instance.tag_type }}>{% endspaceless %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load cms_tags sekizai_tags icon_tags %}{% add_css_for_icon instance.icon %}{% spaceless %}
{% load cms_tags sekizai_tags icon_tags %}{% add_css_for_icon instance.icon %}
<{{ instance.tag_type }}{{ instance.get_attributes }}>
{% for plugin in instance.child_plugin_instances %}
{% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
{% empty %}{{ instance.simple_content }}{% endfor %}{{ icon_text }}
</{{ instance.tag_type }}>{% endspaceless %}
</{{ instance.tag_type }}>
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{% load thumbnail frontend %}{% spaceless %}
{% if picture_link %}
<a href="{{ picture_link }}"
{% if instance.target %} target="{{ instance.target }}"{% endif %}
{% get_attributes instance.link_attributes %}>
{% load thumbnail frontend %}
{% if picture_link %}
<a href="{{ picture_link }}"
{% if instance.target %} target="{{ instance.target }}"{% endif %}
{% get_attributes instance.link_attributes %}>
{% endif %}
<img src="{{ instance.img_src }}" {% if not instance.attributes.alt and instance.rel_image.default_alt_text %}alt="{{ instance.rel_image.default_alt_text }}"{% endif %} {% if instance.width %} width="{{ instance.width|safe }}"{% endif %} {% if instance.height %} height="{{ instance.height|safe }}"{% endif %}
{% if img_srcset_data %}
srcset="{% for size, thumb in img_srcset_data %}{{ thumb.url }} {{ size|safe }}w,{% endfor %}{{ instance.img_src }} {{ picture_size.size.0|safe }}w"
sizes="{% for size, thumb in img_srcset_data %}(max-width: {{ size|safe }}px) {{ size|safe }}px, {% endfor %} {{ picture_size.size.0|safe }}px"
{% endif %}
<img src="{{ instance.img_src }}" {% if not instance.attributes.alt and instance.rel_image.default_alt_text %}alt="{{ instance.rel_image.default_alt_text }}"{% endif %} {% if instance.width %} width="{{ instance.width|safe }}"{% endif %} {% if instance.height %} height="{{ instance.height|safe }}"{% endif %}
{% if img_srcset_data %}
srcset="{% for size, thumb in img_srcset_data %}{{ thumb.url }} {{ size|safe }}w,{% endfor %}{{ instance.img_src }} {{ picture_size.size.0|safe }}w"
sizes="{% for size, thumb in img_srcset_data %}(max-width: {{ size|safe }}px) {{ size|safe }}px, {% endfor %} {{ picture_size.size.0|safe }}px"
{% endif %}
{{ instance.get_attributes }} />
{% if picture_link %}
</a>
{% endif %}
{% endspaceless %}
{{ instance.get_attributes }} />
{% if picture_link %}
</a>
{% endif %}
Loading

0 comments on commit ebf43dd

Please sign in to comment.