Merge pull request #105 from Voog/intro_overlay_support

Implement VOOG intro overlay targets
Voog · Sep 15, 2016 · 83a58a1 · 83a58a1
2 parents d76ed0d + 04832f7
commit 83a58a1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/components/menu-language-list.tpl b/components/menu-language-list.tpl
@@ -16,7 +16,7 @@
     {% if editmode %}
       <li class="menu-item">
         <ul class="menu menu-horizontal menu-cms js-menu-language-list-setting-parent">
-          <li class="menu-item menu-item-cms-add">{% languageadd %}</li>
+          <li class="menu-item menu-item-cms-add" {{ edy_intro_add_lang }}>{% languageadd %}</li>
 
           {% if language_menu_mode == "language-menu-mode-list" %}
             <li class="menu-item menu-item-cms-settings js-menu-language-settings">

diff --git a/components/menu-level-1.tpl b/components/menu-level-1.tpl
@@ -24,6 +24,6 @@
       <li class="menu-item menu-item-cms">{% menubtn site.hidden_menuitems %}</li>
     {% endif %}
 
-    <li class="menu-item menu-item-cms">{% menuadd %}</li>
+    <li class="menu-item menu-item-cms" {{ edy_intro_add_page }}>{% menuadd %}</li>
   {% endif %}
 </ul>
diff --git a/components/site-header.tpl b/components/site-header.tpl
@@ -9,7 +9,7 @@
     {% include "menu-main" %}
 
     {% if show_language_menu_popover %}
-      <button class="menu-language-btn ico-flags ico-flag-{{ page.language_code }} js-toggle-menu-language js-menu-language-popover-btn js-prevent-sideclick" data-lang-code="{{ page.language_code }}">
+      <button class="menu-language-btn ico-flags ico-flag-{{ page.language_code }} js-toggle-menu-language js-menu-language-popover-btn js-prevent-sideclick" data-lang-code="{{ page.language_code }}" {{ edy_intro_add_lang }}>
         <span>{{ current_language_title }}</span>
         <svg class="menu-language-btn-circle" width="9" height="9" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
           <use xlink:href="#ico-circle"></use>
@@ -18,7 +18,7 @@
     {% endif %}
 
     {% include "menu-language-list" %}
-
+    
     {% include "site-search" %}
 
     <button class="btn menu-btn js-toggle-menu-main js-prevent-sideclick">{{ "menu" | lc }}</button>

diff --git a/components/template-variables.tpl b/components/template-variables.tpl
@@ -267,4 +267,10 @@
       }
     ]
   {% endcapture %}
+
+  {% comment %}VOOG intro popover targets. Add them where applicable popovers should appear.{% endcomment %}
+  {% capture edy_intro_add_page %}{% if editmode %}data-edy-intro-popover="edy-add-page"{% endif %}{% endcapture %}
+  {% capture edy_intro_add_lang %}{% if editmode %}data-edy-intro-popover="edy-add-lang"{% endif %}{% endcapture %}
+  {% capture edy_intro_edit_text %}{% if editmode %}data-edy-intro-popover="edy-edit-text"{% endif %}{% endcapture %}
+
 {% endcapture %}
diff --git a/layouts/blog_article.tpl b/layouts/blog_article.tpl
@@ -22,7 +22,7 @@
 
 
               <div class="inner content-area area-normal" data-search-indexing-allowed="true">
-                <div class="article-excerpt">{% editable article.excerpt %}</div>
+                <div class="article-excerpt" {{ edy_intro_edit_text }}>{% editable article.excerpt %}</div>
                 <div class="article-body">{% editable article.body %}</div>
               </div>
 

diff --git a/layouts/common_page.tpl b/layouts/common_page.tpl
@@ -18,7 +18,7 @@
               <div class="content-area">{% contentblock name="content_header" publish_default_content="true" %}<h1>{{ page.title }}</h1>{% endcontentblock %}</div>
             </header>
 
-            <section class="content-body">
+            <section class="content-body" {{ edy_intro_edit_text }}>
               <div class="content-area area-normal inner" data-search-indexing-allowed="true">{% content %}</div>
 
               <div class="content-bottom content-area" data-search-indexing-allowed="true">{% content name="bottom" %}</div>

diff --git a/layouts/front_page.tpl b/layouts/front_page.tpl
@@ -16,7 +16,7 @@
 
           <main class="page-content" role="main">
             <section class="content-body">
-              <div class="content-area">{% content %}</div>
+              <div class="content-area" {{ edy_intro_edit_text }}>{% content %}</div>
             </section>
 
             <section class="blog-articles">