diff --git a/panels/layouts/suitcase_12/suitcase_12_threecol_4_4_4_tworow_stacked/suitcase-12-threecol-4-4-4-tworow-stacked.tpl.php b/panels/layouts/suitcase_12/suitcase_12_threecol_4_4_4_tworow_stacked/suitcase-12-threecol-4-4-4-tworow-stacked.tpl.php
index cd884f7..c4fdac0 100644
--- a/panels/layouts/suitcase_12/suitcase_12_threecol_4_4_4_tworow_stacked/suitcase-12-threecol-4-4-4-tworow-stacked.tpl.php
+++ b/panels/layouts/suitcase_12/suitcase_12_threecol_4_4_4_tworow_stacked/suitcase-12-threecol-4-4-4-tworow-stacked.tpl.php
@@ -1,30 +1,30 @@
-
>
+
\ No newline at end of file
diff --git a/preprocess/preprocess-html.inc b/preprocess/preprocess-html.inc
index 5fce08e..4f26af5 100644
--- 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');
}
\ No newline at end of file
diff --git a/suitcase_interim.info b/suitcase_interim.info
index 1aef5a9..75e2f3e 100644
--- 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
index db9bafc..3224907 100644
--- a/template.php
+++ b/template.php
@@ -26,16 +26,11 @@ function suitcase_interim_facetapi_deactivate_widget($variables) {
return ' ×';
}
-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 = '
' . $date1 . '';
+ $end_date = '
' . $date2 . $timezone . '';
+
+ // 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 .= '
';
+ $end_date .= '
';
+ }
+
+ // Wrap the result with the attributes.
+ $output = '
' . t('!start-date to !end-date', array(
+ '!start-date' => $start_date,
+ '!end-date' => $end_date,
+ )) . '';
+
+ // Add remaining message and return.
+ return $output . $show_remaining_days;
}
\ No newline at end of file
diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php
index a4a29b1..ad22363 100644
--- a/templates/region--branding.tpl.php
+++ b/templates/region--branding.tpl.php
@@ -1,7 +1,6 @@
diff --git a/templates/region--search.tpl.php b/templates/region--search.tpl.php
index 8e391c1..78e9a8c 100644
--- a/templates/region--search.tpl.php
+++ b/templates/region--search.tpl.php
@@ -1,11 +1,9 @@
diff --git a/templates/region--secondary_menu.tpl.php b/templates/region--secondary_menu.tpl.php
index f4e5f5a..a71ed64 100644
--- a/templates/region--secondary_menu.tpl.php
+++ b/templates/region--secondary_menu.tpl.php
@@ -1,7 +1,6 @@
>
>
- $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')))); ?>
-
+ $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')))); ?>
\ No newline at end of file