diff --git a/components/footer.tpl b/components/footer.tpl index 543e706..7f3ae10 100644 --- a/components/footer.tpl +++ b/components/footer.tpl @@ -1,4 +1,6 @@ diff --git a/components/post-box.tpl b/components/post-box.tpl index 0c63569..076b531 100644 --- a/components/post-box.tpl +++ b/components/post-box.tpl @@ -22,7 +22,9 @@ {% if post-box == "article" %}
{% editable article.excerpt %}
{% editable article.body %}
-
{% content name="additional_body" bind="Article" %}
+ {%- assign content_additional_title = "additional_content" | lce -%} + {%- assign content_additional_title_tooltip = "content_tooltip_additional_information" | lce -%} +
{% content name="additional_body" bind="Article" title=content_additional_title title_tooltip=content_additional_title_tooltip %}
{% endif %} diff --git a/components/template-meta.tpl b/components/template-meta.tpl index f59d493..95f9346 100644 --- a/components/template-meta.tpl +++ b/components/template-meta.tpl @@ -16,8 +16,8 @@ {% comment %}Open Graph image{% endcomment %} -{% if og_obj.image? %} - {% assign og_image = og_obj.image.for-width-1200 %} +{% if og_obj.og_image? %} + {% assign og_image = og_obj.og_image.for-width-1200 %} {% endif %} {% if og_image %} diff --git a/layouts/auto_generated_product.tpl b/layouts/auto_generated_product.tpl index 329c715..b21a513 100644 --- a/layouts/auto_generated_product.tpl +++ b/layouts/auto_generated_product.tpl @@ -26,15 +26,23 @@ {%- assign gallery_content_size = gallery_content_html | strip | size -%} +{%- capture product_social_html -%} + {%- unless editmode -%} + {%- xcontent name="product-social" -%} + {%- endunless -%} +{%- endcapture -%} + +{%- assign product_social_size = product_social_html | strip | size -%} + {% if editmode %} - {% endif %} @@ -47,9 +55,9 @@
{% if editmode %} - @@ -83,7 +91,9 @@ {%- if gallery_content_size > 0 or editmode -%}
- {% content bind=product name="gallery" %} + {%- assign gallery_title = "gallery" | lce -%} + {%- assign gallery_title_tooltip = "content_tooltip_additional_images" | lce -%} + {% content bind=product name="gallery" title=gallery_title title_tooltip=gallery_title_tooltip %}
{% endif -%}
@@ -113,7 +123,17 @@ {% include "buy-button" %} - {% content bind=product %} + {%- if editmode or product_social_size > 0 -%} +
+ {%- assign cross_page_info_title = "cross_page_info" | lce -%} + {%- assign cross_page_info_title_tooltip = "content_tooltip_all_pages_same_type" | lce -%} + {% xcontent name="product-social" title=cross_page_info_title title_tooltip=cross_page_info_title_tooltip %} +
+ {%- endif -%} + + {%- assign content_title = "content" | lce -%} + {%- assign content_title_tooltip = "content_tooltip_specific_page" | lce -%} + {% content bind=product title=content_title title_tooltip=content_title_tooltip %} @@ -123,7 +143,9 @@
- {% content bind=product name="content" %} + {%- assign bottom_content_title = "additional_content" | lce -%} + {%- assign bottom_content_title_tooltip = "content_tooltip_additional_information" | lce -%} + {% content bind=product name="content" title=bottom_content_title title_tooltip=bottom_content_title_tooltip %}
{%- endif -%} diff --git a/layouts/blog___news.tpl b/layouts/blog___news.tpl index 008c31a..286c8ac 100644 --- a/layouts/blog___news.tpl +++ b/layouts/blog___news.tpl @@ -27,10 +27,12 @@ {% include "tags-blog" %}
-
{% content %}
+ {%- assign content_default_title = "content" | lce -%} + {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%} +
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
{% addbutton %} - + {% for article in articles %} {% include "post-box" %} {% endfor %} diff --git a/layouts/common_page.tpl b/layouts/common_page.tpl index 6c110a9..1f3fdd7 100644 --- a/layouts/common_page.tpl +++ b/layouts/common_page.tpl @@ -31,8 +31,12 @@ {% include "menu-level-2" %}
-
{% content name="slogan" %}
-
{% content %}
+ {%- assign content_slogan_title = "title" | lce -%} + {%- assign content_slogan_title_tooltip = "content_tooltip_current_page_title" | lce -%} +
{% content name="slogan" title=content_slogan_title title_tooltip=content_slogan_title_tooltip %}
+ {%- assign content_default_title = "content" | lce -%} + {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%} +
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
{% include "footer" %} diff --git a/layouts/front_page.tpl b/layouts/front_page.tpl index 025fbd4..ab66f86 100644 --- a/layouts/front_page.tpl +++ b/layouts/front_page.tpl @@ -27,13 +27,15 @@
- {% if editmode or site.header.size > 0 %}
{% editable site.header %}
{% endif %} + {% if editmode or site.header.size > 0 %}
{% editable site.header %}
{% endif %} {% capture content_slogan_html %}{% unless editmode %}{% content name="slogan" %}{% endunless %}{% endcapture %}
{% content name="slogan" %}
-
{% content %}
+ {%- assign content_default_title = "content" | lce -%} + {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%} +
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
{% include "footer" %} diff --git a/layouts/product.tpl b/layouts/product.tpl index 610a683..c9c2d36 100644 --- a/layouts/product.tpl +++ b/layouts/product.tpl @@ -60,7 +60,9 @@ {%- endif -%}
- {% content name="gallery" %} + {%- assign gallery_title = "gallery" | lce -%} + {%- assign gallery_title_tooltip = "content_tooltip_additional_images" | lce -%} + {% content name="gallery" title=gallery_title title_tooltip=gallery_title_tooltip %}
@@ -74,7 +76,9 @@ {% endcontentblock %} - {% contentblock %}{{ "write_product_description_here" | lc: editor_locale }}{% endcontentblock %} + {%- assign content_title = "content" | lce -%} + {%- assign content_title_tooltip = "content_tooltip_specific_page" | lce -%} + {% contentblock title=content_title title_tooltip=content_title_tooltip %}{{ "write_product_description_here" | lc: editor_locale }}{% endcontentblock %} diff --git a/layouts/product_list.tpl b/layouts/product_list.tpl index d4ee6d8..586eb73 100644 --- a/layouts/product_list.tpl +++ b/layouts/product_list.tpl @@ -31,7 +31,9 @@ {% include "menu-level-2" %}
-
{% content %}
+ {%- assign content_default_title = "content" | lce -%} + {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%} +
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
{% include 'menu-breadcrumbs' %} {% include 'product-list-block' %}