Merge pull request #474 from ASCWebServices/canini-3

fixing advanced callout bug on basic pages

web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig

@@ -106,7 +106,12 @@
       <div class="carousel-inner adv-call-mob-inner" role="listbox">
 
       {% for item in thecont|slice(0, contcount) %}
+        {% if page_content_type == 'landing_page' %}
           <div class="item {% if loop.first %}active{% endif %}">
+        {% endif %}
+        {% if page_content_type == 'page' %}
+          <div class="item active">
+        {% endif %}
 
             <div class="col-xs-12">
               <div class="card">

web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig

@@ -96,12 +96,20 @@
 {% if thecont[0]['#paragraph'].type.target_id == 'advanced_callout_box' %}
   {% set contcount = thecont|length - 17 %}
 
-{% if page_content_type == 'landing_page' %}
   <div id="carousel-mobile-{{ rand }}" class="carousel slide adv-callout-carousel adv-callout-mobile" data-ride="false" data-interval="0">
+
+{% if page_content_type == 'landing_page' %}
     <div class="container">
+{% endif %}
+
       <div class="carousel-inner adv-call-mob-inner" role="listbox">
       {% for item in thecont|slice(0, contcount) %}
+        {% if page_content_type == 'landing_page' %}
           <div class="item {% if loop.first %}active{% endif %}">
+        {% endif %}
+        {% if page_content_type == 'page' %}
+          <div class="item active">
+        {% endif %}
 
             <div class="col-xs-12 col-adv-call-mobile">
               <div class="card">
@@ -111,18 +119,9 @@
 
           </div>
         {% endfor %}
-{% endif %}
-{% if page_content_type == 'page' %}
-  <div class="{{ leftwidth }} col-l adv-call-mobile-bl">
-    {{ thecont[0] }}
-  </div>
+      </div>
 
-  <div class="{{ rightwidth }} col-r adv-call-mobile-br">
-    {{ thecont[1] }}
-  </div>
-{% endif %}
 {% if page_content_type == 'landing_page' %}
-      </div>
     </div>
 {% endif %}
 
@@ -137,9 +136,7 @@
         </a>
       </div>
 {% endif %}
-{% if page_content_type != 'page' %}
     </div>
-{% endif %}
 
 
 {# Advanced Callout box desktop #}