Merge pull request #124 from Voog/122_123_design_improvements

Add various design improvements
Voog · May 24, 2022 · feb0eda · feb0eda
2 parents 17957ac + bca4130
commit feb0eda
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 20 deletions.
diff --git a/components/footer.tpl b/components/footer.tpl
@@ -2,7 +2,9 @@
   <div class="footer-inner formatted">
     <div class="cfx">
       {% include "search" %}
-      {% xcontent name="footer" %}
+
+      {%- assign footer_content_title_tooltip = "content_tooltip_all_pages_same_language" | lce -%}
+      {% xcontent name="footer" title_tooltip=footer_content_title_tooltip %}
     </div>
     <div class="voog-reference">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div>
   </div>

diff --git a/components/template-meta.tpl b/components/template-meta.tpl
@@ -29,8 +29,8 @@
     {% endfor %}
   {% endif %}
 {% else %}
-  {% 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 %}
 {% endif %}
 

diff --git a/layouts/auto_generated_product.tpl b/layouts/auto_generated_product.tpl
@@ -23,6 +23,14 @@
 
 {%- 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 -%}
+
 <body class="{% if site.search.enabled %}search-enabled{% endif %}{% if editmode %} editmode{% endif %}">
   <div class="wrap cfx">
     {% include "langmenu" %}
@@ -60,7 +68,9 @@
 
                   {%- if gallery_content_size > 0 or editmode -%}
                     <section class="mar_0-8 content-body content-formatted mar_t-32 js-product-gallery" data-search-indexing-allowed="true">
-                      {% 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 %}
                     </section>
                   {% endif -%}
                 </div>
@@ -90,7 +100,17 @@
                         {% include "buy-button" %}
                       </div>
 
