Projet

Général

Profil

Révision e4c061ad

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/panels/plugins/layouts/flexible/flexible.inc
471 471
    switch ($item['type']) {
472 472
      case 'column':
473 473
        $content = panels_flexible_render_items($renderer, $item['children'], $renderer->base['column'] . '-' . $id);
474
        $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
474
        if (empty($renderer->settings['items'][$id]['hide_empty']) || trim($content)) {
475
          $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
476
        }
475 477
        break;
476 478
      case 'row':
477 479
        $content = panels_flexible_render_items($renderer, $item['children'], $renderer->base['row'] . '-' . $id);
478
        $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max, TRUE);
480
        if (empty($renderer->settings['items'][$id]['hide_empty']) || trim($content)) {
481
          $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max, TRUE);
482
        }
479 483
        break;
480 484
      case 'region':
481
        $content = isset($renderer->content[$id]) ? $renderer->content[$id] : " ";
482
        $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
485
        if (empty($renderer->settings['items'][$id]['hide_empty'])) {
486
          $content = isset($renderer->content[$id]) ? $renderer->content[$id] : " ";
487
        }
488
        else {
489
          $content = isset($renderer->content[$id]) ? trim($renderer->content[$id]) : "";
490
        }
491
        if (empty($renderer->settings['items'][$id]['hide_empty']) || $content) {
492
          $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
493
        }
483 494
        break;
484 495
    }
485 496

  
......
1186 1197
    }
1187 1198
  }
1188 1199

  
1200
  $form['hide_empty'] = array(
1201
    '#title' => t('Hide element if empty'),
1202
    '#type' => 'checkbox',
1203
    '#default_value' => !empty($item['hide_empty']) ? 1 : 0,
1204
  );
1205

  
1189 1206
  $form['save'] = array(
1190 1207
    '#type' => 'submit',
1191 1208
    '#value' => t('Save'),
......
1223 1240
  else {
1224 1241
    $item['contains'] = $form_state['values']['contains'];
1225 1242
  }
1243
  $item['hide_empty'] = $form_state['values']['hide_empty'];
1226 1244

  
1227 1245
}
1228 1246

  
......
1486 1504
    );
1487 1505
  }
1488 1506

  
1507
  $form['hide_empty'] = array(
1508
    '#title' => t('Hide element if empty'),
1509
    '#type' => 'checkbox',
1510
    '#default_value' => 0,
1511
  );
1512

  
1489 1513
  $form['save'] = array(
1490 1514
    '#type' => 'submit',
1491 1515
    '#value' => t('Save'),
......
1516 1540
    $item['contains'] = $form_state['values']['contains'];
1517 1541
  }
1518 1542

  
1543
  $item['hide_empty'] = $form_state['values']['hide_empty'];
1544

  
1519 1545
  if ($item['type'] == 'region') {
1520 1546
    // derive the region key from the title
1521 1547
    $key = preg_replace("/[^a-z0-9]/", '_', drupal_strtolower($item['title']));

Formats disponibles : Unified diff