Merge branch 'development'

isubit · Dec 29, 2016 · 08f7bea · 08f7bea
2 parents d493e6a + 2145175
commit 08f7bea
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 48 deletions.
diff --git a/css/suitcase_responsive.css b/css/suitcase_responsive.css
@@ -1,4 +1,4 @@
-@media (min-width: 740px) {
+@media all and (min-width: 740px) {
 
     #isu-menu-nav .sm a span.sub-arrow {
         position: absolute;
@@ -159,9 +159,9 @@
 @media print {
 
     #isu_header_wordmark img {
-        filter: invert(1);
-        filter: invert(100%);
-        -webkit-filter: invert(1);
+        filter: invert(1) !important;
+        filter: invert(100%) !important;
+        -webkit-filter: invert(1) !important;
     }
 
     .region-branding {
@@ -178,6 +178,7 @@
         background-color: #fff !important;
     }
 
+    .zone-isu-menu-wrapper,
     .zone-menu-wrapper,
     .zone-secondary-menu-wrapper,
     .zone-header-wrapper,
@@ -299,7 +300,7 @@
 
 }
 
-@media (min-device-width: 980px) and (min-width: 980px), (max-device-width: 1024px) and (min-width: 1024px) and (orientation: landscape) {
+@media all and (min-width: 980px) {
     .zone-content-wrapper .container-12 .grid-2 {
         width: 25% !important;
     }

diff --git a/js/suitcase_gridheight.js b/js/suitcase_gridheight.js
@@ -8,7 +8,7 @@
       $('body', context).once('suitcaseGridHeight', function () {
         $(window).bind('load resize', function () {
           // Check to make sure this isn't happening on mobile
-          if (!Drupal.behaviors.hasOwnProperty('omegaMediaQueries') || Drupal.omega.getCurrentLayout() != 'mobile') {
+          if (window.matchMedia('(min-width: 740px)').matches) {
             // Check to make sure this isn't happening on views without the luggage-grid class
             $($('.luggage-grid').get().reverse()).each(function () {
               var maxHeight = 0;

diff --git a/...se_12_threecol_4_4_4_threerow_stacked/suitcase-12-threecol-4-4-4-threerow-stacked.tpl.php b/...se_12_threecol_4_4_4_threerow_stacked/suitcase-12-threecol-4-4-4-threerow-stacked.tpl.php
@@ -1,41 +1,41 @@
-<div class="panel-display omega-grid omega-12-threecol-4-4-4" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display omega-grid suitcase-12-threecol-4-4-4-threerow-stacked" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
   <div class="panel-panel grid-12">
-    <div class="inside"><?php print $content['top']; ?></div>
+    <?php print $content['top']; ?>
   </div>
   <div class="clearfix">
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['upper_left']; ?></div>
+      <?php print $content['upper_left']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['upper_middle']; ?></div>
+      <?php print $content['upper_middle']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['upper_right']; ?></div>
+      <?php print $content['upper_right']; ?>
     </div>
   </div>
   <div class="clearfix">
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['middle_left']; ?></div>
+      <?php print $content['middle_left']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['middle_middle']; ?></div>
+      <?php print $content['middle_middle']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['middle_right']; ?></div>
+      <?php print $content['middle_right']; ?>
     </div>
   </div>
   <div class="clearfix">
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['lower_left']; ?></div>
+      <?php print $content['lower_left']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['lower_middle']; ?></div>
+      <?php print $content['lower_middle']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['lower_right']; ?></div>
+      <?php print $content['lower_right']; ?>
     </div>
   </div>
   <div class="panel-panel grid-12">
-    <div class="inside"><?php print $content['bottom']; ?></div>
+    <?php print $content['bottom']; ?>
   </div>
 </div>
diff --git a/...itcase_12_threecol_4_4_4_tworow_stacked/suitcase-12-threecol-4-4-4-tworow-stacked.tpl.php b/...itcase_12_threecol_4_4_4_tworow_stacked/suitcase-12-threecol-4-4-4-tworow-stacked.tpl.php
@@ -1,30 +1,30 @@
-<div class="panel-display omega-grid omega-12-threecol-4-4-4" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display omega-grid suitcase-12-threecol-4-4-4-tworow-stacked" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
   <div class="panel-panel grid-12">
-    <div class="inside"><?php print $content['top']; ?></div>
+    <?php print $content['top']; ?>
   </div>
   <div class="clearfix">
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['upper_left']; ?></div>
+      <?php print $content['upper_left']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['upper_middle']; ?></div>
+      <?php print $content['upper_middle']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['upper_right']; ?></div>
+      <?php print $content['upper_right']; ?>
     </div>
   </div>
   <div class="clearfix">
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['lower_left']; ?></div>
+      <?php print $content['lower_left']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['lower_middle']; ?></div>
+      <?php print $content['lower_middle']; ?>
     </div>
     <div class="panel-panel grid-4">
-      <div class="inside"><?php print $content['lower_right']; ?></div>
+      <?php print $content['lower_right']; ?>
     </div>
   </div>
   <div class="panel-panel grid-12">
-    <div class="inside"><?php print $content['bottom']; ?></div>
+    <?php print $content['bottom']; ?>
   </div>
 </div>
diff --git a/preprocess/preprocess-html.inc b/preprocess/preprocess-html.inc
@@ -4,9 +4,5 @@
  * Implements THEMENAME_alpha_preprocess_html
  */
 function suitcase_interim_alpha_preprocess_html(&$vars) {
-//  ISU Bar responsive classes added to body
-  $vars['attributes_array']['class'][] = 'responsive';
-  $vars['attributes_array']['class'][] = 'wd-show-sidebar';
-  // Drupal 7 in hook_preprocess_html()
   drupal_add_http_header('X-UA-Compatible', 'IE=edge');
 }
diff --git a/suitcase_interim.info b/suitcase_interim.info
@@ -65,20 +65,20 @@ settings[alpha_viewport_user_scaleable] = '0'
 settings[alpha_primary_alpha_default] = 'wide'
 settings[alpha_layouts_alpha_default_fluid_responsive] = '1'
 settings[alpha_layouts_alpha_default_fluid_weight] = '1'
-settings[alpha_layouts_alpha_default_fluid_media] = 'all and (min-width: 740px) and (min-device-width: 740px), (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape)'
+settings[alpha_layouts_alpha_default_fluid_media] = 'all and (min-width: 740px)'
 settings[alpha_layouts_alpha_default_narrow_responsive] = '1'
 settings[alpha_layouts_alpha_default_narrow_weight] = '1'
-settings[alpha_layouts_alpha_default_narrow_media] = 'all and (min-width: 740px) and (min-device-width: 740px), (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape)'
+settings[alpha_layouts_alpha_default_narrow_media] = 'all and (min-width: 740px)'
 settings[alpha_layouts_alpha_default_normal_responsive] = '1'
 settings[alpha_layouts_alpha_default_normal_weight] = '2'
-settings[alpha_layouts_alpha_default_normal_media] = 'all and (min-width: 980px) and (min-device-width: 980px), all and (max-device-width: 1024px) and (min-width: 1024px) and (orientation:landscape)'
+settings[alpha_layouts_alpha_default_normal_media] = 'all and (min-width: 980px)'
 settings[alpha_layouts_alpha_default_wide_responsive] = '1'
 settings[alpha_layouts_alpha_default_wide_weight] = '3'
 settings[alpha_layouts_alpha_default_wide_media] = 'all and (min-width: 1220px)'
 settings[alpha_primary_alpha_fluid] = 'normal'
 settings[alpha_layouts_alpha_fluid_normal_responsive] = '1'
 settings[alpha_layouts_alpha_fluid_normal_weight] = '0'
-settings[alpha_layouts_alpha_fluid_normal_media] = 'all and (min-width: 740px) and (min-device-width: 740px), (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape)'
+settings[alpha_layouts_alpha_fluid_normal_media] = 'all and (min-width: 740px)'
 settings[alpha_libraries][omega_formalize] = ''
 settings[alpha_libraries][omega_mediaqueries] = ''
 settings[alpha_libraries][omega_equalheights] = ''

diff --git a/template.php b/template.php
@@ -26,16 +26,11 @@ function suitcase_interim_facetapi_deactivate_widget($variables) {
   return '&nbsp;&times;';
 }
 
-function suitcase_interim_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'search_block_form') {
-    $form['actions']['submit']['#value'] = '  ';
-  }
-}
-
 /*
  * Implements hook_form_FORMID_alter()
  */
 function suitcase_interim_form_search_block_form_alter(&$form, &$form_state, $form_id) {
+  $form['actions']['submit']['#value'] = '  ';
   $form['#attributes']['role'] = 'search';
 }
 
@@ -162,4 +157,39 @@ function suitcase_interim_smartmenu_tree_output($tree, $attributes = NULL) {
   }
 
   return $build;
+}
+
+/**
+ * Implements theme_date_display_range
+ *
+ * This is an exact copy of theme_date_display_range from the Date module v7.x-2.10-rc1
+ * Earlier versions of the Date module use div wrappers rather spans, causing HTML validation errors
+ * The Date module has not had a stable release for 7.x since 2015-09-07, over a year ago, so we provide this for now
+ */
+function suitcase_interim_date_display_range($variables) {
+  $date1 = $variables['date1'];
+  $date2 = $variables['date2'];
+  $timezone = $variables['timezone'];
+  $attributes_start = $variables['attributes_start'];
+  $attributes_end = $variables['attributes_end'];
+  $show_remaining_days = $variables['show_remaining_days'];
+
+  $start_date = '<span class="date-display-start"' . drupal_attributes($attributes_start) . '>' . $date1 . '</span>';
+  $end_date = '<span class="date-display-end"' . drupal_attributes($attributes_end) . '>' . $date2 . $timezone . '</span>';
+
+  // If microdata attributes for the start date property have been passed in,
+  // add the microdata in meta tags.
+  if (!empty($variables['add_microdata'])) {
+    $start_date .= '<meta' . drupal_attributes($variables['microdata']['value']['#attributes']) . '/>';
+    $end_date .= '<meta' . drupal_attributes($variables['microdata']['value2']['#attributes']) . '/>';
+  }
+
+  // Wrap the result with the attributes.
+  $output = '<span class="date-display-range">' . t('!start-date to !end-date', array(
+      '!start-date' => $start_date,
+      '!end-date' => $end_date,
+    )) . '</span>';
+
+  // Add remaining message and return.
+  return $output . $show_remaining_days;
 }
diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php
@@ -1,7 +1,6 @@
 <div<?php print $attributes; ?>>
   <div<?php print $content_attributes; ?>>
     <?php if ($site_name || $site_slogan): ?>
-      <div class="branding-data clearfix">
 
         <?php if ($show_isu_nameplate): ?>
             <?php if (theme_get_setting('default_logo', 'suitcase_interim')): ?>
@@ -30,7 +29,6 @@
           </div>
         <?php endif; ?>
 
-      </div>
     <?php endif; ?>
     <?php print $content; ?>
   </div>

diff --git a/templates/region--search.tpl.php b/templates/region--search.tpl.php
@@ -1,11 +1,9 @@
 <div<?php print $attributes; ?>>
   <div<?php print $content_attributes; ?>>
     <?php if ($content): ?>
-    <div class="clearfix">
       <?php $site_name_level_2_class = ($suitcase_interim_config_header_type == 1 || $suitcase_interim_config_header_type == 2) ? ' has-site-name-level-2' : ''; ?>
       <?php $site_name_level_3_class = ($suitcase_interim_config_header_type == 1 || $suitcase_interim_config_header_type == 3) ? ' has-site-name-level-3' : ''; ?>
-        <div class="search-form-container<?php print $site_name_level_2_class . $site_name_level_3_class; ?>"><?php print $content; ?></div>
-    </div>
+      <div class="search-form-container<?php print $site_name_level_2_class . $site_name_level_3_class; ?>"><?php print $content; ?></div>
     <?php endif; ?>
   </div>
 </div>
diff --git a/templates/region--secondary_menu.tpl.php b/templates/region--secondary_menu.tpl.php
@@ -1,7 +1,6 @@
 <div<?php print $attributes; ?>>
   <div<?php print $content_attributes; ?>>
-    <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix', 'secondary-menu')), 'heading' => array('text' => t('Secondary menu'),'level' => 'h2','class' => array('element-invisible')))); ?>
-
+    <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'secondary-menu')), 'heading' => array('text' => t('Secondary menu'),'level' => 'h2','class' => array('element-invisible')))); ?>
     <?php print $content; ?>
   </div>
 </div>