-                      {% content bind=product %}
+                      {%- if editmode or product_social_size > 0 -%}
+                        <div class="product-cross-page-info">
+                          {%- 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 %}
+                        </div>
+                      {%- endif -%}
+
+                      {%- assign content_default_title = "content" | lce -%}
+                      {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
+                      {% content bind=product title=content_default_title title_tooltip=content_default_title_tooltip %}
                     </section>
                   </div>
                 </div>
@@ -100,7 +120,9 @@
                 <section
                   class="content-product-wide content-area mar_0-8"
                   data-search-indexing-allowed="true">
-                  {% 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 %}
                 </section>
               {%- endif -%}
 

diff --git a/layouts/blog___news.tpl b/layouts/blog___news.tpl
@@ -34,8 +34,10 @@
               {% endif %}
             </nav>
           </div>
-          <section class="content blog-content inner cfx" {{ edy_intro_edit_text }}>
-            {% content %}
+          <section class="content blog-content inner cfx">
+            {%- 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 %}
             {% if editmode %}
               <div class="addbutton">{% addbutton %}</div>
             {% endif %}

diff --git a/layouts/blog_article.tpl b/layouts/blog_article.tpl
@@ -45,8 +45,13 @@
             </header>
             <section class="post-content">
               <div class="post-excerpt cfx formatted">{% editable article.excerpt %}</div>
-              <div class="post-body cfx formatted" {{ edy_intro_edit_text }}>{% editable article.body %}</div>
-              <div class="post-body cfx formatted">{% content name="additional_body" bind="Article" %}</div>
+              <div class="post-body cfx formatted">{% editable article.body %}</div>
+
+              {%- assign bottom_content_title = "additional_content" | lce -%}
+              {%- assign bottom_content_title_tooltip = "content_tooltip_additional_information" | lce -%}
+              <div class="post-body cfx formatted">
+                {% content name="additional_body" bind="Article" title=bottom_content_title title_tooltip=bottom_content_title_tooltip %}
+              </div>
 
               {% if editmode %}
               <div class="post-tags">

diff --git a/layouts/common_page.tpl b/layouts/common_page.tpl
@@ -18,9 +18,16 @@
         <div class="container-wrap cfx">
           <div class="container">
             {% include "submenu" %}
-            <section class="content cfx formatted" {{ edy_intro_edit_text }}>
-              {% contentblock name="content_header" publish_default_content="true" %}<h1>{{ page.title }}</h1>{% endcontentblock %}
-              {% content %}
+            <section class="content cfx formatted">
+              {%- assign page_title_content_title = "title" | lce -%}
+              {%- assign page_title_content_title_tooltip = "content_tooltip_current_page_title" | lce -%}
+              {% contentblock name="content_header" publish_default_content="true" title=page_title_content_title title_tooltip=page_title_content_title_tooltip %}
+                <h1>{{ page.title }}</h1>
+              {% endcontentblock %}
+
+              {%- 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 %}
             </section>
           </div>
         </div>

diff --git a/layouts/front_page.tpl b/layouts/front_page.tpl
@@ -27,8 +27,10 @@
                 <section class="content formatted js-background-type {{ front_page_content_cover_type }}">
                   <div class="tbl">
                     <div class="tbl-row">
-                      <div class="tbl-cell" {{ edy_intro_edit_text }}>
-                        {% content %}
+                      <div class="tbl-cell">
+                        {%- 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 %}
                       </div>
                     </div>
                   </div>

diff --git a/layouts/product.tpl b/layouts/product.tpl
@@ -49,15 +49,21 @@
                       {%- endif -%}
                     </div>
                     <section class="content-body content-formatted mar_0-32 mar_t-32" data-search-indexing-allowed="true">
-                      {% 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 %}
                     </section>
                   </div>
 
                   <div class="flex_row-2--item-50">
                     <div class="mar_0-32 flex_col t-sticky">
                       <section class="content-body content-formatted js-buy-btn-content"
                         data-search-indexing-allowed="true">
-                        {% contentblock %}{{ "write_product_description_here" | lc: editor_locale }}{% endcontentblock %}
+                        {%- assign content_default_title = "content" | lce -%}
+                        {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
+                        {% contentblock title=content_default_title title_tooltip=content_default_title_tooltip %}
+                          {{ "write_product_description_here" | lc: editor_locale }}
+                        {% endcontentblock %}
                       </section>
                     </div>
                   </div>

diff --git a/layouts/product_list.tpl b/layouts/product_list.tpl
@@ -19,11 +19,17 @@
             <div class="container">
               {% include "submenu" %}
               <section class="content cfx formatted" {{ edy_intro_edit_text }}>
-                {% contentblock name="content_header" publish_default_content="true" %}<h1>{{ page.title }}</h1>{% endcontentblock %}
+                {%- assign page_title_content_title = "title" | lce -%}
+                {%- assign page_title_content_title_tooltip = "content_tooltip_current_page_title" | lce -%}
+                {% contentblock name="content_header" publish_default_content="true" title=page_title_content_title title_tooltip=page_title_content_title_tooltip %}
+                  <h1>{{ page.title }}</h1>
+                {% endcontentblock %}
                 {% include 'menu-breadcrumbs' %}
                 {% include 'product-list-block' %}
                 <div class="product-list-content" data-search-indexing-allowed="true">
-                  {% 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 %}
                 </div>
               </section>
             </div>

diff --git a/sources/stylesheets/layouts/_auto-generated-product.scss b/sources/stylesheets/layouts/_auto-generated-product.scss
@@ -9,6 +9,10 @@
     background-repeat: no-repeat;
     background-position: center;
   }
+
+  .product-cross-page-info {
+    margin-bottom: 32px;
+  }
 }
 
 .product-price {

diff --git a/stylesheets/main.css b/stylesheets/main.css
@@ -3371,6 +3371,10 @@ body .edy-settings-editor:not(.editor_default) .edy-popover-content .edy-setting
   background-position: center;
 }
 
+.product-content .product-cross-page-info {
+  margin-bottom: 32px;
+}
+
 .product-price {
   padding: 8px 0 24px 0;
 }

diff --git a/stylesheets/main.min.css b/stylesheets/main.min.css