Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1352] Hide sidemenu ctabutton when it exists in product content #575

Merged
merged 3 commits into from
Apr 6, 2023
Merged

[#1352] Hide sidemenu ctabutton when it exists in product content #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40479d7
[#1352] Removed sidemenu ctabutton when it exists in content
vaszig Apr 5, 2023
d02e502
[#1352] Fixed anchors
vaszig Apr 5, 2023
5a3a790
[#1352] Added method to the product model for ctabuttons existence
vaszig Apr 6, 2023
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
20 changes: 12 additions & 8 deletions src/open_inwoner/components/templates/components/AnchorMenu/AnchorMenu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@
</li>
{% endfor %}
{{ contents }}

<!-- dynamic anchor item for products -->
<div class="anchor-menu__start-inquiry">
{% if product.form %}
{% button_row mobile=True %}
{% button href=product.form_link text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
{% endbutton_row %}
{% elif product.link %}
{% button_row mobile=True %}
{% button href=product.link text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
{% endbutton_row %}
{% if not product.has_cta_tag %}
{% if product.form %}
{% button_row mobile=True %}
{% button href=product.form_link text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
{% endbutton_row %}
{% elif product.link %}
{% button_row mobile=True %}
{% button href=product.link text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
{% endbutton_row %}
{% endif %}
{% endif %}
</div>
</ul>
Expand Down
3 changes: 3 additions & 0 deletions src/open_inwoner/pdc/models/product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ def get_absolute_url(self, category=None):
kwargs={"slug": self.slug, "theme_slug": category_slug},
)

def has_cta_tag(self):
return "\[CTABUTTON\]" in self.content


class ProductFile(models.Model):
product = models.ForeignKey(
Expand Down
27 changes: 27 additions & 0 deletions src/open_inwoner/pdc/tests/test_product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,30 @@ def test_button_is_not_rendered_inside_content_when_no_form_or_link(self):
cta_button = response.pyquery(".grid__main")[0].find_class("cta-button")

self.assertFalse(cta_button)

def test_sidemenu_button_is_not_rendered_when_cta_inside_product_content(self):
product = ProductFactory(
content="Some content \[CTABUTTON\]", link="http://www.example.com"
)

response = self.app.get(
reverse("pdc:product_detail", kwargs={"slug": product.slug})
)
sidemenu_cta_button = response.pyquery(
'.anchor-menu__list-item a[href="http://www.example.com"]'
)

self.assertFalse(sidemenu_cta_button)

def test_sidemenu_button_is_rendered_when_no_cta_inside_product_content(self):
product = ProductFactory(content="Some content", link="http://www.example.com")

response = self.app.get(
reverse("pdc:product_detail", kwargs={"slug": product.slug})
)
sidemenu_cta_button = response.pyquery(
'.anchor-menu__list-item a[href="http://www.example.com"]'
)

self.assertTrue(sidemenu_cta_button)
self.assertIn(product.link, sidemenu_cta_button[0].values())
28 changes: 10 additions & 18 deletions src/open_inwoner/templates/pages/product/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@

{% block sidebar_content %}
{% anchor_menu anchors=anchors desktop=True %}
{% if product.form %}
<li class="anchor-menu__list-item">
{% button href=product.form_link size="big" text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
</li>
{% elif product.link %}
<li class="anchor-menu__list-item">
{% button href=product.link size="big" text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
</li>
{% if not product.has_cta_tag %}
{% if product.form %}
<li class="anchor-menu__list-item">
{% button href=product.form_link size="big" text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
</li>
{% elif product.link %}
<li class="anchor-menu__list-item">
{% button href=product.link size="big" text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
</li>
{% endif %}
{% endif %}
{% endanchor_menu %}
{% endblock sidebar_content %}
Expand All @@ -34,16 +36,6 @@ <h1 class="h1" id="title">
<p class="p">{{ object.summary }}</p>
{{ object|product_ckeditor_content|safe }}

{% if product.form %}
{% button_row mobile=True %}
{% button href=product.form_link text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
{% endbutton_row %}
{% elif product.link %}
{% button_row mobile=True %}
{% button href=product.link text=_("Aanvraag starten") primary=True icon="arrow_forward" icon_position="before" %}
{% endbutton_row %}
{% endif %}

{% if object.question_set.exists %}
<hr class="divider">
{% faq object.question_set.all %}
Expand Down