Merge pull request #130 from Voog/128_129_design_improvements

Add various design improvements
Voog · May 24, 2022 · 53083a4 · 53083a4
2 parents 44f7627 + 6b3f7fd
commit 53083a4
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 23 deletions.
diff --git a/components/footer.tpl b/components/footer.tpl
@@ -1,4 +1,6 @@
 <footer class="footer">
-  <div class="content-formatted">{% xcontent name="footer" %}</div>
+  {%- assign footer_content_title = "footer" | lce -%}
+  {%- assign footer_content_title_tooltip = "content_tooltip_all_pages_same_language" | lce -%}
+  <div class="content-formatted">{% xcontent name="footer" title=footer_content_title title_tooltip=footer_content_title_tooltip %}</div>
   <div class="voog-reference">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div>
 </footer>
diff --git a/components/post-box.tpl b/components/post-box.tpl
@@ -22,7 +22,9 @@
     {% if post-box == "article" %}
       <div class="post-excerpt content-formatted" {{ edy_intro_edit_text }}>{% editable article.excerpt %}</div>
       <div class="post-body content-formatted">{% editable article.body %}</div>
-      <div class="post-body content-formatted">{% content name="additional_body" bind="Article" %}</div>
+      {%- assign content_additional_title = "additional_content" | lce -%}
+      {%- assign content_additional_title_tooltip = "content_tooltip_additional_information" | lce -%}
+      <div class="post-body content-formatted">{% content name="additional_body" bind="Article" title=content_additional_title title_tooltip=content_additional_title_tooltip %}</div>
     {% endif %}
   </div>
 

diff --git a/components/template-meta.tpl b/components/template-meta.tpl
@@ -16,8 +16,8 @@
 <meta property="og:site_name" content="{{ page.site_title | escape }}">
 
 {% 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
@@ -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 -%}
+
 <body class="product_page js-bg-picker-area">
   {% if editmode %}
-    <button 
-      class="voog-bg-picker-btn js-background-settings" 
-      data-bg-key="{{ body_bg_key }}" 
+    <button
+      class="voog-bg-picker-btn js-background-settings"
+      data-bg-key="{{ body_bg_key }}"
       data-bg-picture-boolean="true"
-      data-bg-image="{{ body_bg_image }}" 
+      data-bg-image="{{ body_bg_image }}"
       data-bg-image-sizes="{{ body_bg_image_sizes_str | escape }}"
-      data-bg-color="{{ body_bg_color }}" 
+      data-bg-color="{{ body_bg_color }}"
       data-bg-color-data="{{ body_bg_color_data_str | escape }}">
     </button>
   {% endif %}
@@ -47,9 +55,9 @@
       <div class="background-color js-background-color">
 
         {% if editmode %}
-          <button class="voog-bg-picker-btn js-background-settings" 
+          <button class="voog-bg-picker-btn js-background-settings"
             data-bg-key="{{ container_bg_key }}"
-            data-bg-picture-boolean="false" 
+            data-bg-picture-boolean="false"
             data-bg-color="{{ container_bg_color }}"
             data-bg-color-data="{{ container_bg_color_data_str | escape }}">
           </button>
@@ -83,7 +91,9 @@
 
               {%- if gallery_content_size > 0 or editmode -%}
                 <section class="mar_0-16 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>
@@ -113,7 +123,17 @@
                     {% include "buy-button" %}
                   </div>
 
-                  {% content bind=product %}
+                  {%- if editmode or product_social_size > 0 -%}
+                    <div class="mar_b-32">
+                      {%- 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_title = "content" | lce -%}
+                  {%- assign content_title_tooltip = "content_tooltip_specific_page" | lce -%}
+                  {% content bind=product title=content_title title_tooltip=content_title_tooltip %}
                 </section>
               </div>
             </div>
@@ -123,7 +143,9 @@
             <section
               class="content-product-wide content-area"
               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
@@ -27,10 +27,12 @@
         {% include "tags-blog" %}
 
         <main class="content" role="main" data-search-indexing-allowed="true">
-          <section class="content-body content-formatted post-intro-content" {{ edy_intro_edit_text }}>{% content %}</section>
+          {%- assign content_default_title = "content" | lce -%}
+          {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
+          <section class="content-body content-formatted post-intro-content">{% content title=content_default_title title_tooltip=content_default_title_tooltip %}</section>
 
           {% addbutton %}
-          
+
           {% for article in articles %}
             {% include "post-box" %}
           {% endfor %}

diff --git a/layouts/common_page.tpl b/layouts/common_page.tpl
@@ -31,8 +31,12 @@
         {% include "menu-level-2" %}
 
         <main class="content" role="main" data-search-indexing-allowed="true">
-          <header class="content-header content-formatted" {{ edy_intro_edit_text }}>{% content name="slogan" %}</header>
-          <section class="content-body content-formatted">{% content %}</section>
+          {%- assign content_slogan_title = "title" | lce -%}
+          {%- assign content_slogan_title_tooltip = "content_tooltip_current_page_title" | lce -%}
+          <header class="content-header content-formatted">{% content name="slogan" title=content_slogan_title title_tooltip=content_slogan_title_tooltip %}</header>
+          {%- assign content_default_title = "content" | lce -%}
+          {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
+          <section class="content-body content-formatted">{% content title=content_default_title title_tooltip=content_default_title_tooltip %}</section>
         </main>
 
         {% include "footer" %}

diff --git a/layouts/front_page.tpl b/layouts/front_page.tpl
@@ -27,13 +27,15 @@
 
         <main class="content" role="main" data-search-indexing-allowed="true">
           <header class="content-header">
-            {% if editmode or site.header.size > 0 %}<div class="content-title content-formatted" {{ edy_intro_edit_text }}>{% editable site.header %}</div>{% endif %}
+            {% if editmode or site.header.size > 0 %}<div class="content-title content-formatted">{% editable site.header %}</div>{% endif %}
 
             {% capture content_slogan_html %}{% unless editmode %}{% content name="slogan" %}{% endunless %}{% endcapture %}
             <div class="content-slogan content-formatted js-content-optional">{% content name="slogan" %}</div>
           </header>
 
-          <section class="content-body content-formatted">{% content %}</section>
+          {%- assign content_default_title = "content" | lce -%}
+          {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
+          <section class="content-body content-formatted">{% content title=content_default_title title_tooltip=content_default_title_tooltip %}</section>
         </main>
 
         {% include "footer" %}

diff --git a/layouts/product.tpl b/layouts/product.tpl
@@ -60,7 +60,9 @@
                 {%- 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>
 
@@ -74,7 +76,9 @@
                     {% endcontentblock %}
                   </div>
 
-                  {% 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 %}
                 </section>
               </div>
             </div>

diff --git a/layouts/product_list.tpl b/layouts/product_list.tpl
@@ -31,7 +31,9 @@
         {% include "menu-level-2" %}
 
         <main class="content" role="main">
-          <section class="content-body content-formatted" data-search-indexing-allowed="true">{% content %}</section>
+          {%- assign content_default_title = "content" | lce -%}
+          {%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
+          <section class="content-body content-formatted" data-search-indexing-allowed="true">{% content title=content_default_title title_tooltip=content_default_title_tooltip %}</section>
           {% include 'menu-breadcrumbs' %}
           {% include 'product-list-block' %}
         </main>