Merge pull request #68 from ASCWebServices/canini

asc_bootstrap - sass updates, add link to contact form to contact hea…

web/themes/asc_bootstrap/assets/sass/components/_events.scss

@@ -68,6 +68,10 @@
 
 //## Event.
 
+article.event {
+  margin-bottom: 16px;
+}
+
 .news-cont {
   padding-left: 0;
 
@@ -104,7 +108,7 @@
 .evt-cal {
   span {
     float: right;
-    padding-top: 15px;
+    padding: 20px 0;
 
     @media (max-width: 768px) {
       float: none;

web/themes/asc_bootstrap/assets/sass/components/_news.scss

@@ -65,6 +65,10 @@
 
 //## News story.
 
+article.news-story {
+  margin-bottom: 16px;
+}
+
 .news-cont {
   padding-left: 0;
 
@@ -106,3 +110,15 @@
 .page-node-type-news-story .page-header {
   display: none;
 }
+
+
+
+// --------------------------------------------------
+
+//## News taxonomy.
+
+.view-taxonomy-term {
+  .news-title {
+    display: none;
+  }
+}

web/themes/asc_bootstrap/css/style.css

@@ -9885,21 +9885,26 @@ h5, h6 {
 }
 
 /* line 68, ../assets/sass/components/_news.scss */
+article.news-story {
+  margin-bottom: 16px;
+}
+
+/* line 72, ../assets/sass/components/_news.scss */
 .news-cont {
   padding-left: 0;
 }
-/* line 71, ../assets/sass/components/_news.scss */
+/* line 75, ../assets/sass/components/_news.scss */
 .news-cont .field--name-body {
   margin: 20px 0 40px;
 }
 @media (max-width: 768px) {
-  /* line 68, ../assets/sass/components/_news.scss */
+  /* line 72, ../assets/sass/components/_news.scss */
   .news-cont {
     padding: 0;
   }
 }
 
-/* line 80, ../assets/sass/components/_news.scss */
+/* line 84, ../assets/sass/components/_news.scss */
 .news-date {
   text-transform: uppercase;
   font-weight: 700;
@@ -9908,28 +9913,33 @@ h5, h6 {
   -moz-osx-font-smoothing: grayscale;
 }
 
-/* line 88, ../assets/sass/components/_news.scss */
+/* line 92, ../assets/sass/components/_news.scss */
 .news-title {
   text-transform: capitalize;
 }
 
-/* line 92, ../assets/sass/components/_news.scss */
+/* line 96, ../assets/sass/components/_news.scss */
 .news-img {
   margin-bottom: 40px;
 }
 @media (max-width: 768px) {
-  /* line 92, ../assets/sass/components/_news.scss */
+  /* line 96, ../assets/sass/components/_news.scss */
   .news-img {
     margin: 0;
     padding: 0;
   }
 }
 
-/* line 106, ../assets/sass/components/_news.scss */
+/* line 110, ../assets/sass/components/_news.scss */
 .page-node-type-news-story .page-header {
   display: none;
 }
 
+/* line 121, ../assets/sass/components/_news.scss */
+.view-taxonomy-term .news-title {
+  display: none;
+}
+
 /* line 1, ../assets/sass/components/_cbpmenu.scss */
 .cbp-hrmenu {
   width: 100%;
@@ -10145,15 +10155,20 @@ h5, h6 {
 }
 
 /* line 71, ../assets/sass/components/_events.scss */
+article.event {
+  margin-bottom: 16px;
+}
+
+/* line 75, ../assets/sass/components/_events.scss */
 .news-cont {
   padding-left: 0;
 }
-/* line 74, ../assets/sass/components/_events.scss */
+/* line 78, ../assets/sass/components/_events.scss */
 .news-cont .field--name-body {
   margin: 20px 0 40px;
 }
 
-/* line 79, ../assets/sass/components/_events.scss */
+/* line 83, ../assets/sass/components/_events.scss */
 .news-date {
   text-transform: uppercase;
   font-weight: 700;
@@ -10162,12 +10177,12 @@ h5, h6 {
   -moz-osx-font-smoothing: grayscale;
 }
 
-/* line 87, ../assets/sass/components/_events.scss */
+/* line 91, ../assets/sass/components/_events.scss */
 .news-title {
   text-transform: capitalize;
 }
 
-/* line 91, ../assets/sass/components/_events.scss */
+/* line 95, ../assets/sass/components/_events.scss */
 .evt-header {
   background: #EFEFEF;
   padding: 15px 5px 10px;
@@ -10176,32 +10191,32 @@ h5, h6 {
   margin-bottom: 30px;
 }
 
-/* line 99, ../assets/sass/components/_events.scss */
+/* line 103, ../assets/sass/components/_events.scss */
 .evt-icon {
   float: left;
   margin-right: 10px;
 }
 
-/* line 105, ../assets/sass/components/_events.scss */
+/* line 109, ../assets/sass/components/_events.scss */
 .evt-cal span {
   float: right;
-  padding-top: 15px;
+  padding: 20px 0;
 }
 @media (max-width: 768px) {
-  /* line 105, ../assets/sass/components/_events.scss */
+  /* line 109, ../assets/sass/components/_events.scss */
   .evt-cal span {
     float: none;
   }
 }
 @media (max-width: 768px) {
-  /* line 104, ../assets/sass/components/_events.scss */
+  /* line 108, ../assets/sass/components/_events.scss */
   .evt-cal {
     text-align: center;
     margin-bottom: 5px;
   }
 }
 
-/* line 124, ../assets/sass/components/_events.scss */
+/* line 128, ../assets/sass/components/_events.scss */
 .page-node-type-news-story .page-header {
   display: none;
 }

web/themes/asc_bootstrap/templates/block/block--contactinfo.html.twig

@@ -47,7 +47,7 @@
 #}
 
 <div class="footer-address">
-  <h3>Contact Us</h3>
+  <h3><a href="/contact">Contact Us</a></h3>
   <p>
     {% if content.field_address_line1.0 %}
       {{ content.field_address_line1.0 }}<br/>

web/themes/asc_bootstrap/templates/node/node--event.html.twig

@@ -65,6 +65,7 @@
  *   in different view modes.
  */
 #}
+
 {%
   set classes = [
     node.bundle|clean_class,
@@ -102,13 +103,23 @@
   <div{{ content_attributes.addClass('content') }}>
     <div class="col-sm-8 col-sm-pull-4 news-cont">
       <div class="evt-header">
+{# for loop to display all event dates #}
+{% for dates in node.field_evt_date_range %}
+
         <div class="col-xs-12 col-md-8">
+
+
           {# get daylight savings time setting for event date range field #}
-          {% set daylight_savings = node.field_evt_date_range.value|date('I') %}
+          {% set daylight_savings = dates.value|date('I') %}
 
           {# get start and end dates #}
-          {% set start_date = node.field_evt_date_range.value|date('F j') %}
-          {% set end_date = node.field_evt_date_range.end_value|date('F j') %}
+          {% if daylight_savings == '1' %}
+            {% set start_date = dates.value|date_modify("-4 hours")|date('F j') %}
+            {% set end_date = dates.end_value|date_modify("-4 hours")|date('F j') %}
+          {% else %}
+            {% set start_date = dates.value|date_modify("-5 hours")|date('F j') %}
+            {% set end_date = dates.end_value|date_modify("-5 hours")|date('F j') %}
+          {% endif %}
 
             {# place DATE value #}
             <i class="fa fa-calendar evt-icon"></i>
@@ -117,34 +128,36 @@
             {% if daylight_savings == '1' %}
                 {# if same day #}
                 {% if start_date == end_date %}
-                  <div class="field--item evt-date">{{ node.field_evt_date_range.value|date_modify("-4 hours")|date('F j, Y') }}</div>
+                  <div class="field--item evt-date">{{ dates.value|date_modify("-4 hours")|date('F j, Y') }}</div>
                 {% else %}
                 {# if multiple days #}
-                  <div class="field--item evt-date">{{ node.field_evt_date_range.value|date_modify("-4 hours")|date('F j') ~ ' - ' ~ node.field_evt_date_range.end_value|date_modify("-4 hours")|date('F j, Y') }}</div>
+                  <div class="field--item evt-date">{{ dates.value|date_modify("-4 hours")|date('F j') ~ ' - ' ~ dates.end_value|date_modify("-4 hours")|date('F j, Y') }}</div>
                 {% endif %}
             {% else %}
+
               {# get end year for event date range field #}
-              {% set end_year = node.field_evt_date_range.end_value|date_modify("-5 hours")|date('Y') %}
+              {% set end_year = dates.end_value|date_modify("-5 hours")|date('Y') %}
 
                 {# check if end date is past new year#}
-                {% if end_year > node.field_evt_date_range.value|date_modify("-5 hours")|date('Y') %}
+                {% if end_year > dates.value|date_modify("-5 hours")|date('Y') %}
 
                   {# if it is add year to first date #}
                   {# if same day #}
+
                   {% if start_date == end_date %}
-                    <div class="field--item evt-date">{{ node.field_evt_date_range.value|date_modify("-5 hours")|date('F j, Y') }}</div>
+                    <div class="field--item evt-date">{{ dates.value|date_modify("-5 hours")|date('F j, Y') }}</div>
                   {% else %}
                   {# if multiple days #}
-                    <div class="field--item evt-date">{{ node.field_evt_date_range.value|date_modify("-5 hours")|date('F j, Y') ~ ' - ' ~ node.field_evt_date_range.end_value|date_modify("-5 hours")|date('F j, Y') }}</div>
+                    <div class="field--item evt-date">{{ dates.value|date_modify("-5 hours")|date('F j, Y') ~ ' - ' ~ dates.end_value|date_modify("-5 hours")|date('F j, Y') }}</div>
                   {% endif %}
 
                 {% else %}
                   {# if same day #}
                   {% if start_date == end_date %}
-                    <div class="field--item evt-date">{{ node.field_evt_date_range.value|date_modify("-5 hours")|date('F j, Y') }}</div>
+                    <div class="field--item evt-date">{{ dates.value|date_modify("-5 hours")|date('F j, Y') }}</div>
                   {% else %}
                   {# if multiple days #}
-                    <div class="field--item evt-date">{{ node.field_evt_date_range.value|date_modify("-5 hours")|date('F j') ~ ' - ' ~ node.field_evt_date_range.end_value|date_modify("-5 hours")|date('F j, Y') }}</div>
+                    <div class="field--item evt-date">{{ dates.value|date_modify("-5 hours")|date('F j') ~ ' - ' ~ dates.end_value|date_modify("-5 hours")|date('F j, Y') }}</div>
                   {% endif %}
                 {% endif %}
             {% endif %}
@@ -157,23 +170,32 @@
             {% else %}
               {# check if daylight savings time, modify to correct time #}
               {% if daylight_savings == '1' %}
-                <div class="field--item evt-time">{{ node.field_evt_date_range.value|date_modify("-4 hours")|date('g:iA') ~ ' - ' ~ node.field_evt_date_range.end_value|date_modify("-4 hours")|date('g:iA') }}</div>
+                <div class="field--item evt-time">{{ dates.value|date_modify("-4 hours")|date('g:iA') ~ ' - ' ~ dates.end_value|date_modify("-4 hours")|date('g:iA') }}</div>
               {% else %}
-                <div class="field--item evt-time">{{ node.field_evt_date_range.value|date_modify("-5 hours")|date('g:iA') ~ ' - ' ~ node.field_evt_date_range.end_value|date_modify("-5 hours")|date('g:iA') }}</div>
+                <div class="field--item evt-time">{{ dates.value|date_modify("-5 hours")|date('g:iA') ~ ' - ' ~ dates.end_value|date_modify("-5 hours")|date('g:iA') }}</div>
               {% endif %}
             {% endif %}
 
             {# place LOCATION value #}
         <i class="fa fa-map-marker evt-icon"></i> <div class="field--item evt-loc">{{ content.field_evt_location_2 }}</div>
+<br/>
+
       </div>
+
       <div class="col-xs-12 col-md-4 evt-cal">
         {# place AddToCalendar btn #}
-        {{ content.field_evt_date_range }}
+          {{ content.field_evt_date_range }}
       </div>
 
+{% endfor %}{# end for loop to display all event dates #}
+
+
     </div>
-      {{ content|without('field_evt_image')|without('field_evt_location_2')|without('field_evt_date')|without('field_evt_date_range')|without('field_evt_time')  }}
+      {{ content|without('field_evt_image')|without('field_evt_location_2')|without('field_evt_date')|without('field_evt_date_range')|without('field_evt_time')|without('field_evt_social_share')  }}
       <hr/>
+      {% if node.field_evt_social_share.value == 1 %}
+        {{ content.field_evt_social_share }}
+      {% endif %}
     </div>
   </div>
 

web/themes/asc_bootstrap/templates/node/node--news-story.html.twig

@@ -109,8 +109,11 @@
   </div>
   <div{{ content_attributes.addClass('content') }}>
     <div class="col-sm-8 col-sm-pull-4 news-cont">
-      {{ content|without('field_news_image2') }}
+      {{ content|without('field_news_image2')|without('field_news_social_share') }}
       <hr/>
+      {% if node.field_news_social_share.value == 1 %}
+        {{ content.field_news_social_share }}
+      {% endif %}
     </div>
   </div>