Theme, JS, Custom Module, Template, and Style changes

- adding research gall to customtoken module
- adding variables to be used on research and research gall pages as taxonomy links
- cleaning up .theme file
- adding research gallery filters
- fixing event slideshow styles
- research and research gall taxonomy styles
- fixing sidebar menu list styles
- adding timer to sidebar resize js
- adding class to sidebar via js
- fixing taxonomy links on research and reseach gall temps
- adding slideshow to user profile
- adding user slideshow template

web/modules/custom/customtokens/customtokens.module

@@ -11,6 +11,10 @@ function customtokens_token_info() {
        'name' => t("Research Landing Page"),
        'description' => t('The node\'s Research Landing Page'),
    ];
+   $node['landinggallct'] = [
+       'name' => t("Research Gallery Landing Page"),
+       'description' => t('The node\'s Research Gallery Landing Page'),
+   ];
    return [
        'types' => ['customtoken' => $type],
        'tokens' => ['customtoken' => $node],
@@ -21,10 +25,17 @@ function customtokens_token_info() {
 */
 function customtokens_tokens($type, $tokens, array $data, array $options, \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata) {
     $replacements = [];
+
+    //research ct
     $nids = \Drupal::entityQuery('node')->condition('type','research_landing_page')->execute();
     $lid = array_shift($nids);
     $alias = \Drupal::service('path.alias_manager')->getAliasByPath('/node/'.$lid);
 
+    //research gallery ct
+    $nids2 = \Drupal::entityQuery('node')->condition('type','research_gallery_landing_page')->execute();
+    $lid2 = array_shift($nids2);
+    $alias2 = \Drupal::service('path.alias_manager')->getAliasByPath('/node/'.$lid2);
+
 
     if ($type == 'customtoken' && !empty($data['node'])) {
       foreach ($tokens as $name => $original) {
@@ -32,6 +43,10 @@ function customtokens_tokens($type, $tokens, array $data, array $options, \Drupa
           case 'landingct':
             $replacements[$original] = $alias;
             break;
+
+          case 'landinggallct':
+            $replacements[$original] = $alias2;
+            break;
         }
       }
 

web/themes/asc_bootstrap/asc_bootstrap.theme

@@ -23,6 +23,17 @@ function asc_bootstrap_preprocess_page(&$vars, $hook) {
 function asc_bootstrap_preprocess_node(&$vars, $hook) {
  $vars['site_mail'] = \Drupal::config('system.site')->get('mail');
  $vars['site_name'] = \Drupal::config('system.site')->get('name');
+
+ //get research landing page url alias
+ $nids = \Drupal::entityQuery('node')->condition('type','research_landing_page')->execute();
+ $lid = array_shift($nids);
+ $vars['resrch_landing'] = \Drupal::service('path.alias_manager')->getAliasByPath('/node/'.$lid);
+
+ //get research gallery landing page url alias
+ $nids2 = \Drupal::entityQuery('node')->condition('type','research_gallery_landing_page')->execute();
+ $lid2 = array_shift($nids2);
+ $vars['resrch_gall_landing'] = \Drupal::service('path.alias_manager')->getAliasByPath('/node/'.$lid2);
+
 }
 
 //create another suggestion based on the block type
@@ -70,7 +81,7 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
   /*
   * events and news filters
   */
-  if (($form['#id'] == 'views-exposed-form-events-page-1')||($form['#id'] == 'views-exposed-form-news-page-1')||($form['#id'] == 'views-exposed-form-research-project-directory-page-1')||($form['#id'] == 'views-exposed-form-research-project-gallery-page-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')||($form['#id'] == 'views-exposed-form-research-project-directory-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')) {
+  if (($form['#id'] == 'views-exposed-form-events-page-1')||($form['#id'] == 'views-exposed-form-news-page-1')||($form['#id'] == 'views-exposed-form-research-project-directory-page-1')||($form['#id'] == 'views-exposed-form-research-project-gallery-page-1')||($form['#id'] == 'views-exposed-form-research-project-gallery-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')||($form['#id'] == 'views-exposed-form-research-project-directory-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')) {
     /*
     * add new HTML content to filters (headers and spacer)
     * and setting weights for where they should appear in the form hierarchy
@@ -122,7 +133,8 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
       $form['field_news_terms_2_target_id']['#access'] = FALSE;
     }
   }
-    //research
+
+  //research filters
   if (($form['#id'] == 'views-exposed-form-research-project-directory-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-page-1')) {
     if(count($form['field_research_departments_target_id']['#options']) == 1) {
       $form['field_research_departments_target_id']['#access'] = FALSE;
@@ -135,29 +147,8 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
     if(count($form['field_research_year_target_id']['#options']) == 1) {
       $form['field_research_year_target_id']['#access'] = FALSE;
     }
-  }
-    //research - mobile
-  if (($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')) {
-    if(count($form['field_research_departments_target_id']['#options']) == 0) {
-      $form['field_research_departments_target_id']['#access'] = FALSE;
-    }
-
-    if(count($form['field_research_other_target_id']['#options']) == 0) {
-      $form['field_research_other_target_id']['#access'] = FALSE;
-    }
-
-    if(count($form['field_research_year_target_id']['#options']) == 0) {
-      $form['field_research_year_target_id']['#access'] = FALSE;
-    }
-  }
-
-  /*
-  * research filters - setting default value on select box to taxonomy vocabulary
-  */
-  if (($form['#id'] == 'views-exposed-form-research-project-directory-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-page-1')) {
 
     if(isset($form['field_research_departments_target_id']['#options']['All'])) {
-      // $form['field_research_departments_target_id']['#options']['All'] = $form['#info']['filter-field_research_departments_target_id']['label'];
       $tarr = array_slice(array_keys($form['field_research_departments_target_id']['#options']), 1, 5, true);
       $tid = array_shift($tarr);
       $term = Term::load($tid);
@@ -172,7 +163,6 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
     }
 
     if(isset($form['field_research_other_target_id']['#options']['All'])) {
-      //$form['field_research_other_target_id']['#options']['All'] = $form['#info']['filter-field_research_other_target_id']['label'];
       $tarr = array_slice(array_keys($form['field_research_other_target_id']['#options']), 1, 5, true);
       $tid = array_shift($tarr);
       $term = Term::load($tid);
@@ -186,10 +176,7 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
       }
     }
 
-    // dpm($form['field_research_year_target_id']);
-
     if(isset($form['field_research_year_target_id']['#options']['All'])) {
-      //$form['field_research_year_target_id']['#options']['All'] = $form['#info']['filter-field_research_year_target_id']['label'];
       $tarr = array_slice(array_keys($form['field_research_year_target_id']['#options']), 1, 5, true);
       $tid = array_shift($tarr);
       $term = Term::load($tid);
@@ -204,13 +191,21 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
     }
   }
 
+    //research - mobile
+  if (($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')) {
+    if(count($form['field_research_departments_target_id']['#options']) == 0) {
+      $form['field_research_departments_target_id']['#access'] = FALSE;
+    }
 
+    if(count($form['field_research_other_target_id']['#options']) == 0) {
+      $form['field_research_other_target_id']['#access'] = FALSE;
+    }
 
-  /*
-  * Research Mobile filters
-  */
-  if (($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')||($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')) {
-      if($form['field_research_departments_target_id']['#theme_wrappers']['details']['#title'] == 'Departments') {
+    if(count($form['field_research_year_target_id']['#options']) == 0) {
+      $form['field_research_year_target_id']['#access'] = FALSE;
+    }
+
+    if($form['field_research_departments_target_id']['#theme_wrappers']['details']['#title'] == 'Departments') {
           $tarr = array_slice(array_keys($form['field_research_departments_target_id']['#options']), 1, 5, true);
           $tid = array_shift($tarr);
           $term = Term::load($tid);
@@ -253,6 +248,74 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
       }
   }
 
+
+  /*
+  * research gallery filters
+  */
+    if (($form['#id'] == 'views-exposed-form-research-project-gallery-block-1')||($form['#id'] == 'views-exposed-form-research-project-gallery-page-1')) {
+
+    if(count($form['field_research_gallery_tags_target_id']['#options']) == 1) {
+      $form['field_research_gallery_tags_target_id']['#access'] = FALSE;
+    }
+
+    if(count($form['field_research_gallery_tags_2_target_id']['#options']) == 1) {
+      $form['field_research_gallery_tags_2_target_id']['#access'] = FALSE;
+    }
+
+    if(count($form['field_research_gallery_tags_3_target_id']['#options']) == 1) {
+      $form['field_research_gallery_tags_3_target_id']['#access'] = FALSE;
+    }
+
+    if(isset($form['field_research_gallery_tags_target_id']['#options']['All'])) {
+      // $form['field_research_departments_target_id']['#options']['All'] = $form['#info']['filter-field_research_departments_target_id']['label'];
+      $tarr = array_slice(array_keys($form['field_research_gallery_tags_target_id']['#options']), 1, 5, true);
+      $tid = array_shift($tarr);
+      $term = Term::load($tid);
+      if (!empty($term)) {
+        $vid = array_shift($term->vid->getValue())['target_id'];
+        if(!empty($vid)) {
+          $vocab = Vocabulary::load($vid);
+          $vocab_label = $vocab->get('name');
+          $form['field_research_gallery_tags_target_id']['#options']['All'] = $vocab_label;
+        }
+      }
+    }
+
+    if(isset($form['field_research_gallery_tags_2_target_id']['#options']['All'])) {
+      //$form['field_research_other_target_id']['#options']['All'] = $form['#info']['filter-field_research_other_target_id']['label'];
+      $tarr = array_slice(array_keys($form['field_research_gallery_tags_2_target_id']['#options']), 1, 5, true);
+      $tid = array_shift($tarr);
+      $term = Term::load($tid);
+      if (!empty($term)) {
+        $vid = array_shift($term->vid->getValue())['target_id'];
+        if(!empty($vid)) {
+          $vocab = Vocabulary::load($vid);
+          $vocab_label = $vocab->get('name');
+          $form['field_research_gallery_tags_2_target_id']['#options']['All'] = $vocab_label;
+        }
+      }
+    }
+
+    // dpm($form['field_research_year_target_id']);
+
+    if(isset($form['field_research_gallery_tags_3_target_id']['#options']['All'])) {
+      //$form['field_research_year_target_id']['#options']['All'] = $form['#info']['filter-field_research_year_target_id']['label'];
+      $tarr = array_slice(array_keys($form['field_research_gallery_tags_3_target_id']['#options']), 1, 5, true);
+      $tid = array_shift($tarr);
+      $term = Term::load($tid);
+      if (!empty($term)) {
+        $vid = array_shift($term->vid->getValue())['target_id'];
+        if(!empty($vid)) {
+          $vocab = Vocabulary::load($vid);
+          $vocab_label = $vocab->get('name');
+          $form['field_research_gallery_tags_3_target_id']['#options']['All'] = $vocab_label;
+        }
+      }
+    }
+  }
+
+
+
   /*
   * people filters
   */

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

@@ -8,22 +8,6 @@
 //## Events grid.
 
 .view-events {
-  .carousel {
-    height: auto;
-    overflow: hidden;
-
-    .field--name-field-media-image {
-      padding-bottom: 0;
-
-      .img-responsive {
-        width: 100%;
-      }
-    }
-
-    @media (max-width: 1030px) {
-      height: auto;
-    }
-  }
   .row {
     display: flex;
     margin-bottom: 40px;
@@ -89,6 +73,10 @@
 
 article.event {
   margin-bottom: 16px;
+
+  .carousel {
+    float: left;
+  }
 }
 
 .news-cont {
@@ -96,6 +84,8 @@ article.event {
 
   .field--name-body {
     margin: 20px 0 40px;
+    float: left;
+    width: 100%;
   }
 }
 

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

@@ -154,3 +154,30 @@
   }
 
 }
+
+
+// --------------------------------------------------
+
+//## Research taxonomy.
+
+.taxonomy-rgall-heading {
+  float: left;
+  width: 100%;
+  padding-top: 15px;
+
+  h2 {
+    line-height: 0;
+    font-size: 18px;
+  }
+}
+
+.taxonomy-research-heading {
+  float: left;
+  width: 100%;
+  padding-top: 15px;
+
+  h2 {
+    line-height: 0;
+    font-size: 18px;
+  }
+}

web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss

@@ -89,8 +89,18 @@
 
     }
 
-    .active-trail ul {
-      display: inherit;
+    .active-trail {
+      ul {
+        display: inherit;
+
+        .sidebar-nav {
+          display: none;
+        }
+
+        .active-link-ul {
+          display: block;
+        }
+      }
     }
 
     .active-link-li {

web/themes/asc_bootstrap/css/style.css

@@ -10115,47 +10115,28 @@ h6 {
   }
 }
 /* line 11, ../assets/sass/components/_events.scss */
-.view-events .carousel {
-  height: auto;
-  overflow: hidden;
-}
-/* line 15, ../assets/sass/components/_events.scss */
-.view-events .carousel .field--name-field-media-image {
-  padding-bottom: 0;
-}
-/* line 18, ../assets/sass/components/_events.scss */
-.view-events .carousel .field--name-field-media-image .img-responsive {
-  width: 100%;
-}
-@media (max-width: 1030px) {
-  /* line 11, ../assets/sass/components/_events.scss */
-  .view-events .carousel {
-    height: auto;
-  }
-}
-/* line 27, ../assets/sass/components/_events.scss */
 .view-events .row {
   display: flex;
   margin-bottom: 40px;
 }
 @media (max-width: 768px) {
-  /* line 27, ../assets/sass/components/_events.scss */
+  /* line 11, ../assets/sass/components/_events.scss */
   .view-events .row {
     display: block;
   }
 }
-/* line 36, ../assets/sass/components/_events.scss */
+/* line 20, ../assets/sass/components/_events.scss */
 .view-events .news-row {
   display: flex;
   color: #666666;
 }
 @media (max-width: 768px) {
-  /* line 36, ../assets/sass/components/_events.scss */
+  /* line 20, ../assets/sass/components/_events.scss */
   .view-events .news-row {
     display: block;
   }
 }
-/* line 44, ../assets/sass/components/_events.scss */
+/* line 28, ../assets/sass/components/_events.scss */
 .view-events .news-row .inner-news-grid {
   border: #979797 solid 1px;
   flex: 1;
@@ -10163,30 +10144,30 @@ h6 {
   overflow: hidden;
 }
 @media (max-width: 768px) {
-  /* line 44, ../assets/sass/components/_events.scss */
+  /* line 28, ../assets/sass/components/_events.scss */
   .view-events .news-row .inner-news-grid {
     flex: none;
     margin-bottom: 20px;
   }
 }
-/* line 56, ../assets/sass/components/_events.scss */
+/* line 40, ../assets/sass/components/_events.scss */
 .view-events .news-row .views-field-field-evt-date-range {
   padding: 10px;
   background: #841F5D;
   color: #ffffff;
   text-transform: uppercase;
 }
-/* line 63, ../assets/sass/components/_events.scss */
+/* line 47, ../assets/sass/components/_events.scss */
 .view-events .news-row .views-field-title {
   padding: 10px 10px 3px;
   font-size: 18px;
   font-weight: 700;
 }
-/* line 68, ../assets/sass/components/_events.scss */
+/* line 52, ../assets/sass/components/_events.scss */
 .view-events .news-row .views-field-title a {
   color: #666666;
 }
-/* line 73, ../assets/sass/components/_events.scss */
+/* line 57, ../assets/sass/components/_events.scss */
 .view-events .news-row .views-field-field-evt-location-2 {
   padding: 10px;
   color: #26686D;
@@ -10194,21 +10175,27 @@ h6 {
   background: #F5F5F5;
 }
 
-/* line 90, ../assets/sass/components/_events.scss */
+/* line 74, ../assets/sass/components/_events.scss */
 article.event {
   margin-bottom: 16px;
 }
+/* line 77, ../assets/sass/components/_events.scss */
+article.event .carousel {
+  float: left;
+}
 
-/* line 94, ../assets/sass/components/_events.scss */
+/* line 82, ../assets/sass/components/_events.scss */
 .news-cont {
   padding-left: 0;
 }
-/* line 97, ../assets/sass/components/_events.scss */
+/* line 85, ../assets/sass/components/_events.scss */
 .news-cont .field--name-body {
   margin: 20px 0 40px;
+  float: left;
+  width: 100%;
 }
 
-/* line 102, ../assets/sass/components/_events.scss */
+/* line 92, ../assets/sass/components/_events.scss */
 .news-date {
   text-transform: uppercase;
   font-weight: 700;
@@ -10217,12 +10204,12 @@ article.event {
   -moz-osx-font-smoothing: grayscale;
 }
 
-/* line 110, ../assets/sass/components/_events.scss */
+/* line 100, ../assets/sass/components/_events.scss */
 .news-title {
   text-transform: capitalize;
 }
 
-/* line 114, ../assets/sass/components/_events.scss */
+/* line 104, ../assets/sass/components/_events.scss */
 .evt-header {
   background: #EFEFEF;
   padding: 15px 5px 10px;
@@ -10231,47 +10218,47 @@ article.event {
   margin-bottom: 30px;
 }
 
-/* line 122, ../assets/sass/components/_events.scss */
+/* line 112, ../assets/sass/components/_events.scss */
 .evt-icon {
   float: left;
   margin-right: 10px;
 }
 
-/* line 129, ../assets/sass/components/_events.scss */
+/* line 119, ../assets/sass/components/_events.scss */
 .evt-cal .hidden {
   display: none;
 }
-/* line 133, ../assets/sass/components/_events.scss */
+/* line 123, ../assets/sass/components/_events.scss */
 .evt-cal span {
   float: right;
   padding: 20px 0;
 }
 @media (max-width: 768px) {
-  /* line 133, ../assets/sass/components/_events.scss */
+  /* line 123, ../assets/sass/components/_events.scss */
   .evt-cal span {
     float: none;
   }
 }
 @media (max-width: 768px) {
-  /* line 127, ../assets/sass/components/_events.scss */
+  /* line 117, ../assets/sass/components/_events.scss */
   .evt-cal {
     text-align: center;
     margin-bottom: 5px;
   }
 }
 
-/* line 153, ../assets/sass/components/_events.scss */
+/* line 143, ../assets/sass/components/_events.scss */
 .page-node-type-news-story .page-header {
   display: none;
 }
 
-/* line 162, ../assets/sass/components/_events.scss */
+/* line 152, ../assets/sass/components/_events.scss */
 .taxonomy-events-heading {
   float: left;
   width: 100%;
   padding-top: 15px;
 }
-/* line 167, ../assets/sass/components/_events.scss */
+/* line 157, ../assets/sass/components/_events.scss */
 .taxonomy-events-heading h2 {
   line-height: 0;
   font-size: 18px;
@@ -12216,6 +12203,30 @@ article.news-story {
   margin: 20px 0 40px;
 }
 
+/* line 163, ../assets/sass/components/_research.scss */
+.taxonomy-rgall-heading {
+  float: left;
+  width: 100%;
+  padding-top: 15px;
+}
+/* line 168, ../assets/sass/components/_research.scss */
+.taxonomy-rgall-heading h2 {
+  line-height: 0;
+  font-size: 18px;
+}
+
+/* line 174, ../assets/sass/components/_research.scss */
+.taxonomy-research-heading {
+  float: left;
+  width: 100%;
+  padding-top: 15px;
+}
+/* line 179, ../assets/sass/components/_research.scss */
+.taxonomy-research-heading h2 {
+  line-height: 0;
+  font-size: 18px;
+}
+
 /* line 1, ../assets/sass/components/_simplemenu.scss */
 body {
   overflow-x: hidden;
@@ -12415,63 +12426,71 @@ body {
 #block-mainnavigation-2 .navbar-nav ul li li li li li li .link-wrapper {
   padding-left: 67px;
 }
-/* line 92, ../assets/sass/components/_sidebar-menu.scss */
+/* line 93, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav .active-trail ul {
   display: inherit;
 }
-/* line 97, ../assets/sass/components/_sidebar-menu.scss */
+/* line 96, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav .active-trail ul .sidebar-nav {
+  display: none;
+}
+/* line 100, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav .active-trail ul .active-link-ul {
+  display: block;
+}
+/* line 107, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav .active-link-li ul {
   display: block;
 }
-/* line 100, ../assets/sass/components/_sidebar-menu.scss */
+/* line 110, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav .active-link-li ul ul {
   display: none;
 }
-/* line 106, ../assets/sass/components/_sidebar-menu.scss */
+/* line 116, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav i {
   float: right;
   padding: 2px 10px;
   cursor: pointer;
 }
-/* line 112, ../assets/sass/components/_sidebar-menu.scss */
+/* line 122, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav:nth-last-child(1) {
   border-bottom: 1px #979797 dotted;
   border-top: none;
 }
-/* line 119, ../assets/sass/components/_sidebar-menu.scss */
+/* line 129, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .nav > li > a:hover, #block-mainnavigation-2 .nav > li > a:focus {
   background-color: transparent;
 }
-/* line 125, ../assets/sass/components/_sidebar-menu.scss */
+/* line 135, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .sidebar-nav .active-link {
   background-color: #ffffff;
   border-left: solid #D0021B 3px;
   padding-left: 5px;
   margin-left: -8px;
 }
-/* line 133, ../assets/sass/components/_sidebar-menu.scss */
+/* line 143, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .sidebar-nav ul .active-link {
   margin-left: -5px;
 }
-/* line 138, ../assets/sass/components/_sidebar-menu.scss */
+/* line 148, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .sidebar-nav ul ul .active-link {
   margin-left: -2px;
 }
-/* line 143, ../assets/sass/components/_sidebar-menu.scss */
+/* line 153, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .sidebar-nav ul ul ul .active-link {
   margin-left: 0;
 }
-/* line 153, ../assets/sass/components/_sidebar-menu.scss */
+/* line 163, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .link-wrapper:hover {
   background-color: #ffffff;
 }
-/* line 158, ../assets/sass/components/_sidebar-menu.scss */
+/* line 168, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 h2.active-link {
   background-color: transparent;
   border-left: none;
   padding-left: 0;
 }
-/* line 166, ../assets/sass/components/_sidebar-menu.scss */
+/* line 176, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 h2 a {
   color: #000000;
 }
@@ -12483,7 +12502,7 @@ body {
 }
 
 @media (max-width: 768px) {
-  /* line 177, ../assets/sass/components/_sidebar-menu.scss */
+  /* line 187, ../assets/sass/components/_sidebar-menu.scss */
   .region-sidebar-menu {
     display: none;
   }

web/themes/asc_bootstrap/js/scripts.js

 jQuery(document).ready(function(){
   //set sidebar height to match height of content on page
   if(jQuery(".page-node-type-page .main-container section").height() > jQuery(".page-node-type-page .main-container aside").height()) {
-    jQuery(".page-node-type-page .main-container aside").css({'min-height':(jQuery(".page-node-type-page .main-container section").height()+'px')});
+    setTimeout(function(){ jQuery(".page-node-type-page .main-container aside").css({'min-height':(jQuery(".page-node-type-page .main-container section").height()+'px')}); }, 1000);
   }
 
   if(jQuery(".path-people .main-container section").height() > jQuery(".path-people .main-container aside").height()) {
@@ -124,6 +124,7 @@ jQuery(document).ready(function(){
   if (jQuery(".is-active").length) {
     jQuery( ".is-active" ).parent().addClass( "active-link" );
     jQuery( ".is-active" ).parent().parent().addClass( "active-link-li" );
+    jQuery( ".is-active" ).parent().parent().parent().addClass( "active-link-ul" );
   }
 
 

web/themes/asc_bootstrap/templates/field/field--field-user-slideshow.html.twig

+{#
+/**
+ * @file
+ * Overrides field template to add column class based on loop length.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ *   - attributes: List of HTML attributes for each item.
+ *   - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ */
+#}
+<div id="carousel" class="carousel slide" data-ride="false" data-interval="0">
+  <!-- Indicators -->
+{% if items|length > 1 %}
+  <ol class="carousel-indicators">
+    {%- for item in items -%}
+      <li data-target="#carousel" data-slide-to="{{ loop.index0 }}" class="{% if loop.first %}active{% endif %}"></li>
+    {%- endfor -%}
+  </ol>
+{% endif %}
+
+  <!-- Wrapper for slides -->
+  <div class="carousel-inner" role="listbox">
+    {%- for item in items -%}
+      <div class="item{% if loop.first %} active{% endif %}">
+        {{ item.content }}
+        <!--<div class="carousel-caption">
+          ...
+        </div>-->
+      </div>
+    {%- endfor -%}
+  </div>
+
+
+  <!-- Controls -->
+  {% if items|length > 1 %}
+    <a class="left carousel-control" href="#carousel" role="button" data-slide="prev">
+      <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+      <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#carousel" role="button" data-slide="next">
+      <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+      <span class="sr-only">Next</span>
+    </a>
+  {% endif %}
+
+{# Shapes bottom div to form arrow #}
+  <div id="half-t-left"></div>
+  <div id="half-t-right"></div>
+{# END #}
+</div>

web/themes/asc_bootstrap/templates/node/node--research-project-gallery.html.twig

@@ -111,16 +111,36 @@
     <div class="col-sm-8 col-sm-pull-4 rgall-cont">
     {{ content.body }}
 
-      {% if content.research_gallery_tags.0 != '' %}
+      {% if (content.field_research_gallery_tags.0 != '') or (content.field_research_gallery_tags_2.0 != '') or (content.field_research_gallery_tags_3.0 != '') %}
         <div class="taxonomy-rgall-heading">
           <h2>Project Tags:</h2>
         </div>
       {% endif %}
 
-      {% for item in content.research_gallery_tags %}
+      {% for item in content.field_research_gallery_tags %}
         {% if item['#title'] %}
           <div class="taxonomy-rgall">
-            <a href="/news?field_news_terms_1_target_id={{ item['#url']|render|split('/')|last }}">
+            <a href="{{ resrch_gall_landing }}?field_research_gallery_tags_target_id={{ item['#url']|render|split('/')|last }}">
+              {{ item['#title'] }}
+            </a>
+          </div>
+        {% endif %}
+      {% endfor %}
+
+      {% for item in content.field_research_gallery_tags_2 %}
+        {% if item['#title'] %}
+          <div class="taxonomy-rgall">
+            <a href="{{ resrch_gall_landing }}?field_research_gallery_tags_2_target_id={{ item['#url']|render|split('/')|last }}">
+              {{ item['#title'] }}
+            </a>
+          </div>
+        {% endif %}
+      {% endfor %}
+
+      {% for item in content.field_research_gallery_tags_3 %}
+        {% if item['#title'] %}
+          <div class="taxonomy-rgall">
+            <a href="{{ resrch_gall_landing }}?field_research_gallery_tags_3_target_id={{ item['#url']|render|split('/')|last }}">
               {{ item['#title'] }}
             </a>
           </div>

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

@@ -125,7 +125,7 @@
       {% for item in content.field_research_year %}
         {% if item['#title'] %}
           <div class="taxonomy-research">
-            <a href="/research-project-directory?field_research_year_target_id={{ item['#url']|render|split('/')|last }}">
+            <a href="{{ resrch_landing }}?field_research_year_target_id={{ item['#url']|render|split('/')|last }}">
               {{ item['#title'] }}
             </a>
           </div>
@@ -135,7 +135,7 @@
       {% for item in content.field_research_departments %}
         {% if item['#title'] %}
           <div class="taxonomy-research">
-            <a href="/research-project-directory?field_research_departments_target_id={{ item['#url']|render|split('/')|last }}">
+            <a href="{{ resrch_landing }}?field_research_departments_target_id={{ item['#url']|render|split('/')|last }}">
               {{ item['#title'] }}
             </a>
           </div>
@@ -145,7 +145,7 @@
       {% for item in content.field_research_other %}
         {% if item['#title'] %}
           <div class="taxonomy-research">
-            <a href="/research-project-directory?field_research_other_target_id={{ item['#url']|render|split('/')|last }}">
+            <a href="{{ resrch_landing }}?field_research_other_target_id={{ item['#url']|render|split('/')|last }}">
               {{ item['#title'] }}
             </a>
           </div>

web/themes/asc_bootstrap/templates/system/user.html.twig

@@ -124,6 +124,11 @@
           {% endif %}
         </div>
       {% endif %}
+
+      {% if content.field_user_slideshow.0 != '' %}
+        {{ content.field_user_slideshow }}
+      {% endif %}
+
       {% if content.field_bio.0 != '' %}
         {{ content.field_bio.0 }}
       {% endif %}