diff --git a/web/themes/asc_bootstrap/asc_bootstrap.theme b/web/themes/asc_bootstrap/asc_bootstrap.theme index cb9254a9a7820a8f6dfbded0e2cfd4e6b91f6293..e556439e48ac8033156d8b01eb71a215d27733d9 100755 --- a/web/themes/asc_bootstrap/asc_bootstrap.theme +++ b/web/themes/asc_bootstrap/asc_bootstrap.theme @@ -90,7 +90,7 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $ $form['field_evt_taxonomy_target_id_1']['#weight'] = 2; $form['field_news_terms_1_target_id']['#weight'] = 2.5; $form['field_evt_taxonomy2_target_id']['#weight'] = 3; - $form['field_news_terms_1_target_id_1']['#weight'] = 3.5; + $form['field_news_terms_2_target_id']['#weight'] = 3.5; $form['keys']['#weight'] = 5; $form['keys']['#attributes']['placeholder'] = t('Search Keywords'); @@ -109,12 +109,18 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $ $form['field_news_terms_1_target_id']['#access'] = FALSE; } - if(count($form['field_news_terms_1_target_id_1']['#options']) == 1) { - $form['field_news_terms_1_target_id_1']['#access'] = FALSE; + if(count($form['field_news_terms_2_target_id']['#options']) == 1) { + $form['field_news_terms_2_target_id']['#access'] = FALSE; } } + /* + * people filters + */ if($form['#id'] == 'views-exposed-form-people-directory-page-1') { + /* + * checking if taxonomy has vocabulary - if not, don't display field + */ if(count($form['field_appointment_target_id']['#options']) == 0) { $form['field_appointment_target_id']['#access'] = FALSE; } @@ -122,4 +128,28 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $ $form['field_research_interests_target_id']['#access'] = FALSE; } } + + /* + * mobile people filters + */ + if($form['#id'] == 'views-exposed-form-people-directory-page-2') { + /* + * add new HTML content to filters (headers and spacer) + * and setting weights for where they should appear in the form hierarchy + */ + $form['filter_heading'] = array( + '#markup' => '<h3 class="ppl-filter-heading ppl-taxon-heading">Filter</h3>', + '#weight' => 2, + ); + $form['filter_search_heading'] = array( + '#markup' => '<h3 class="ppl-filter-heading ppl-search-heading">Search</h3>', + '#weight' => 0, + ); + /* + * setting up weights for form elements + */ + $form['combine']['#weight'] = 1; + $form['field_appointment_target_id']['#weight'] = 3; + $form['field_research_interests_target_id']['#weight'] = 4; + } } diff --git a/web/themes/asc_bootstrap/assets/sass/components/_people.scss b/web/themes/asc_bootstrap/assets/sass/components/_people.scss index 9c6791db218ba6d124cb9c8e92c6bf08a39c0fde..d5d51d452e57060559e82519e87da9d8214d38fd 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_people.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_people.scss @@ -221,6 +221,14 @@ } } + #edit-submit-people-directory { + text-transform: uppercase; + } + + #edit-reset { + text-transform: uppercase; + } + } diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index 7915247b03a01993918c2893e9c3f211fa67f38a..e6f15abeba83de2e80c5d60d0d010cb8cc40f1be 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -11369,51 +11369,59 @@ article.news-story { left: 3px; color: #ffffff; } +/* line 224, ../assets/sass/components/_people.scss */ +#views-exposed-form-people-directory-page-2 #edit-submit-people-directory { + text-transform: uppercase; +} +/* line 228, ../assets/sass/components/_people.scss */ +#views-exposed-form-people-directory-page-2 #edit-reset { + text-transform: uppercase; +} -/* line 231, ../assets/sass/components/_people.scss */ +/* line 239, ../assets/sass/components/_people.scss */ .path-user .page-header { display: none; } -/* line 235, ../assets/sass/components/_people.scss */ +/* line 243, ../assets/sass/components/_people.scss */ .bio-header-top { background: #F9F9F9; } -/* line 240, ../assets/sass/components/_people.scss */ +/* line 248, ../assets/sass/components/_people.scss */ .bio-header-top .bio-top-right img { padding: 15px 0; width: 100%; } -/* line 248, ../assets/sass/components/_people.scss */ +/* line 256, ../assets/sass/components/_people.scss */ .bio-header-top .field--name-field-google-map-location .field--item { padding: 20px 0; } -/* line 251, ../assets/sass/components/_people.scss */ +/* line 259, ../assets/sass/components/_people.scss */ .bio-header-top .field--name-field-google-map-location .field--item .geolocation-formatter-map-wrapper { border: solid 2px #979797; } -/* line 258, ../assets/sass/components/_people.scss */ +/* line 266, ../assets/sass/components/_people.scss */ .bio-header { width: 100%; float: left; margin: 0 0 20px; } -/* line 264, ../assets/sass/components/_people.scss */ +/* line 272, ../assets/sass/components/_people.scss */ .bio-btm-left { margin-bottom: 40px; } -/* line 267, ../assets/sass/components/_people.scss */ +/* line 275, ../assets/sass/components/_people.scss */ .bio-btm-left h2 { font-size: 22px; } -/* line 271, ../assets/sass/components/_people.scss */ +/* line 279, ../assets/sass/components/_people.scss */ .bio-btm-left .bio-exp { padding-left: 0; } -/* line 277, ../assets/sass/components/_people.scss */ +/* line 285, ../assets/sass/components/_people.scss */ .bio-btm-right h3 { font-size: 18px; padding-top: 20px;