@@ -119,8 +119,7 @@ |
||
119 | 119 | $region_id = ''; // ensure we don't accidentlly use the last field's region. |
120 | 120 | if (!empty($this->options['regions'][$id]) && !empty($regions[$this->options['regions'][$id]])) { |
121 | 121 | $region_id = $this->options['regions'][$id]; |
122 | - } |
|
123 | - else { |
|
122 | + } else { |
|
124 | 123 | // Fallback to putting unknown fields into the first region. |
125 | 124 | $region_id = $default_region; |
126 | 125 | } |
@@ -374,8 +374,7 @@ discard block |
||
374 | 374 | function panels_panel_context_title($handler, $task, $subtask) { |
375 | 375 | if (isset($handler->conf['title'])) { |
376 | 376 | return check_plain($handler->conf['title']); |
377 | - } |
|
378 | - else { |
|
377 | + } else { |
|
379 | 378 | return t('Panel'); |
380 | 379 | } |
381 | 380 | } |
@@ -416,8 +415,7 @@ discard block |
||
416 | 415 | $access = ctools_access_group_summary(!empty($handler->conf['access']) ? $handler->conf['access'] : array(), $display->context); |
417 | 416 | if ($access) { |
418 | 417 | $access = t('This panel will be selected if @conditions.', array('@conditions' => $access)); |
419 | - } |
|
420 | - else { |
|
418 | + } else { |
|
421 | 419 | $access = t('This panel will always be selected.'); |
422 | 420 | } |
423 | 421 | |
@@ -433,8 +431,7 @@ discard block |
||
433 | 431 | if (!empty($handler->disabled)) { |
434 | 432 | $link = l(t('Enable'), page_manager_edit_url($task_name, array('handlers', $handler->name, 'actions', 'enable'))); |
435 | 433 | $text = t('Disabled'); |
436 | - } |
|
437 | - else { |
|
434 | + } else { |
|
438 | 435 | $link = l(t('Disable'), page_manager_edit_url($task_name, array('handlers', $handler->name, 'actions', 'disable'))); |
439 | 436 | $text = t('Enabled'); |
440 | 437 | } |
@@ -546,8 +543,7 @@ discard block |
||
546 | 543 | if (!isset($form_state[$form_state['task_id']]->storage_type)) { |
547 | 544 | watchdog('panels', "Unable to find the storage type for specified storage. Read 'Upgrading task handlers' in CHANGELOG.txt", array(), WATCHDOG_ERROR); |
548 | 545 | $form_state['display']->storage_type = 'unknown'; |
549 | - } |
|
550 | - else { |
|
546 | + } else { |
|
551 | 547 | $form_state['display']->storage_type = $form_state[$form_state['task_id']]->storage_type; |
552 | 548 | } |
553 | 549 | // When adding variants, we don't know the handler id yet. In that case, |
@@ -751,8 +747,7 @@ discard block |
||
751 | 747 | '#type' => 'value', |
752 | 748 | '#value' => $conf['pipeline'], |
753 | 749 | ); |
754 | - } |
|
755 | - else { |
|
750 | + } else { |
|
756 | 751 | $options = array(); |
757 | 752 | foreach ($pipelines as $name => $pipeline) { |
758 | 753 | $options[$name] = check_plain($pipeline->admin_title) . '<div class="description">' . check_plain($pipeline->admin_description) . '</div>'; |
@@ -818,8 +813,7 @@ discard block |
||
818 | 813 | if (isset($form['buttons'])) { |
819 | 814 | unset($form['buttons']); |
820 | 815 | } |
821 | - } |
|
822 | - else { |
|
816 | + } else { |
|
823 | 817 | $form['preview']['#tree'] = TRUE; |
824 | 818 | $form_state['contexts'] = $contexts; |
825 | 819 | } |
@@ -43,8 +43,7 @@ |
||
43 | 43 | |
44 | 44 | if ($where == 'pane') { |
45 | 45 | $output .= theme('panels_rounded_corners_box', $pane_output); |
46 | - } |
|
47 | - else { |
|
46 | + } else { |
|
48 | 47 | $output .= $pane_output; |
49 | 48 | $print_separator = TRUE; |
50 | 49 | } |
@@ -45,8 +45,7 @@ discard block |
||
45 | 45 | $base = ctools_get_style_base($style->settings['style_base']); |
46 | 46 | if ($base['type'] == 'pane') { |
47 | 47 | unset($plugin['render region']); |
48 | - } |
|
49 | - else { |
|
48 | + } else { |
|
50 | 49 | unset($plugin['render pane']); |
51 | 50 | } |
52 | 51 | |
@@ -123,8 +122,7 @@ discard block |
||
123 | 122 | ctools_stylizer_add_css($plugin, $settings); |
124 | 123 | |
125 | 124 | return theme($plugin['theme'], $settings, ctools_stylizer_get_css_class($plugin, $settings), $output); |
126 | - } |
|
127 | - else { |
|
125 | + } else { |
|
128 | 126 | // if the style is gone, just display the output. |
129 | 127 | return $output; |
130 | 128 | } |
@@ -142,8 +140,7 @@ discard block |
||
142 | 140 | |
143 | 141 | if (empty($content->css_class)) { |
144 | 142 | $content->css_class = ctools_stylizer_get_css_class($plugin, $settings); |
145 | - } |
|
146 | - else { |
|
143 | + } else { |
|
147 | 144 | $content->css_class .= ' ' . ctools_stylizer_get_css_class($plugin, $settings); |
148 | 145 | } |
149 | 146 | |
@@ -213,8 +210,7 @@ discard block |
||
213 | 210 | if (isset($conf['settings'])) { |
214 | 211 | unset($conf['settings']); |
215 | 212 | } |
216 | - } |
|
217 | - else { |
|
213 | + } else { |
|
218 | 214 | $conf['style'] = '$'; |
219 | 215 | $conf['settings'] = $info['settings']; |
220 | 216 | } |
@@ -230,15 +226,12 @@ discard block |
||
230 | 226 | |
231 | 227 | if ($type == 'pane') { |
232 | 228 | $renderer->command_update_pane($pid); |
233 | - } |
|
234 | - else if ($type == 'region') { |
|
229 | + } else if ($type == 'region') { |
|
235 | 230 | $renderer->command_update_region_links($pid); |
236 | - } |
|
237 | - else { |
|
231 | + } else { |
|
238 | 232 | $renderer->command_update_display_links(); |
239 | 233 | } |
240 | - } |
|
241 | - else { |
|
234 | + } else { |
|
242 | 235 | $renderer->commands = $output; |
243 | 236 | } |
244 | 237 | } |
@@ -132,8 +132,7 @@ discard block |
||
132 | 132 | ), |
133 | 133 | ), |
134 | 134 | ); |
135 | - } |
|
136 | - else if (!isset($settings['items'])) { |
|
135 | + } else if (!isset($settings['items'])) { |
|
137 | 136 | // Convert an old style flexible to a new style flexible. |
138 | 137 | $old = $settings; |
139 | 138 | $settings = array(); |
@@ -229,8 +228,7 @@ discard block |
||
229 | 228 | // Apply the proper title to the region |
230 | 229 | if (!empty($old["row_$row"]['names'][$col - 1])) { |
231 | 230 | $settings['items']["row_${row}_$col"]['title'] = $old["row_$row"]['names'][$col - 1]; |
232 | - } |
|
233 | - else { |
|
231 | + } else { |
|
234 | 232 | $settings['items']["row_${row}_$col"]['title'] = t("Row @row, Column @col", array('@row' => $row, '@col' => $col)); |
235 | 233 | } |
236 | 234 | } |
@@ -280,8 +278,7 @@ discard block |
||
280 | 278 | if ($admin) { |
281 | 279 | // always scale in admin mode. |
282 | 280 | $renderer->scale_base = 99.0; |
283 | - } |
|
284 | - else { |
|
281 | + } else { |
|
285 | 282 | $renderer->scale_base = !empty($settings['items']['canvas']['no_scale']) ? 100.0 : 99.0; |
286 | 283 | } |
287 | 284 | $renderer->id_str = $id ? 'id="' . $id . '"' : ''; |
@@ -361,12 +358,10 @@ discard block |
||
361 | 358 | // Give the CSS to the renderer to put where it wants. |
362 | 359 | if ($handler) { |
363 | 360 | $handler->add_css($filename, 'module', 'all', FALSE); |
364 | - } |
|
365 | - else { |
|
361 | + } else { |
|
366 | 362 | ctools_css_add_css($filename, 'module', 'all', FALSE); |
367 | 363 | } |
368 | - } |
|
369 | - else { |
|
364 | + } else { |
|
370 | 365 | // If the id is 'new' we can't reliably cache the CSS in the filesystem |
371 | 366 | // because the display does not truly exist, so we'll stick it in the |
372 | 367 | // head tag. We also do this if we've been told we're in the layout |
@@ -416,8 +411,7 @@ discard block |
||
416 | 411 | t('Reuse layout') . '">'; |
417 | 412 | } |
418 | 413 | $output .= "<div class=\"panel-flexible " . $renderer->base['canvas'] . " clear-block panel-flexible-admin panel-flexible-no-edit-layout\" $renderer->id_str>\n"; |
419 | - } |
|
420 | - else { |
|
414 | + } else { |
|
421 | 415 | $output = "<div class=\"panel-flexible " . $renderer->base['canvas'] . " clear-block panel-flexible-admin panel-flexible-edit-layout\" $renderer->id_str>\n"; |
422 | 416 | } |
423 | 417 | $output .= "<div class=\"panel-flexible-inside " . $renderer->base['canvas'] . "-inside \">\n"; |
@@ -481,8 +475,7 @@ discard block |
||
481 | 475 | if (!empty($content) || $renderer->admin) { |
482 | 476 | if ($group_count > 1 || $renderer->admin) { |
483 | 477 | $output .= '<div class="' . $owner_id . '-' . $position . '">' . $content . '</div>'; |
484 | - } |
|
485 | - else { |
|
478 | + } else { |
|
486 | 479 | $output .= $content; |
487 | 480 | } |
488 | 481 | } |
@@ -573,8 +566,7 @@ discard block |
||
573 | 566 | if ($right_id) { |
574 | 567 | $right = $renderer->settings['items'][$right_id]; |
575 | 568 | $right_class = $renderer->base[$left['type']] . '-' . $right_id; |
576 | - } |
|
577 | - else { |
|
569 | + } else { |
|
578 | 570 | $right = $left; |
579 | 571 | $right_class = $left_class; |
580 | 572 | } |
@@ -641,18 +633,15 @@ discard block |
||
641 | 633 | if (empty($item['children'])) { |
642 | 634 | $remove = t('Remove column'); |
643 | 635 | $add = t('Add row'); |
644 | - } |
|
645 | - else { |
|
636 | + } else { |
|
646 | 637 | $add = t('Add row to top'); |
647 | 638 | $add2 = t('Add row to bottom'); |
648 | 639 | } |
649 | - } |
|
650 | - else if ($item['type'] == 'row') { |
|
640 | + } else if ($item['type'] == 'row') { |
|
651 | 641 | if ($id == 'canvas') { |
652 | 642 | $title = t('Canvas'); |
653 | 643 | $settings = t('Canvas settings'); |
654 | - } |
|
655 | - else { |
|
644 | + } else { |
|
656 | 645 | $title = t('Row'); |
657 | 646 | $settings = t('Row settings'); |
658 | 647 | } |
@@ -661,13 +650,11 @@ discard block |
||
661 | 650 | $remove = t('Remove row'); |
662 | 651 | } |
663 | 652 | $add = $item['contains'] == 'region' ? t('Add region') : t('Add column'); |
664 | - } |
|
665 | - else { |
|
653 | + } else { |
|
666 | 654 | $add = $item['contains'] == 'region' ? t('Add region to left') : t('Add column to left'); |
667 | 655 | $add2 = $item['contains'] == 'region' ? t('Add region to right') : t('Add column to right'); |
668 | 656 | } |
669 | - } |
|
670 | - else if ($item['type'] == 'region') { |
|
657 | + } else if ($item['type'] == 'region') { |
|
671 | 658 | $title = t('Region'); |
672 | 659 | $settings = t('Region settings'); |
673 | 660 | $remove = t('Remove region'); |
@@ -711,8 +698,7 @@ discard block |
||
711 | 698 | function panels_flexible_render_css($renderer) { |
712 | 699 | if ($renderer->admin) { |
713 | 700 | $parent_class = '.' . $renderer->base['row'] . '-canvas'; |
714 | - } |
|
715 | - else { |
|
701 | + } else { |
|
716 | 702 | $parent_class = '.' . $renderer->base['canvas']; |
717 | 703 | } |
718 | 704 | return panels_flexible_render_css_group($renderer, $renderer->settings['items']['canvas']['children'], $parent_class, 'column', 'canvas'); |
@@ -803,15 +789,13 @@ discard block |
||
803 | 789 | $left[] = $id; |
804 | 790 | $renderer->positions[$id] = 'left'; |
805 | 791 | $left_total += $renderer->settings['items'][$id]['width']; |
806 | - } |
|
807 | - else { |
|
792 | + } else { |
|
808 | 793 | $current = 'right'; |
809 | 794 | $right[] = $id; |
810 | 795 | $renderer->positions[$id] = 'right'; |
811 | 796 | $right_total += $renderer->settings['items'][$id]['width']; |
812 | 797 | } |
813 | - } |
|
814 | - else { |
|
798 | + } else { |
|
815 | 799 | // fluid |
816 | 800 | if ($current != 'right') { |
817 | 801 | $current = 'middle'; |
@@ -879,8 +863,7 @@ discard block |
||
879 | 863 | // Make this one very specific to the admin CSS so that preview |
880 | 864 | // does not stomp it. |
881 | 865 | $css[".panel-flexible-admin $owner_id-inside"]['padding-left'] = '0px'; |
882 | - } |
|
883 | - else { |
|
866 | + } else { |
|
884 | 867 | $css["$owner_id-inside"]['margin-left'] = '-' . $left_total . 'px'; |
885 | 868 | $css["$owner_id-inside"]['padding-left'] = $left_total . 'px'; |
886 | 869 | // IE hack |
@@ -900,8 +883,7 @@ discard block |
||
900 | 883 | |
901 | 884 | if (!empty($item['fixed_width']) && intval($item['fixed_width'])) { |
902 | 885 | $css['.' . $renderer->base['canvas']]['width'] = intval($item['fixed_width']) . 'px'; |
903 | - } |
|
904 | - else { |
|
886 | + } else { |
|
905 | 887 | $css['.' . $renderer->base['canvas']]['width'] = 'auto'; |
906 | 888 | } |
907 | 889 | } |
@@ -916,8 +898,7 @@ discard block |
||
916 | 898 | if ($type == 'column') { |
917 | 899 | // Columns can only contain rows. |
918 | 900 | $child_type = 'row'; |
919 | - } |
|
920 | - else { |
|
901 | + } else { |
|
921 | 902 | $child_type = isset($item['contains']) ? $item['contains'] : 'region'; |
922 | 903 | } |
923 | 904 | |
@@ -955,8 +936,7 @@ discard block |
||
955 | 936 | case 'row': |
956 | 937 | if ($id == 'canvas') { |
957 | 938 | $title = t('Configure canvas'); |
958 | - } |
|
959 | - else { |
|
939 | + } else { |
|
960 | 940 | $title = t('Configure row'); |
961 | 941 | } |
962 | 942 | break; |
@@ -1015,8 +995,7 @@ discard block |
||
1015 | 995 | ); |
1016 | 996 | if (!empty($item['fixed_width']) && intval($item['fixed_width'])) { |
1017 | 997 | $css['.' . $renderer->base['canvas']] = array('width' => intval($item['fixed_width']) . 'px'); |
1018 | - } |
|
1019 | - else { |
|
998 | + } else { |
|
1020 | 999 | $css['.' . $renderer->base['canvas']] = array('width' => 'auto'); |
1021 | 1000 | } |
1022 | 1001 | foreach ($css as $selector => $data) { |
@@ -1115,8 +1094,7 @@ discard block |
||
1115 | 1094 | '#description' => t('How much padding to put on beneath rows to separate them from each other. Because this is placed only on the bottom, not hte top, this is NOT doubled like column/region separation.'), |
1116 | 1095 | '#default_value' => isset($item['row_separation']) ? $item['row_separation'] : '0.5em', |
1117 | 1096 | ); |
1118 | - } |
|
1119 | - else { |
|
1097 | + } else { |
|
1120 | 1098 | $form['class'] = array( |
1121 | 1099 | '#title' => t('CSS class'), |
1122 | 1100 | '#type' => 'textfield', |
@@ -1132,8 +1110,7 @@ discard block |
||
1132 | 1110 | foreach ($siblings as $sibling) { |
1133 | 1111 | if ($sibling == $id) { |
1134 | 1112 | $current = 'right'; |
1135 | - } |
|
1136 | - else if ($settings['items'][$sibling]['width_type'] == '%') { |
|
1113 | + } else if ($settings['items'][$sibling]['width_type'] == '%') { |
|
1137 | 1114 | $$current = TRUE; // Indirection. |
1138 | 1115 | } |
1139 | 1116 | } |
@@ -1148,8 +1125,7 @@ discard block |
||
1148 | 1125 | ), |
1149 | 1126 | '#disabled' => TRUE, |
1150 | 1127 | ); |
1151 | - } |
|
1152 | - else { |
|
1128 | + } else { |
|
1153 | 1129 | $form['contains'] = array( |
1154 | 1130 | '#type' => 'select', |
1155 | 1131 | '#title' => t('Contains'), |
@@ -1198,11 +1174,9 @@ discard block |
||
1198 | 1174 | $item['column_separation'] = $form_state['values']['column_separation']; |
1199 | 1175 | $item['region_separation'] = $form_state['values']['region_separation']; |
1200 | 1176 | $item['row_separation'] = $form_state['values']['row_separation']; |
1201 | - } |
|
1202 | - else if ($item['type'] != 'row') { |
|
1177 | + } else if ($item['type'] != 'row') { |
|
1203 | 1178 | $item['width_type'] = $form_state['values']['width_type']; |
1204 | - } |
|
1205 | - else { |
|
1179 | + } else { |
|
1206 | 1180 | $item['contains'] = $form_state['values']['contains']; |
1207 | 1181 | } |
1208 | 1182 | |
@@ -1296,8 +1270,7 @@ discard block |
||
1296 | 1270 | $content .= '<input type="hidden" name="panel[pane][' . |
1297 | 1271 | $form_state['key'] . ']" id="edit-panel-pane-' . $form_state['key'] . '" value="" />'; |
1298 | 1272 | |
1299 | - } |
|
1300 | - else { |
|
1273 | + } else { |
|
1301 | 1274 | // We need to make sure the left/middle/right divs exist inside this |
1302 | 1275 | // so that more stuff can be added inside it as needed. |
1303 | 1276 | foreach (array('left', 'middle', 'right') as $position) { |
@@ -1327,8 +1300,7 @@ discard block |
||
1327 | 1300 | if ($location == 'left') { |
1328 | 1301 | $item_output .= panels_flexible_render_splitter($renderer, $form_state['key'], $form_state['sibling']); |
1329 | 1302 | $output[] = ctools_ajax_command_prepend('#panels-dnd-main .' . $parent_class . '-left', $item_output); |
1330 | - } |
|
1331 | - else if ($location == 'right') { |
|
1303 | + } else if ($location == 'right') { |
|
1332 | 1304 | // If we are adding to the right side of the left box, there is |
1333 | 1305 | // a splitter that we have to remove; then we add our box normally, |
1334 | 1306 | // and then add a new splitter for just our guy. |
@@ -1350,8 +1322,7 @@ discard block |
||
1350 | 1322 | $item_output .= panels_flexible_render_splitter($renderer, $form_state['key'], $form_state['sibling']); |
1351 | 1323 | } |
1352 | 1324 | $output[] = ctools_ajax_command_prepend('#panels-dnd-main .' . $parent_class . '-middle', $item_output); |
1353 | - } |
|
1354 | - else { |
|
1325 | + } else { |
|
1355 | 1326 | if (!empty($form_state['sibling'])) { |
1356 | 1327 | $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output; |
1357 | 1328 | } |
@@ -1425,8 +1396,7 @@ discard block |
||
1425 | 1396 | if (!empty($parent['children'])) { |
1426 | 1397 | if ($location == 'left') { |
1427 | 1398 | $sibling = reset($parent['children']); |
1428 | - } |
|
1429 | - else { |
|
1399 | + } else { |
|
1430 | 1400 | $sibling = end($parent['children']); |
1431 | 1401 | } |
1432 | 1402 | if ($settings['items'][$sibling]['width_type'] == 'px') { |
@@ -1451,8 +1421,7 @@ discard block |
||
1451 | 1421 | $form['width_type']['#value'] = $item['width_type']; |
1452 | 1422 | $form['width_type']['#description'] = t('Items cannot be set to fluid if there are fixed items already on that side.'); |
1453 | 1423 | } |
1454 | - } |
|
1455 | - else { |
|
1424 | + } else { |
|
1456 | 1425 | $form['contains'] = array( |
1457 | 1426 | '#type' => 'select', |
1458 | 1427 | '#title' => t('Contains'), |
@@ -1489,8 +1458,7 @@ discard block |
||
1489 | 1458 | |
1490 | 1459 | if ($item['type'] != 'row') { |
1491 | 1460 | $item['width_type'] = $form_state['values']['width_type']; |
1492 | - } |
|
1493 | - else { |
|
1461 | + } else { |
|
1494 | 1462 | $item['contains'] = $form_state['values']['contains']; |
1495 | 1463 | } |
1496 | 1464 | |
@@ -1501,8 +1469,7 @@ discard block |
||
1501 | 1469 | $key .= '_'; |
1502 | 1470 | } |
1503 | 1471 | $form_state['key'] = $key; |
1504 | - } |
|
1505 | - else { |
|
1472 | + } else { |
|
1506 | 1473 | $form_state['key'] = $key = max(array_keys($settings['items'])) + 1; |
1507 | 1474 | } |
1508 | 1475 | |
@@ -1512,8 +1479,7 @@ discard block |
||
1512 | 1479 | // necessary. |
1513 | 1480 | if ($location == 'left') { |
1514 | 1481 | $form_state['sibling'] = reset($parent['children']); |
1515 | - } |
|
1516 | - else { |
|
1482 | + } else { |
|
1517 | 1483 | $form_state['sibling'] = end($parent['children']); |
1518 | 1484 | |
1519 | 1485 | } |
@@ -1532,8 +1498,7 @@ discard block |
||
1532 | 1498 | $settings['items'][$key] = $item; |
1533 | 1499 | if ($location == 'left') { |
1534 | 1500 | array_unshift($parent['children'], $key); |
1535 | - } |
|
1536 | - else { |
|
1501 | + } else { |
|
1537 | 1502 | $parent['children'][] = $key; |
1538 | 1503 | } |
1539 | 1504 | } |
@@ -68,8 +68,7 @@ |
||
68 | 68 | |
69 | 69 | if ($rows) { |
70 | 70 | $content = theme('table', array(), $rows, array('class' => 'panels-manage')); |
71 | - } |
|
72 | - else { |
|
71 | + } else { |
|
73 | 72 | $content = '<p>' . t('There are no custom layouts.') . '</p>'; |
74 | 73 | } |
75 | 74 |
@@ -256,8 +256,7 @@ discard block |
||
256 | 256 | $form_state['skip'] = $skip; |
257 | 257 | if ($skip) { |
258 | 258 | $form['markup'] = array('#value' => t('<p>Click Submit to be presented with a complete list of available content types set to the defaults you selected.</p>')); |
259 | - } |
|
260 | - else { |
|
259 | + } else { |
|
261 | 260 | // Rebuild the entire list, setting appropriately from defaults. Give |
262 | 261 | // each type its own checkboxes set unless it's 'single' in which |
263 | 262 | // case it can go into our fake other set. |
@@ -271,8 +270,7 @@ discard block |
||
271 | 270 | $options[$checkboxes][$key] = $info['title']; |
272 | 271 | if (!isset($allowed_content_types[$key])) { |
273 | 272 | $allowed[$checkboxes][$key] = isset($default_types[$id]) ? $default_types[$id] : $default_types['other']; |
274 | - } |
|
275 | - else { |
|
273 | + } else { |
|
276 | 274 | $allowed[$checkboxes][$key] = $allowed_content_types[$key]; |
277 | 275 | } |
278 | 276 | } |
@@ -448,11 +446,9 @@ discard block |
||
448 | 446 | $available_layouts = panels_get_layouts(); |
449 | 447 | if (empty($module_name)) { |
450 | 448 | return $available_layouts; |
451 | - } |
|
452 | - else if (is_object($module_name)) { |
|
449 | + } else if (is_object($module_name)) { |
|
453 | 450 | $allowed_layouts = $module_name; |
454 | - } |
|
455 | - else { |
|
451 | + } else { |
|
456 | 452 | $allowed_layouts = panels_common_get_allowed_layout_object($module_name); |
457 | 453 | } |
458 | 454 | |
@@ -490,8 +486,7 @@ discard block |
||
490 | 486 | $content .= '<li>' . panels_get_pane_title($display->content[$pid], $display->context) . '</li>'; |
491 | 487 | } |
492 | 488 | $content .= '</ol>'; |
493 | - } |
|
494 | - else { |
|
489 | + } else { |
|
495 | 490 | $content .= t('Empty'); |
496 | 491 | } |
497 | 492 | $content .= '</dd>'; |
@@ -521,8 +521,7 @@ |
||
521 | 521 | ctools_include('plugins'); |
522 | 522 | if (is_object($which) || is_array($which)) { |
523 | 523 | return ctools_plugin_get_function($which, $function_name); |
524 | - } |
|
525 | - else { |
|
524 | + } else { |
|
526 | 525 | return ctools_plugin_load_function('panels', $plugin, $which, $function_name); |
527 | 526 | } |
528 | 527 |
@@ -17,8 +17,7 @@ discard block |
||
17 | 17 | if (!empty($layout['css'])) { |
18 | 18 | if (file_exists(path_to_theme() . '/' . $layout['css'])) { |
19 | 19 | drupal_add_css(path_to_theme() . '/' . $layout['css']); |
20 | - } |
|
21 | - else { |
|
20 | + } else { |
|
22 | 21 | drupal_add_css($layout['path'] . '/' . $layout['css']); |
23 | 22 | } |
24 | 23 | } |
@@ -53,8 +52,7 @@ discard block |
||
53 | 52 | // title to bubble up to the top but not actually be used on the pane. |
54 | 53 | if (empty($content->title) && !empty($content->original_title)) { |
55 | 54 | $display->stored_pane_title = $content->original_title; |
56 | - } |
|
57 | - else { |
|
55 | + } else { |
|
58 | 56 | $display->stored_pane_title = !empty($content->title) ? $content->title : ''; |
59 | 57 | } |
60 | 58 | } |
@@ -94,8 +92,7 @@ discard block |
||
94 | 92 | |
95 | 93 | $style = panels_get_style($panel_settings['style']); |
96 | 94 | $style_settings = isset($panel_settings['style_settings']['default']) ? $panel_settings['style_settings']['default'] : array(); |
97 | - } |
|
98 | - else { |
|
95 | + } else { |
|
99 | 96 | $style = panels_get_style($panel_settings[$panel]['style']); |
100 | 97 | $style_settings = isset($panel_settings['style_settings'][$panel]) ? $panel_settings['style_settings'][$panel] : array(); |
101 | 98 | } |