Skip to content
Snippets Groups Projects
Commit d345387c authored by Chris Gross's avatar Chris Gross
Browse files

7.x-1.4 Release

parent 6b410774
No related branches found
Tags 7.x-1.4
No related merge requests found
WCM Base 7.x-1.4, 2018-01-30
----------------------------
- OCIO Calendar:
- Display all-day and multi-day events as separate events in month view.
- Fixed navigation on month view pane.
- OCIO Landing Page: Added missing views panes from allowed content.
- WCM Omega:
- Set table alignment to 'left' by default so CKEditor adds 'center' classes to table headers.
- Only restyle level two views accordions if the are part of a views group.
- WCM Panels Settings:
- Updated Media Magnet pane form to match Panopoly's change to the form structure.
- Move Workbench Access field (if it exists) on right column on node edit form.
- Accordion Filter now only hides entire panel panes if they are views panes.
WCM Base 7.x-1.4-rc3, 2018-01-12 WCM Base 7.x-1.4-rc3, 2018-01-12
-------------------------------- --------------------------------
- OCIO FAQs: - OCIO FAQs:
......
...@@ -226,7 +226,7 @@ function ocio_calendar_views_default_views() { ...@@ -226,7 +226,7 @@ function ocio_calendar_views_default_views() {
$handler->display->display_options['style_options']['name_size'] = '3'; $handler->display->display_options['style_options']['name_size'] = '3';
$handler->display->display_options['style_options']['mini'] = '0'; $handler->display->display_options['style_options']['mini'] = '0';
$handler->display->display_options['style_options']['with_weekno'] = '0'; $handler->display->display_options['style_options']['with_weekno'] = '0';
$handler->display->display_options['style_options']['multiday_theme'] = '1'; $handler->display->display_options['style_options']['multiday_theme'] = '0';
$handler->display->display_options['style_options']['theme_style'] = '1'; $handler->display->display_options['style_options']['theme_style'] = '1';
$handler->display->display_options['style_options']['max_items'] = '5'; $handler->display->display_options['style_options']['max_items'] = '5';
$handler->display->display_options['defaults']['style_options'] = FALSE; $handler->display->display_options['defaults']['style_options'] = FALSE;
...@@ -781,11 +781,11 @@ function ocio_calendar_views_default_views() { ...@@ -781,11 +781,11 @@ function ocio_calendar_views_default_views() {
$handler->display->display_options['defaults']['style_plugin'] = FALSE; $handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'calendar_style'; $handler->display->display_options['style_plugin'] = 'calendar_style';
$handler->display->display_options['style_options']['name_size'] = '3'; $handler->display->display_options['style_options']['name_size'] = '3';
$handler->display->display_options['style_options']['mini'] = '1'; $handler->display->display_options['style_options']['mini'] = '0';
$handler->display->display_options['style_options']['with_weekno'] = '0'; $handler->display->display_options['style_options']['with_weekno'] = '0';
$handler->display->display_options['style_options']['multiday_theme'] = '1'; $handler->display->display_options['style_options']['multiday_theme'] = '0';
$handler->display->display_options['style_options']['theme_style'] = '1'; $handler->display->display_options['style_options']['theme_style'] = '1';
$handler->display->display_options['style_options']['max_items'] = '0'; $handler->display->display_options['style_options']['max_items'] = '5';
$handler->display->display_options['defaults']['style_options'] = FALSE; $handler->display->display_options['defaults']['style_options'] = FALSE;
$handler->display->display_options['defaults']['row_plugin'] = FALSE; $handler->display->display_options['defaults']['row_plugin'] = FALSE;
$handler->display->display_options['row_plugin'] = 'calendar_entity'; $handler->display->display_options['row_plugin'] = 'calendar_entity';
...@@ -802,16 +802,18 @@ function ocio_calendar_views_default_views() { ...@@ -802,16 +802,18 @@ function ocio_calendar_views_default_views() {
); );
$handler->display->display_options['defaults']['row_options'] = FALSE; $handler->display->display_options['defaults']['row_options'] = FALSE;
$handler->display->display_options['defaults']['arguments'] = FALSE; $handler->display->display_options['defaults']['arguments'] = FALSE;
/* Contextual filter: Content: Date - start date (field_date) */ /* Contextual filter: Date: Date (node) */
$handler->display->display_options['arguments']['field_date_value']['id'] = 'field_date_value'; $handler->display->display_options['arguments']['date_argument']['id'] = 'date_argument';
$handler->display->display_options['arguments']['field_date_value']['table'] = 'field_data_field_date'; $handler->display->display_options['arguments']['date_argument']['table'] = 'node';
$handler->display->display_options['arguments']['field_date_value']['field'] = 'field_date_value'; $handler->display->display_options['arguments']['date_argument']['field'] = 'date_argument';
$handler->display->display_options['arguments']['field_date_value']['default_action'] = 'default'; $handler->display->display_options['arguments']['date_argument']['default_action'] = 'default';
$handler->display->display_options['arguments']['field_date_value']['default_argument_type'] = 'date'; $handler->display->display_options['arguments']['date_argument']['default_argument_type'] = 'php';
$handler->display->display_options['arguments']['field_date_value']['summary']['number_of_records'] = '0'; $handler->display->display_options['arguments']['date_argument']['default_argument_options']['code'] = 'return isset($_GET[\'month\']) ? $_GET[\'month\'] : date(\'Y-m\');';
$handler->display->display_options['arguments']['field_date_value']['summary']['format'] = 'default_summary'; $handler->display->display_options['arguments']['date_argument']['granularity_reset'] = 0;
$handler->display->display_options['arguments']['field_date_value']['summary_options']['items_per_page'] = '25'; $handler->display->display_options['arguments']['date_argument']['add_delta'] = 'yes';
$handler->display->display_options['arguments']['field_date_value']['granularity_reset'] = 1; $handler->display->display_options['arguments']['date_argument']['date_fields'] = array(
'field_data_field_date.field_date_value' => 'field_data_field_date.field_date_value',
);
$handler->display->display_options['allow']['use_pager'] = 0; $handler->display->display_options['allow']['use_pager'] = 0;
$handler->display->display_options['allow']['items_per_page'] = 0; $handler->display->display_options['allow']['items_per_page'] = 0;
$handler->display->display_options['allow']['offset'] = 0; $handler->display->display_options['allow']['offset'] = 0;
......
...@@ -420,10 +420,19 @@ function ocio_landing_page_strongarm() { ...@@ -420,10 +420,19 @@ function ocio_landing_page_strongarm() {
'fieldable_panels_pane-fieldable_panels_pane' => FALSE, 'fieldable_panels_pane-fieldable_panels_pane' => FALSE,
'fieldable_panels_pane-spotlight' => FALSE, 'fieldable_panels_pane-spotlight' => FALSE,
'menu_tree-_active' => TRUE, 'menu_tree-_active' => TRUE,
'views_panes-calendar-upcoming_pane' => TRUE,
'views_panes-calendar-month_pane' => TRUE,
'views_panes-faq-panel_pane_1' => TRUE, 'views_panes-faq-panel_pane_1' => TRUE,
'views_panes-leadership_listing-panel_pane_1' => TRUE, 'views_panes-faq-panel_pane_2' => TRUE,
'views_panes-user_contact-panel_pane_1' => TRUE, 'views_panes-faq-panel_pane_3' => TRUE,
'views_panes-ocio_news_archive-titles_pane' => TRUE,
'views_panes-ocio_news_archive-teasers_pane' => TRUE,
'views_panes-ocio_news_archive-trio_pane' => TRUE,
'views_panes-wcm_media_gallery-image_gallery_pane' => TRUE, 'views_panes-wcm_media_gallery-image_gallery_pane' => TRUE,
'views_panes-user_contact-panel_pane_1' => TRUE,
'views_panes-user_contact-panel_pane_2' => TRUE,
'views_panes-leadership_listing-panel_pane_1' => TRUE,
'views_panes-leadership_listing-panel_pane_2' => TRUE,
); );
$export['panelizer_node:ocio_landing_page_allowed_types'] = $strongarm; $export['panelizer_node:ocio_landing_page_allowed_types'] = $strongarm;
......
...@@ -41,19 +41,19 @@ ...@@ -41,19 +41,19 @@
} }
else { else {
accordion.show(); accordion.show();
accordion.parents('.panel-pane').show(); accordion.parents('.pane-views-panes').show();
} }
}); });
// If no acccordions in the group are visible, hide the entire group // If no acccordions in the group are visible, hide the entire group
if (group.find('.content-accordion, .views-row').filter(':visible').length == 0) { if (group.find('.content-accordion, .views-row').filter(':visible').length == 0) {
group.prevUntil('.ui-accordion').hide(); group.prevUntil('.ui-accordion').hide();
group.parents('.panel-pane').hide(); group.parents('.pane-views-panes').hide();
group.prev('h2').hide(); group.prev('h2').hide();
} }
// Else if there are any visible accordions in the group, show its h2, if it has one // Else if there are any visible accordions in the group, show its h2, if it has one
else if (group.prev('h2').length > 0) { else if (group.prev('h2').length > 0) {
group.parents('.panel-pane').show(); group.parents('.pane-views-panes').show();
group.prev('h2').show(); group.prev('h2').show();
} }
}); });
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
accordionGroups.show(); accordionGroups.show();
accordionGroups.find('.content-accordion, .views-row').show(); accordionGroups.find('.content-accordion, .views-row').show();
accordionGroups.prevUntil('.ui-accordion').show(); accordionGroups.prevUntil('.ui-accordion').show();
accordionGroups.parents('.panel-pane').show(); accordionGroups.parents('.pane-views-panes').show();
} }
// Show or hide the 'No Results' message, depending on whether any accordions are visible. // Show or hide the 'No Results' message, depending on whether any accordions are visible.
......
...@@ -60,17 +60,19 @@ function wcm_panels_settings_form_fieldable_panels_panes_fieldable_panels_pane_c ...@@ -60,17 +60,19 @@ function wcm_panels_settings_form_fieldable_panels_panes_fieldable_panels_pane_c
* Implements hook_form_FORM_ID_alter(). * Implements hook_form_FORM_ID_alter().
*/ */
function wcm_panels_settings_form_mm_widgets_live_pane_edit_form_alter(&$form, &$form_state) { function wcm_panels_settings_form_mm_widgets_live_pane_edit_form_alter(&$form, &$form_state) {
$form['override_title']['#default_value'] = 1; $general = &$form['general_settings'];
$form['override_title']['#access'] = FALSE;
$form['override_title_markup']['#access'] = FALSE; $general['override_title']['#default_value'] = 1;
$form['override_title_heading']['#access'] = FALSE; $general['override_title']['#access'] = FALSE;
$form['override_title_text']['#attributes']['placeholder'] = t('Title'); $general['override_title_markup']['#access'] = FALSE;
$form['items_template_key']['#access'] = FALSE; $general['override_title_heading']['#access'] = FALSE;
$general['override_title_text']['#attributes']['placeholder'] = t('Title');
$general['items_template_key']['#access'] = FALSE;
$form['display_settings']['#type'] = 'fieldset'; $form['display_settings']['#type'] = 'fieldset';
$form['display_settings']['#title'] = t('Display Settings'); $form['display_settings']['#title'] = t('Display Settings');
$form['display_settings']['items_limit'] = $form['items_limit']; $form['display_settings']['items_limit'] = $general['items_limit'];
unset($form['items_limit']); unset($general['items_limit']);
array_unshift($form['#submit'], 'wcm_panels_settings_form_mm_widgets_live_pane_edit_form_submit'); array_unshift($form['#submit'], 'wcm_panels_settings_form_mm_widgets_live_pane_edit_form_submit');
} }
...@@ -155,6 +157,7 @@ function wcm_panels_settings_preprocess_panels_add_content_modal(&$vars) { ...@@ -155,6 +157,7 @@ function wcm_panels_settings_preprocess_panels_add_content_modal(&$vars) {
} }
*/ */
/* /*
* Implements hook_form_FORM_ID_alter(). * Implements hook_form_FORM_ID_alter().
* *
...@@ -191,6 +194,12 @@ function wcm_panels_settings_form_node_form_alter(&$form, &$form_state) { ...@@ -191,6 +194,12 @@ function wcm_panels_settings_form_node_form_alter(&$form, &$form_state) {
if ($form['#node']->type != 'article') { if ($form['#node']->type != 'article') {
$form['options']['sticky']['#access'] = 0; $form['options']['sticky']['#access'] = 0;
} }
// Move Workbench Access field to right column
if (!empty($form['workbench_access']['workbench_access'])) {
$form['options']['workbench_access'] = $form['workbench_access']['workbench_access'];
unset($form['workbench_access']['workbench_access']);
}
} }
/* /*
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -4,12 +4,12 @@ table { ...@@ -4,12 +4,12 @@ table {
width: 100%; width: 100%;
margin-bottom: $vert-spacing-unit; margin-bottom: $vert-spacing-unit;
line-height: 140%; line-height: 140%;
p, a, li { p, a, li {
@include font-size(1.5); @include font-size(1.5);
line-height: 120% !important; line-height: 120% !important;
} }
th { th {
background: darken($lt-gray,5%); background: darken($lt-gray,5%);
font-weight: 600; font-weight: 600;
...@@ -48,6 +48,7 @@ table { ...@@ -48,6 +48,7 @@ table {
td, th { td, th {
padding: 0.6em 1em; padding: 0.6em 1em;
border: 1px solid $gray-line; border: 1px solid $gray-line;
text-align: left;
} }
/* Table captions */ /* Table captions */
...@@ -101,7 +102,7 @@ table { ...@@ -101,7 +102,7 @@ table {
/* tables added with the table pane type */ /* tables added with the table pane type */
.pane-bundle-table table { .pane-bundle-table table {
width: 100%; width: 100%;
tr.odd { tr.odd {
background: white; background: white;
} }
......
...@@ -29,24 +29,24 @@ ...@@ -29,24 +29,24 @@
} }
.view-grouping-content { .view-grouping-content {
margin-bottom: 1px; margin-bottom: 1px;
// second level of accordion
.ui-accordion-header {
background: $lt-gray !important;
padding-left: 2em !important;
margin-top: 1px !important;
margin-bottom: 0;
a {
@include font-size(1.6);
margin-left: 16px;
}
&.ui-state-hover {
background-color: darken($lt-gray,10%) !important;
}
.ui-accordion-header-icon {
margin-left: 18px;
}
}
} }
// second level of accordion
.ui-accordion-header {
background: $lt-gray !important;
padding-left: 2em !important;
margin-top: 1px !important;
margin-bottom: 0;
a {
@include font-size(1.6);
margin-left: 16px;
}
&.ui-state-hover {
background-color: darken($lt-gray,10%) !important;
}
.ui-accordion-header-icon {
margin-left: 18px;
}
}
.ui-accordion { .ui-accordion {
.ui-accordion-content { .ui-accordion-content {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment