bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib modules security updates

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2016-10-13 12:10:40 +02:00
parent ffd758abc9
commit 747127f643
732 changed files with 67976 additions and 23207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sites/all/modules/panels/plugins/layouts/flexible/flexible-admin.js
View File

@@ -17,7 +17,7 @@ Drupal.flexible.fixHeight = function() {
Drupal.behaviors.flexibleAdmin = {
attach: function(context) {
// Show/hide layout manager button
$('input#panels-flexible-toggle-layout:not(.panels-flexible-processed)', context)
$('#panels-flexible-toggle-layout:not(.panels-flexible-processed)', context)
.addClass('panels-flexible-processed')
.click(function() {
$('.panel-flexible-admin')
@@ -290,9 +290,6 @@ Drupal.flexible.splitter = function($splitter) {
// if not moving the right side, adjust the parent padding instead.
splitter.parent.css('padding-left', (splitter.left_padding - moved) + 'px');
splitter.left.parent().css('margin-left', (splitter.left_parent + moved) + 'px');
if (jQuery.browser.msie) {
splitter.left.parent().css('left', splitter.currentLeft);
}
}
return false;
};

34
sites/all/modules/panels/plugins/layouts/flexible/flexible.inc
View File

@@ -471,15 +471,26 @@ function panels_flexible_render_items($renderer, $list, $owner_id) {
switch ($item['type']) {
case 'column':
$content = panels_flexible_render_items($renderer, $item['children'], $renderer->base['column'] . '-' . $id);
$groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
if (empty($renderer->settings['items'][$id]['hide_empty']) || trim($content)) {
$groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
}
break;
case 'row':
$content = panels_flexible_render_items($renderer, $item['children'], $renderer->base['row'] . '-' . $id);
$groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max, TRUE);
if (empty($renderer->settings['items'][$id]['hide_empty']) || trim($content)) {
$groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max, TRUE);
}
break;
case 'region':
$content = isset($renderer->content[$id]) ? $renderer->content[$id] : " ";
$groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
if (empty($renderer->settings['items'][$id]['hide_empty'])) {
$content = isset($renderer->content[$id]) ? $renderer->content[$id] : " ";
}
else {
$content = isset($renderer->content[$id]) ? trim($renderer->content[$id]) : "";
}
if (empty($renderer->settings['items'][$id]['hide_empty']) || $content) {
$groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
}
break;
}
@@ -1186,6 +1197,12 @@ function panels_flexible_config_item_form($form, &$form_state) {
}
}
$form['hide_empty'] = array(
'#title' => t('Hide element if empty'),
'#type' => 'checkbox',
'#default_value' => !empty($item['hide_empty']) ? 1 : 0,
);
$form['save'] = array(
'#type' => 'submit',
'#value' => t('Save'),
@@ -1223,6 +1240,7 @@ function panels_flexible_config_item_form_submit(&$form, &$form_state) {
else {
$item['contains'] = $form_state['values']['contains'];
}
$item['hide_empty'] = $form_state['values']['hide_empty'];
}
@@ -1486,6 +1504,12 @@ function panels_flexible_add_item_form($form, &$form_state) {
);
}
$form['hide_empty'] = array(
'#title' => t('Hide element if empty'),
'#type' => 'checkbox',
'#default_value' => 0,
);
$form['save'] = array(
'#type' => 'submit',
'#value' => t('Save'),
@@ -1516,6 +1540,8 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
$item['contains'] = $form_state['values']['contains'];
}
$item['hide_empty'] = $form_state['values']['hide_empty'];
if ($item['type'] == 'region') {
// derive the region key from the title
$key = preg_replace("/[^a-z0-9]/", '_', drupal_strtolower($item['title']));

2
sites/all/modules/panels/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css
View File

@@ -18,7 +18,7 @@
width: 25%;
}
.panel-3col-stacked .panel-col .inside {
.panel-3col-stacked .panel-col-first .inside {
margin: 0 .5em 1em .5em;
}