summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Perry2017-02-03 23:14:50 (GMT)
committerJakob Perry2017-02-04 23:28:09 (GMT)
commitf400a1d0d025262d05d497cf32602ecfc638b5d1 (patch)
treeb717b0faaa8c01b69709907ee69e93826e9f8913
parent698da19d848743b1ba3df381ce183b61d7e5e390 (diff)
Panels 3.9 Code Cleanup
-rw-r--r--KNOWN_ISSUES.txt2
-rw-r--r--README.txt2
-rw-r--r--css/panels-dashboard.css1
-rw-r--r--css/panels.css1
-rw-r--r--css/panels_admin.css5
-rw-r--r--css/panels_dnd.css31
-rw-r--r--css/panels_page.css1
-rw-r--r--i18n_panels/i18n_panels.i18n.inc2
-rw-r--r--i18n_panels/i18n_panels.module5
-rw-r--r--includes/callbacks.inc11
-rw-r--r--includes/common.inc54
-rw-r--r--includes/display-edit.inc40
-rw-r--r--includes/display-layout.inc6
-rw-r--r--includes/legacy.inc17
-rw-r--r--includes/page-wizard.inc8
-rw-r--r--includes/panels.pipelines.inc2
-rw-r--r--includes/plugins.inc22
-rw-r--r--panels.api.php24
-rw-r--r--panels.install12
-rw-r--r--panels.module800
-rw-r--r--panels_ipe/css/panels_ipe-rtl.css1
-rw-r--r--panels_ipe/css/panels_ipe.css299
-rw-r--r--panels_ipe/includes/panels_ipe.pipelines.inc2
-rw-r--r--panels_ipe/panels_ipe.module22
-rw-r--r--panels_ipe/plugins/display_renderers/ipe.inc4
-rw-r--r--panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php33
-rw-r--r--panels_mini/panels_mini.info2
-rw-r--r--panels_mini/panels_mini.install20
-rw-r--r--panels_mini/panels_mini.module18
-rw-r--r--panels_mini/plugins/content_types/panels_mini.inc3
-rw-r--r--panels_mini/plugins/export_ui/panels_mini.inc5
-rw-r--r--panels_mini/plugins/export_ui/panels_mini_ui.class.php13
-rw-r--r--panels_mini/plugins/panels_storage/panels_mini.inc2
-rw-r--r--panels_node/panels_node.install20
-rw-r--r--panels_node/panels_node.module27
-rw-r--r--panels_node/plugins/panels_storage/panels_node.inc2
-rw-r--r--plugins/cache/simple.inc5
-rw-r--r--plugins/display_renderers/editor.inc4
-rw-r--r--plugins/display_renderers/panels_renderer_editor.class.php91
-rw-r--r--plugins/display_renderers/panels_renderer_simple.class.php3
-rw-r--r--plugins/display_renderers/panels_renderer_standard.class.php43
-rw-r--r--plugins/display_renderers/simple.inc1
-rw-r--r--plugins/display_renderers/standard.inc4
-rw-r--r--plugins/export_ui/panels_layouts.inc5
-rw-r--r--plugins/export_ui/panels_layouts_ui.class.php13
-rw-r--r--plugins/layouts/flexible/flexible-admin.css6
-rw-r--r--plugins/layouts/flexible/flexible.css1
-rw-r--r--plugins/layouts/flexible/flexible.inc141
-rw-r--r--plugins/layouts/onecol/onecol.css1
-rw-r--r--plugins/layouts/onecol/onecol.inc5
-rw-r--r--plugins/layouts/onecol/panels-onecol.tpl.php2
-rw-r--r--plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php2
-rw-r--r--plugins/layouts/threecol_25_50_25/threecol_25_50_25.css27
-rw-r--r--plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc8
-rw-r--r--plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php2
-rw-r--r--plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css31
-rw-r--r--plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc5
-rw-r--r--plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php2
-rw-r--r--plugins/layouts/threecol_33_34_33/threecol_33_34_33.css27
-rw-r--r--plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc9
-rw-r--r--plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php2
-rw-r--r--plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css31
-rw-r--r--plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc7
-rw-r--r--plugins/layouts/twocol/panels-twocol.tpl.php2
-rw-r--r--plugins/layouts/twocol/twocol.css19
-rw-r--r--plugins/layouts/twocol/twocol.inc7
-rw-r--r--plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php2
-rw-r--r--plugins/layouts/twocol_bricks/twocol_bricks.css23
-rw-r--r--plugins/layouts/twocol_bricks/twocol_bricks.inc5
-rw-r--r--plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php2
-rw-r--r--plugins/layouts/twocol_stacked/twocol_stacked.css23
-rw-r--r--plugins/layouts/twocol_stacked/twocol_stacked.inc7
-rw-r--r--plugins/page_wizards/landing_page.inc10
-rw-r--r--plugins/panels_storage/page_manager.inc2
-rw-r--r--plugins/style_bases/pane/pane_plain_box/pane-plain-box.css1
-rw-r--r--plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css11
-rw-r--r--plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc1
-rw-r--r--plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css8
-rw-r--r--plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc1
-rw-r--r--plugins/styles/block.inc3
-rw-r--r--plugins/styles/corners/rounded_corners.inc2
-rw-r--r--plugins/styles/default.inc3
-rw-r--r--plugins/styles/list.inc3
-rw-r--r--plugins/styles/naked.inc3
-rw-r--r--plugins/styles/stylizer.inc16
-rw-r--r--plugins/task_handlers/panel_context.inc56
-rw-r--r--plugins/views/panels.views.inc6
-rw-r--r--plugins/views/panels_views_plugin_row_fields.inc5
-rw-r--r--templates/panels-dashboard-block.tpl.php4
-rw-r--r--templates/panels-dashboard-link.tpl.php4
-rw-r--r--templates/panels-dashboard.tpl.php4
-rw-r--r--templates/panels-pane.tpl.php4
92 files changed, 1233 insertions, 1001 deletions
diff --git a/KNOWN_ISSUES.txt b/KNOWN_ISSUES.txt
index 6696367..27f0e7a 100644
--- a/KNOWN_ISSUES.txt
+++ b/KNOWN_ISSUES.txt
@@ -88,4 +88,4 @@ Known Issue http://drupal.org/node/207859
secure pages doesn't know about. When trying to make non-secure ajax calls
from a secure page, the browser denies the call.
Solution:
- The solution is to simply add panels/* to your Secure Pages configuration. \ No newline at end of file
+ The solution is to simply add panels/* to your Secure Pages configuration.
diff --git a/README.txt b/README.txt
index 3c86762..c6d7eee 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,3 @@
Welcome to Panels 3
-Documentation is available at https://www.drupal.org/node/496278 \ No newline at end of file
+Documentation is available at https://www.drupal.org/node/496278
diff --git a/css/panels-dashboard.css b/css/panels-dashboard.css
index a7efeae..ca2fe9c 100644
--- a/css/panels-dashboard.css
+++ b/css/panels-dashboard.css
@@ -1,4 +1,3 @@
-
.dashboard-entry .dashboard-link {
font-size: 120%;
font-weight: bold;
diff --git a/css/panels.css b/css/panels.css
index 13c473c..170652d 100644
--- a/css/panels.css
+++ b/css/panels.css
@@ -1,4 +1,3 @@
-
div.panel-pane div.admin-links {
font-size: xx-small;
margin-right: 1em;
diff --git a/css/panels_admin.css b/css/panels_admin.css
index 78094e2..ce61b03 100644
--- a/css/panels_admin.css
+++ b/css/panels_admin.css
@@ -1,4 +1,3 @@
-
.layout-link {
float: left;
padding: 1em;
@@ -141,12 +140,12 @@ table .argument-operation input {
}
tr.changed td {
- background-color: #FFFFDD !important;
+ background-color: #ffffdd !important;
}
tr.changed td span.star {
font-weight: bold;
- color: #E09010;
+ color: #e09010;
}
td select {
diff --git a/css/panels_dnd.css b/css/panels_dnd.css
index 7252ad6..dc42d58 100644
--- a/css/panels_dnd.css
+++ b/css/panels_dnd.css
@@ -1,4 +1,3 @@
-
#panels-dnd-main {
margin: 0.5em 0;
}
@@ -42,7 +41,7 @@ div.panels-set-title-hide .panels-set-title {
}
/* Add Icon */
-#panels-dnd-main div.panel-region .pane-add-link {
+#panels-dnd-main div.panel-region .pane-add-link {
}
#panels-dnd-main div.panel-region .pane-add-link img {
display: none;
@@ -127,24 +126,24 @@ div.panels-set-title-hide .panel-pane-is-title {
}
.panel-portlet .changed div.grab-title {
- background-color: #FFFFDD !important;
- border-bottom: 1px solid #3D9CD7 !important;
+ background-color: #ffffdd !important;
+ border-bottom: 1px solid #3d9cd7 !important;
color: black !important;
}
.panel-portlet .changed.hidden-pane div.grab-title {
- background-color: #B4B488 !important;
- border-bottom: 1px solid #3D9CD7 !important;
+ background-color: #b4b488 !important;
+ border-bottom: 1px solid #3d9cd7 !important;
}
.panel-portlet .changed div.grab-title span.star {
font-weight: bold;
- color: #E09010;
+ color: #e09010;
}
.panel-portlet .grabber:hover {
color: #fff;
- background-color: #2F78A5;
+ background-color: #2f78a5;
}
.panel-portlet.hidden-pane .grab-title:hover {
@@ -175,7 +174,8 @@ div.panels-set-title-hide .panel-pane-is-title {
margin: 0;
}
-.panel-portlet .buttons input, .panel-portlet .buttons button {
+.panel-portlet .buttons input,
+.panel-portlet .buttons button {
margin: 0;
padding: 0;
display: inline;
@@ -186,7 +186,7 @@ div.panels-set-title-hide .panel-pane-is-title {
}
.panel-portlet .pane-title {
- font-size:110%;
+ font-size: 110%;
cursor: pointer;
}
@@ -315,7 +315,7 @@ a.close img {
padding-left: 1em;
padding-bottom: 1em;
margin-bottom: 1em;
- background-color: #EEEEEE;
+ background-color: #eeeeee;
}
.panels-section-columns {
@@ -354,7 +354,7 @@ a.close img {
.panels-section-column-categories .inside {
padding: 0;
- }
+}
.panels-section-column-categories .content-type-button {
padding-left: 10px;
@@ -431,7 +431,7 @@ a.close img {
float: none;
}
-.panels-modal-content .modal-form .no-float label {
+.panels-modal-content .modal-form .no-float label {
width: auto;
}
@@ -502,7 +502,6 @@ html.js div.panels-display-links div.ctools-dropdown-container ul li a {
/* @group CTools Dropdown */
#panels-dnd-main .ctools-dropdown a.ctools-dropdown-text-link,
html.js div.panels-display-links a.ctools-dropdown-text-link {
-
background: url('../images/arrow-down-light.png') 0 3px no-repeat!important;
padding-left: 12px;
}
@@ -522,7 +521,6 @@ html.js div.panels-display-links div.ctools-dropdown-container {
html.js #panels-dnd-main div.ctools-dropdown div.ctools-dropdown-container ul li,
html.js div.panels-display-links div.ctools-dropdown-container ul li {
-
text-decoration: none;
padding: 0;
margin: 0;
@@ -565,7 +563,7 @@ html.js #panels-dnd-main div.ctools-dropdown div.ctools-dropdown-container ul li
html.js div.panels-display-links div.ctools-dropdown-container ul li .panels-sub-menu ul li a,
html.js #panels-dnd-main div.ctools-dropdown div.ctools-dropdown-container ul li .panels-sub-menu span.panels-text,
html.js div.panels-display-links div.ctools-dropdown-container ul li .panels-sub-menu span.panels-text {
- width:auto;
+ width: auto;
padding: 0 20px;
}
@@ -682,4 +680,3 @@ div.ctools-modal-content {
top: -2em;
margin-bottom: -2em;
}
-
diff --git a/css/panels_page.css b/css/panels_page.css
index 1d731b9..cce8590 100644
--- a/css/panels_page.css
+++ b/css/panels_page.css
@@ -1,4 +1,3 @@
-
div.panels-page-type-container {
clear: left;
}
diff --git a/i18n_panels/i18n_panels.i18n.inc b/i18n_panels/i18n_panels.i18n.inc
index 71fdafb..d1478e3 100644
--- a/i18n_panels/i18n_panels.i18n.inc
+++ b/i18n_panels/i18n_panels.i18n.inc
@@ -1,7 +1,7 @@
<?php
/**
* @file
- * Internationalization (i18n) hooks
+ * Internationalization (i18n) hooks.
*/
/**
diff --git a/i18n_panels/i18n_panels.module b/i18n_panels/i18n_panels.module
index c43b7a0..c944f48 100644
--- a/i18n_panels/i18n_panels.module
+++ b/i18n_panels/i18n_panels.module
@@ -206,6 +206,7 @@ function i18n_panels_panels_delete_display($did) {
*
* This function must not rely on the passed $renderer parameter. The parameter
* could be empty because this function is reused in i18n_ctools_render_alter().
+ *
* @todo Check if a drupal_alter() in panels_display::get_title() is applicable.
*
* @see i18n_ctools_render_alter()
@@ -234,6 +235,7 @@ function i18n_panels_panels_pre_render(&$display, $renderer) {
*
* Under some circumstances the title of the panel page is set before
* hook_panels_pre_render() is fired. Such cases can be handled with this hook.
+ *
* @todo Check if a drupal_alter() in panels_display::get_title() is applicable.
*/
function i18n_ctools_render_alter(&$info, $page, $context) {
@@ -250,7 +252,6 @@ function i18n_ctools_render_alter(&$info, $page, $context) {
* Implements hook_ctools_plugin_post_alter().
*
* Register some translatable configuration settings for plugins.
- *
*/
function i18n_panels_ctools_plugin_post_alter(&$plugin, $plugin_type_info) {
if ($plugin_type_info['type'] == 'content_types') {
@@ -366,7 +367,7 @@ function _18n_panels_is_exported_panels_display($display) {
*
* @todo I bet there are better ways to solve this mess.
*
- * @param boolean $reset
+ * @param bool $reset
* Reset the static cache.
*
* @return array
diff --git a/includes/callbacks.inc b/includes/callbacks.inc
index 255a3cd..57ef7cf 100644
--- a/includes/callbacks.inc
+++ b/includes/callbacks.inc
@@ -1,6 +1,6 @@
<?php
/**
- * @file callbacks.inc
+ * @file Callbacks.inc
* Minor menu callbacks for Panels helpers.
*/
@@ -46,7 +46,7 @@ function panels_panels_dashboard_blocks(&$vars) {
'description' => t('Custom layouts can add more, site-specific layouts that you can use in your panels.'),
);
- // Load all mini panels and their displays.
+ // Load all mini panels and their displays.
ctools_include('export');
$items = ctools_export_crud_load_all('panels_layout');
$count = 0;
@@ -97,7 +97,7 @@ function template_preprocess_panels_dashboard(&$vars) {
$function($vars);
}
- // Add in any default links for modules that are not active
+ // Add in any default links for modules that are not active.
panels_dashboard_final_blocks($vars);
// If page manager module is enabled, add a very low eight block to
@@ -138,7 +138,7 @@ function template_preprocess_panels_dashboard(&$vars) {
'class' => 'dashboard-create',
);
- // Turn the links into a block
+ // Turn the links into a block.
foreach ($vars['links'] as $link) {
$vars['blocks']['links']['content'] .= theme('panels_dashboard_link', array('link' => $link));
}
@@ -148,7 +148,7 @@ function template_preprocess_panels_dashboard(&$vars) {
$vars['left'] = '';
$vars['right'] = '';
- // Render all the blocks
+ // Render all the blocks.
foreach ($vars['blocks'] as $block) {
$section = !empty($block['section']) ? $block['section'] : 'left';
$vars[$section] .= theme('panels_dashboard_block', array('block' => $block));
@@ -202,4 +202,3 @@ function panels_admin_panel_context_page() {
ctools_include('common', 'panels');
return drupal_get_form('panels_common_settings', 'panels_page');
}
-
diff --git a/includes/common.inc b/includes/common.inc
index 8aabd1b..31d1bfe 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -39,12 +39,11 @@
*
* @see panels_edit_layout()
* @see _panels_edit_layout()
- *
*/
class panels_allowed_layouts {
/**
- * Specifies whether newly-added layouts (as in, new .inc files) should be automatically
+ * Specifies whether newly-added layouts (as in, new .inc files) should be automatically
* allowed (TRUE) or disallowed (FALSE) for $this. Defaults to TRUE, which is more
* permissive but less of an administrative hassle if/when you add new layouts. Note
* that this parameter will be derived from $allowed_layouts if a value is passed in.
@@ -52,19 +51,20 @@ class panels_allowed_layouts {
var $allow_new = TRUE;
/**
- * Optional member. If provided, the Panels API will generate a drupal variable using
+ * Optional member. If provided, the Panels API will generate a drupal variable using
* variable_set($module_name . 'allowed_layouts', serialize($this)), thereby handling the
* storage of this object entirely within the Panels API. This object will be
* called and rebuilt by panels_edit_layout() if the same $module_name string is passed in
* for the $allowed_types parameter. \n
* This is primarily intended for convenience - client modules doing heavy-duty implementations
* of the Panels API will probably want to create their own storage method.
+ *
* @see panels_edit_layout()
*/
var $module_name = NULL;
/**
- * An associative array of all available layouts, keyed by layout name (as defined
+ * An associative array of all available layouts, keyed by layout name (as defined
* in the corresponding layout plugin definition), with value = 1 if the layout is
* allowed, and value = 0 if the layout is not allowed.
* Calling array_filter(panels_allowed_layouts::$allowed_layout_settings) will return an associative array
@@ -82,15 +82,14 @@ class panels_allowed_layouts {
/**
* Constructor function; loads the $allowed_layout_settings array with initial values according
- * to $start_allowed
+ * to $start_allowed.
*
* @param bool $start_allowed
- * $start_allowed determines whether all available layouts will be marked
- * as allowed or not allowed on the initial call to panels_allowed_layouts::set_allowed()
- *
+ * $start_allowed determines whether all available layouts will be marked
+ * as allowed or not allowed on the initial call to panels_allowed_layouts::set_allowed()
*/
function __construct($start_allowed = TRUE) {
- // TODO would be nice if there was a way to just fetch the names easily
+ // TODO would be nice if there was a way to just fetch the names easily.
foreach ($this->list_layouts() as $layout_name) {
$this->allowed_layout_settings[$layout_name] = $start_allowed ? 1 : 0;
}
@@ -121,6 +120,7 @@ class panels_allowed_layouts {
* drupal_goto('</path/to/desired/redirect>');
* }
* }
+ *
* @endcode \n
*
* If $allowed_layouts->form_state == 'failed-validate' || 'render', then you'll need to return
@@ -135,8 +135,8 @@ class panels_allowed_layouts {
* you to control where the user ends up next.
*
* @param string $title
- * Used to set the title of the allowed layouts form. If no value is given, defaults to
- * 'Panels: Allowed Layouts'.
+ * Used to set the title of the allowed layouts form. If no value is given, defaults to
+ * 'Panels: Allowed Layouts'.
*
* @return mixed $result
* - On the first passthrough when the form is being rendered, $result is the form's structured
@@ -147,11 +147,11 @@ class panels_allowed_layouts {
function set_allowed($title = 'Panels: Allowed Layouts') {
$this->sync_with_available();
$form_id = 'panels_common_set_allowed_layouts';
- // TODO switch to drupal_build_form(); need to pass by ref
+ // TODO switch to drupal_build_form(); need to pass by ref.
$form = drupal_retrieve_form($form_id, $this, $title);
if ($result = drupal_process_form($form_id, $form)) {
- // successful submit
+ // Successful submit.
$this->form_state = 'submit';
return $result;
}
@@ -192,7 +192,6 @@ class panels_allowed_layouts {
* If you don't serialize the second parameter of variable_get() and the variable name you provide
* can't be found, an E_STRICT warning will be generated for trying to unserialize an entity
* that has not been serialized.
- *
*/
function save() {
if (!is_null($this->module_name)) {
@@ -217,6 +216,7 @@ class panels_allowed_layouts {
}
return $layouts;
}
+
}
/**
@@ -292,7 +292,7 @@ function panels_common_settings($form, &$form_state, $module_name = 'panels_comm
'#tree' => TRUE,
);
- // cheat a bit
+ // Cheat a bit.
$content_types['other'] = array('title' => t('Other'), 'weight' => 10);
foreach ($content_types as $id => $info) {
if (isset($allowed[$id])) {
@@ -338,14 +338,14 @@ function panels_common_settings($form, &$form_state, $module_name = 'panels_comm
}
/**
- * Submit hook for panels_common_settings
+ * Submit hook for panels_common_settings.
*/
function panels_common_settings_validate($form, &$form_state) {
panels_common_allowed_layouts_form_validate($form, $form_state);
}
/**
- * Submit hook for panels_common_settings
+ * Submit hook for panels_common_settings.
*/
function panels_common_settings_submit($form, &$form_state) {
panels_common_allowed_layouts_form_submit($form, $form_state);
@@ -377,8 +377,7 @@ function panels_common_settings_submit($form, &$form_state) {
* Based upon the settings, get the allowed types for this node.
*/
function panels_common_get_allowed_types($module, $contexts = array(), $has_content = FALSE, $default_defaults = array(), $default_allowed_types = array()) {
- // Get a list of all types that are available
-
+ // Get a list of all types that are available.
$default_types = variable_get($module . '_default', $default_defaults);
$allowed_types = variable_get($module . '_allowed_types', $default_allowed_types);
@@ -412,8 +411,8 @@ function panels_common_get_allowed_types($module, $contexts = array(), $has_cont
* @ingroup forms
*
* @param array $allowed_layouts
- * The set of allowed layouts that should be used as the default values
- * for this form. If none is provided, then by default no layouts will be restricted.
+ * The set of allowed layouts that should be used as the default values
+ * for this form. If none is provided, then by default no layouts will be restricted.
*/
function panels_common_allowed_layouts_form(&$form, &$form_state, $module_name) {
// Fetch our allowed layouts from variables.
@@ -468,17 +467,17 @@ function panels_common_allowed_layouts_form_submit($form, &$form_state) {
function panels_common_get_allowed_layout_object($module_name) {
$allowed_layouts = unserialize(variable_get($module_name . "_allowed_layouts", serialize('')));
- // if no parameter was provided, or the variable_get failed
+ // If no parameter was provided, or the variable_get failed.
if (!$allowed_layouts) {
- // still no dice. simply creates a dummy version where all layouts
+ // Still no dice. simply creates a dummy version where all layouts
// are allowed.
$allowed_layouts = new panels_allowed_layouts();
$allowed_layouts->allow_new = TRUE;
$allowed_layouts->module_name = $module_name;
}
- // sanitize allowed layout listing; this is redundant if the
- // $allowed_layouts param was null, but the data is cached anyway
+ // Sanitize allowed layout listing; this is redundant if the
+ // $allowed_layouts param was null, but the data is cached anyway.
$allowed_layouts->sync_with_available();
return $allowed_layouts;
@@ -493,7 +492,7 @@ function panels_common_get_allowed_layouts($module_name) {
if (empty($module_name)) {
return $available_layouts;
}
- else if (is_object($module_name)) {
+ elseif (is_object($module_name)) {
$allowed_layouts = $module_name;
}
else {
@@ -508,7 +507,7 @@ function panels_common_get_allowed_layouts($module_name) {
}
}
- // Sort
+ // Sort.
$layouts = array();
asort($order);
@@ -596,7 +595,6 @@ function panels_common_print_layout_links($layouts, $base_path, $link_options =
// We're doing these dependencies completely manualy, which is unusual, but
// the process code only supports doing them in a form.
// @todo modify dependent.inc to make this easier.
-
$dependencies = array();
foreach ($options as $category => $links) {
$dependencies['panels-layout-category-' . $category] = array(
diff --git a/includes/display-edit.inc b/includes/display-edit.inc
index dbc4786..d48c789 100644
--- a/includes/display-edit.inc
+++ b/includes/display-edit.inc
@@ -1,6 +1,6 @@
<?php
-/*
+/**
* @file
* Core Panels API include file containing various display-editing functions.
* This includes all the basic editing forms (content, layout, layout settings)
@@ -40,7 +40,7 @@ function _panels_edit($display, $destination, $content_types, $title = FALSE) {
}
/**
- * Form definition for the panels display editor
+ * Form definition for the panels display editor.
*
* No validation function is necessary, as all 'validation' is handled
* either in the lead-up to form rendering (through the selection of
@@ -48,6 +48,7 @@ function _panels_edit($display, $destination, $content_types, $title = FALSE) {
* the ajax modals & content types.
*
* @ingroup forms
+ *
* @see panels_edit_display_submit()
*/
function panels_edit_display_form($form, &$form_state) {
@@ -157,7 +158,7 @@ function panels_edit_display_form_submit($form, &$form_state) {
$display->panels[$region_id] = array();
if ($panes) {
$pids = explode(',', $panes);
- // need to filter the array, b/c passing it in a hidden field can generate trash
+ // Need to filter the array, b/c passing it in a hidden field can generate trash.
foreach (array_filter($pids) as $pid) {
if ($old_content[$pid]) {
$display->panels[$region_id][] = $pid;
@@ -221,7 +222,7 @@ function panels_edit_display_settings_form($form, &$form_state) {
ctools_include('dependent');
if ($form_state['display_title']) {
- $form['display_title'] = array (
+ $form['display_title'] = array(
'#tree' => TRUE,
);
@@ -252,16 +253,15 @@ function panels_edit_display_settings_form($form, &$form_state) {
// We have to create a manual fieldset because fieldsets do not support IDs.
// Use 'hidden' instead of 'markup' so that the process will run.
// Add js for collapsible fieldsets manually
-// drupal_add_js('misc/form.js');
-// drupal_add_js('misc/collapse.js');
-// $form['display_title']['contexts_prefix'] = array(
-// '#type' => 'hidden',
-// '#id' => 'edit-display-substitutions',
-// '#prefix' => '<div><fieldset id="edit-display-substitutions" class="collapsed collapsible"><legend>' . t('Substitutions') . '</legend><div class="fieldset-wrapper">',
-// '#process' => array('ctools_dependent_process'),
-// '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
-// );
-
+ // drupal_add_js('misc/form.js');
+ // drupal_add_js('misc/collapse.js');
+ // $form['display_title']['contexts_prefix'] = array(
+ // '#type' => 'hidden',
+ // '#id' => 'edit-display-substitutions',
+ // '#prefix' => '<div><fieldset id="edit-display-substitutions" class="collapsed collapsible"><legend>' . t('Substitutions') . '</legend><div class="fieldset-wrapper">',
+ // '#process' => array('ctools_dependent_process'),
+ // '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
+ // );
$rows = array();
foreach ($display->context as $context) {
foreach (ctools_context_get_converters('%' . check_plain($context->keyword) . ':', $context) as $keyword => $title) {
@@ -279,17 +279,15 @@ function panels_edit_display_settings_form($form, &$form_state) {
'#collapsible' => TRUE,
'#collapsed' => TRUE,
'#value' => theme('table', array('header' => $header, 'rows' => $rows)),
-// '#process' => array('form_process_fieldset', 'ctools_dependent_process'),
-// '#id' => 'edit-display-title-context',
-// '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
+ // '#process' => array('form_process_fieldset', 'ctools_dependent_process'), // '#id' => 'edit-display-title-context',
+ // '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
);
-// $form['display_title']['contexts_suffix'] = array(
-// '#value' => '</div></fieldset></div>',
-// );
+ // $form['display_title']['contexts_suffix'] = array( // '#value' => '</div></fieldset></div>',
+ // );.
}
}
- // TODO doc the ability to do this as part of the API
+ // TODO doc the ability to do this as part of the API.
if (!empty($layout['settings form']) && function_exists($layout['settings form'])) {
$form['layout_settings'] = $layout['settings form']($display, $layout, $display->layout_settings);
}
diff --git a/includes/display-layout.inc b/includes/display-layout.inc
index a21e663..aac3fe6 100644
--- a/includes/display-layout.inc
+++ b/includes/display-layout.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Handle the forms for changing a display's layout.
*/
@@ -33,7 +32,7 @@ function _panels_edit_layout($display, $finish, $destination, $allowed_layouts)
if (empty($_POST) || empty($_POST['form_id']) || $_POST['form_id'] != 'panels_change_layout') {
$output = drupal_build_form('panels_choose_layout', $form_state);
if (!empty($form_state['executed'])) {
- // upon submission go to next form.
+ // Upon submission go to next form.
$change_form_state['layout'] = $_SESSION['layout'][$display->did] = $form_state['layout'];
$change_form = TRUE;
}
@@ -147,7 +146,6 @@ function panels_choose_layout($form, &$form_state) {
$js['CTools']['dependent'] = $dependencies;
drupal_add_js($js, 'setting');
-
if (empty($form_state['no buttons'])) {
$form['submit'] = array(
'#type' => 'submit',
@@ -293,7 +291,7 @@ function panels_change_layout_submit($form, &$form_state) {
foreach ($form_state['values']['panel']['pane'] as $region_id => $panes) {
if ($panes) {
$pids = explode(',', $panes);
- // need to filter the array, b/c passing it in a hidden field can generate trash
+ // Need to filter the array, b/c passing it in a hidden field can generate trash.
foreach (array_filter($pids) as $pid) {
$switch[$pid] = $region_id;
}
diff --git a/includes/legacy.inc b/includes/legacy.inc
index c65f781..224d05f 100644
--- a/includes/legacy.inc
+++ b/includes/legacy.inc
@@ -1,22 +1,32 @@
<?php
/**
+ * @file
+ * Legacy state manager for Panels.
+ */
+
+/**
* Legacy state manager for Panels.
*
* Checks all possible ways (using discovery of patterned method names) in which
* Panels may need to operate in legacy mode,
- * sets variables as appropriate, and returns an informational
- *
+ * sets variables as appropriate, and returns an informational.
*/
class PanelsLegacyState {
var $legacy = NULL;
+ /**
+ * Translation wrapper.
+ */
function t() {
$func = get_t();
$args = func_get_args();
return call_user_func_array($func, $args);
}
+ /**
+ * Get Status.
+ */
function getStatus() {
if (!isset($this->legacy)) {
$this->determineStatus();
@@ -29,7 +39,7 @@ class PanelsLegacyState {
*/
function determineStatus() {
$this->legacy = array();
- foreach(get_class_methods($this) as $method) {
+ foreach (get_class_methods($this) as $method) {
if (strtolower(substr($method, 0, 5)) == 'check') {
$this->legacy[$method] = $this->$method();
}
@@ -37,5 +47,4 @@ class PanelsLegacyState {
$this->legacy = array_filter($this->legacy);
}
- // At this time there are no legacy checks.
}
diff --git a/includes/page-wizard.inc b/includes/page-wizard.inc
index 732c13a..516f78f 100644
--- a/includes/page-wizard.inc
+++ b/includes/page-wizard.inc
@@ -35,7 +35,7 @@ function panels_page_wizard_add_layout(&$form, &$form_state) {
'#value' => '</fieldset>',
);
-// $form_state['cache'] = FALSE;
+ // $form_state['cache'] = FALSE;.
}
/**
@@ -52,7 +52,6 @@ function panels_page_wizard_add_content(&$form, &$form_state) {
// Panels provides this caching mechanism to make it easy to use the
// wizard to cache the display.
-
$cache = panels_edit_cache_get('panels_page_wizard:' . $form_state['plugin']['name']);
$form_state['renderer'] = panels_get_renderer_handler('editor', $cache->display);
@@ -68,14 +67,14 @@ function panels_page_wizard_add_content(&$form, &$form_state) {
}
/**
- * Add content form submit handler
+ * Add content form submit handler.
*
* This is not a proper submit handler, it is meant to be called by a form's
* submit handler to handle submission.
*/
function panels_page_wizard_add_content_submit(&$form, &$form_state) {
// Call the normal panels edit form submit to make sure values are stored
- // on the display
+ // on the display.
panels_edit_display_form_submit($form, $form_state);
$cache = &$form_state['wizard cache'];
@@ -83,4 +82,3 @@ function panels_page_wizard_add_content_submit(&$form, &$form_state) {
$cache->display = &$form_state['display'];
unset($cache->display_cache);
}
-
diff --git a/includes/panels.pipelines.inc b/includes/panels.pipelines.inc
index 3d95ac0..5a3f1cb 100644
--- a/includes/panels.pipelines.inc
+++ b/includes/panels.pipelines.inc
@@ -11,7 +11,7 @@
function panels_default_panels_renderer_pipeline() {
$pipelines = array();
- $pipeline = new stdClass;
+ $pipeline = new stdClass();
$pipeline->disabled = FALSE; /* Edit this to true to make a default pipeline disabled initially */
$pipeline->api_version = 1;
$pipeline->name = 'standard';
diff --git a/includes/plugins.inc b/includes/plugins.inc
index be5cd25..0508883 100644
--- a/includes/plugins.inc
+++ b/includes/plugins.inc
@@ -2,7 +2,6 @@
/**
* @file
- *
* Contains helper code for plugins and contexts.
*/
@@ -41,7 +40,7 @@ function panels_get_regions($layout, $display) {
* The cached content, or FALSE to indicate no cached content exists.
*/
function panels_get_cached_content($display, $args, $context, $pane = NULL) {
- // Never use cache on a POST
+ // Never use cache on a POST.
if (!empty($_POST)) {
return FALSE;
}
@@ -59,7 +58,7 @@ function panels_get_cached_content($display, $args, $context, $pane = NULL) {
return FALSE;
}
- // restore it.
+ // Restore it.
$cache->restore();
return $cache;
}
@@ -68,7 +67,7 @@ function panels_get_cached_content($display, $args, $context, $pane = NULL) {
* Store cached content for a given display and possibly pane.
*/
function panels_set_cached_content($cache, $display, $args, $context, $pane = NULL) {
- // Never use cache on a POST
+ // Never use cache on a POST.
if (!empty($_POST)) {
return FALSE;
}
@@ -82,7 +81,7 @@ function panels_set_cached_content($cache, $display, $args, $context, $pane = NU
$conf = $pane ? $pane->cache['settings'] : $display->cache['settings'];
- // snapshot it.
+ // Snapshot it.
$cache->cache();
return $function($conf, $cache, $display, $args, $context, $pane);
}
@@ -154,7 +153,7 @@ class panels_cache_object {
$this->ready = TRUE;
- // Simple replacement for head
+ // Simple replacement for head.
$this->head = str_replace($this->head, '', drupal_add_html_head());
// Slightly less simple for CSS:
@@ -248,6 +247,7 @@ class panels_cache_object {
}
}
}
+
}
/**
@@ -412,7 +412,7 @@ function panels_get_renderer_handler($plugin, &$display) {
* Choose a renderer for a display based on a render pipeline setting.
*/
function panels_get_renderer($pipeline_name, &$display) {
- // Load the pipeline
+ // Load the pipeline.
ctools_include('export');
$pipeline = ctools_export_crud_load('panels_renderer_pipeline', $pipeline_name);
@@ -443,7 +443,7 @@ function panels_get_renderer($pipeline_name, &$display) {
return $renderer;
}
- // Fall through. If no renderer is selected, use the standard renderer
+ // Fall through. If no renderer is selected, use the standard renderer.
return panels_get_renderer_handler('standard', $display);
}
@@ -454,9 +454,9 @@ function panels_get_renderer($pipeline_name, &$display) {
*/
function _panels_renderer_pipeline_sort($a, $b) {
if ($a->weight == $b->weight) {
- if ($a->admin_title == $b->admin_title) {
- return 0;
- }
+ if ($a->admin_title == $b->admin_title) {
+ return 0;
+ }
return ($a->admin_title < $b->admin_title) ? -1 : 1;
}
return ($a->weight < $b->weight) ? -1 : 1;
diff --git a/panels.api.php b/panels.api.php
index 1aa1c6a..3d148ba 100644
--- a/panels.api.php
+++ b/panels.api.php
@@ -11,7 +11,7 @@
* @param string $argument
* The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
* passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
* The display to cache.
*/
function hook_panels_cache_set($argument, $cache) {
@@ -56,7 +56,7 @@ function hook_panels_cache_get($argument) {
* @param string $argument
* The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
* passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
* The display to cache.
*
* @return stdClass
@@ -78,7 +78,7 @@ function hook_panels_cache_save($argument, $cache) {
* @param string $argument
* The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
* passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
* The cached display.
*/
function hook_panels_cache_clear($argument, $cache) {
@@ -105,9 +105,9 @@ function hook_panels_dashboard_blocks(&$vars) {
*
* This happens after the keyword substitution.
*
- * @param stdClass $content
+ * @param object $content
* The content block to render.
- * @param stdClass $pane
+ * @param object $pane
* The pane object.
* @param array $args
* The display arguments.
@@ -125,7 +125,7 @@ function hook_panels_pane_content_alter($content, $pane, $args, $contexts) {
* @param string $argument
* The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
* passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
* The cached display.
*/
function hook_panels_edit_cache_break_lock($argument, $cache) {
@@ -140,7 +140,7 @@ function hook_panels_edit_cache_break_lock($argument, $cache) {
*
* @param panels_display $panels_display
* The panels display that will be rendered.
- * @param stdClass $renderer
+ * @param object $renderer
* The renderer object that will be used to render.
*
* @return string
@@ -158,7 +158,7 @@ function hook_panels_pre_render($panels_display, $renderer) {
*
* @param panels_display $panels_display
* The rendered panels display.
- * @param stdClass $renderer
+ * @param object $renderer
* The used renderer object.
*
* @return string
@@ -171,7 +171,7 @@ function hook_panels_post_render($panels_display, $renderer) {
/**
* Fired before a new pane is inserted in the storage.
*
- * @param stdClass $pane
+ * @param object $pane
* Pane that will be rendered.
*/
function hook_panels_pane_insert($pane) {
@@ -188,7 +188,7 @@ function hook_panels_pane_insert($pane) {
/**
* Fired before a changed pane is updated in the storage.
*
- * @param stdClass $pane
+ * @param object $pane
* Pane that will be rendered.
*/
function hook_panels_pane_update($pane) {
@@ -208,7 +208,7 @@ function hook_panels_pane_update($pane) {
* Last chance to modify the pane before the keyword substitution runs and the
* pane is rendered.
*
- * @param stdClass $pane
+ * @param object $pane
* Pane that will be rendered.
*/
function hook_panels_pane_prerender($pane) {
@@ -250,7 +250,7 @@ function hook_panels_display_save($display) {
/**
* Fired before a display is deleted.
*
- * @param integer $did
+ * @param int $did
* Id of the display to delete.
*/
function hook_panels_delete_display($did) {
diff --git a/panels.install b/panels.install
index 0466a52..16b65af 100644
--- a/panels.install
+++ b/panels.install
@@ -1,6 +1,10 @@
<?php
/**
+ * @file
+ */
+
+/**
* Test requirements for installation and running.
*/
function panels_requirements($phase) {
@@ -81,7 +85,7 @@ function panels_schema_9() {
);
return $schema;
- }
+}
function panels_schema_8() {
$schema = panels_schema_7();
@@ -308,7 +312,7 @@ function panels_schema_3() {
),
'primary key' => array('pid'),
'indexes' => array(
- 'did_idx' => array('did')
+ 'did_idx' => array('did'),
),
);
@@ -445,9 +449,7 @@ function panels_update_7300() {
*/
function panels_update_7301() {
// Load the schema.
-
// Due to a previous failure, the field may already exist:
-
$schema = panels_schema_4();
$table = 'panels_pane';
$field = 'locks';
@@ -627,7 +629,7 @@ function panels_update_7306() {
}
if (!empty($page_manager_panels)) {
- // Check panels displays that only have empty storage types
+ // Check panels displays that only have empty storage types.
$result = db_query("SELECT pd.did FROM {panels_display} pd WHERE pd.did IN (:dids) AND storage_type = ''", array(':dids' => array_keys($page_manager_panels)));
foreach ($result as $row) {
db_update('panels_display')
diff --git a/panels.module b/panels.module
index 83658c4..6374d17 100644
--- a/panels.module
+++ b/panels.module
@@ -1,8 +1,7 @@
<?php
/**
- * @file panels.module
- *
+ * @file
* Core functionality for the Panels engine.
*/
@@ -23,26 +22,27 @@ define('PANELS_REQUIRED_CTOOLS_API', '2.0.9');
define('PANELS_VERSION', '7.x-3.8');
-define('PANELS_TITLE_FIXED', 0); // Hide title use to be true/false. So false remains old behavior.
-define('PANELS_TITLE_NONE', 1); // And true meant no title.
-define('PANELS_TITLE_PANE', 2); // And this is the new behavior, where the title field will pick from a pane.
+// Hide title use to be TRUE/FALSE. So FALSE remains old behavior.
+define('PANELS_TITLE_FIXED', 0);
+// And TRUE meant no title.
+define('PANELS_TITLE_NONE', 1);
+// And this is the new behavior, where the title field will pick from a pane.
+define('PANELS_TITLE_PANE', 2);
/**
* Returns the API version of Panels. This didn't exist in 1.
*
* @todo -- this should work more like the CTools API version.
*
- * @return An array with the major and minor versions
+ * @return array
+ * An array with the major and minor versions
*/
function panels_api_version() {
return array(3, 1);
}
-// --------------------------------------------------------------------------
-// Core Drupal hook implementations
-
/**
- * Implementation of hook_theme()
+ * Implements hook_theme().
*/
function panels_theme() {
// Safety: go away if CTools is not at an appropriate version.
@@ -52,13 +52,27 @@ function panels_theme() {
$theme = array();
$theme['panels_layout_link'] = array(
- 'variables' => array('title' => NULL, 'id' => NULL, 'image' => NULL, 'link' => NULL, 'class' => NULL),
+ 'variables' => array(
+ 'title' => NULL,
+ 'id' => NULL,
+ 'image' => NULL,
+ 'link' => NULL,
+ 'class' => NULL,
+ ),
);
$theme['panels_layout_icon'] = array(
- 'variables' => array('id' => NULL, 'image' => NULL, 'title' => NULL),
+ 'variables' => array(
+ 'id' => NULL,
+ 'image' => NULL,
+ 'title' => NULL,
+ ),
);
$theme['panels_pane'] = array(
- 'variables' => array('content' => array(), 'pane' => array(), 'display' => array()),
+ 'variables' => array(
+ 'content' => array(),
+ 'pane' => array(),
+ 'display' => array(),
+ ),
'path' => drupal_get_path('module', 'panels') . '/templates',
'template' => 'panels-pane',
);
@@ -92,25 +106,29 @@ function panels_theme() {
);
$theme['panels_add_content_modal'] = array(
- 'variables' => array('renderer' => NULL, 'categories' => array(), 'region' => NULL, 'category' => NULL, 'column_count' => 2),
+ 'variables' => array(
+ 'renderer' => NULL,
+ 'categories' => array(),
+ 'region' => NULL,
+ 'category' => NULL,
+ 'column_count' => 2,
+ ),
'path' => drupal_get_path('module', 'panels') . '/templates',
'file' => '../includes/add-content.inc',
'template' => 'panels-add-content-modal',
);
$theme['panels_add_content_link'] = array(
- 'variables' => array('renderer' => NULL, 'region' => NULL, 'content_type' => NULL),
+ 'variables' => array(
+ 'renderer' => NULL,
+ 'region' => NULL,
+ 'content_type' => NULL,
+ ),
'path' => drupal_get_path('module', 'panels') . '/templates',
'file' => '../includes/add-content.inc',
'template' => 'panels-add-content-link',
);
- // We don't need layout and style themes in maintenance mode.
- // Disabling this: See http://drupal.org/node/979912 for information.
-// if (defined('MAINTENANCE_MODE')) {
-// return $theme;
-// }
-
// Register layout and style themes on behalf of all of these items.
ctools_include('plugins', 'panels');
@@ -121,15 +139,23 @@ function panels_theme() {
foreach (array('theme', 'admin theme') as $callback) {
if (!empty($data[$callback])) {
$theme[$data[$callback]] = array(
- 'variables' => array('css_id' => NULL, 'content' => NULL, 'settings' => NULL, 'display' => NULL, 'layout' => NULL, 'renderer' => NULL),
+ 'variables' => array(
+ 'css_id' => NULL,
+ 'content' => NULL,
+ 'settings' => NULL,
+ 'display' => NULL,
+ 'layout' => NULL,
+ 'renderer' => NULL,
+ ),
'path' => $data['path'],
'file' => $data['file'],
);
- // if no theme function exists, assume template.
+ // If no theme function exists, assume template.
if (!function_exists("theme_$data[theme]")) {
$theme[$data[$callback]]['template'] = str_replace('_', '-', $data[$callback]);
- $theme[$data[$callback]]['file'] = $data['file']; // for preprocess.
+ // For preprocess.
+ $theme[$data[$callback]]['file'] = $data['file'];
}
}
}
@@ -139,14 +165,27 @@ function panels_theme() {
foreach ($styles as $name => $data) {
if (!empty($data['render pane'])) {
$theme[$data['render pane']] = array(
- 'variables' => array('content' => NULL, 'pane' => NULL, 'display' => NULL, 'style' => NULL, 'settings' => NULL),
+ 'variables' => array(
+ 'content' => NULL,
+ 'pane' => NULL,
+ 'display' => NULL,
+ 'style' => NULL,
+ 'settings' => NULL,
+ ),
'path' => $data['path'],
'file' => $data['file'],
);
}
if (!empty($data['render region'])) {
$theme[$data['render region']] = array(
- 'variables' => array('display' => NULL, 'owner_id' => NULL, 'panes' => NULL, 'settings' => NULL, 'region_id' => NULL, 'style' => NULL),
+ 'variables' => array(
+ 'display' => NULL,
+ 'owner_id' => NULL,
+ 'panes' => NULL,
+ 'settings' => NULL,
+ 'region_id' => NULL,
+ 'style' => NULL,
+ ),
'path' => $data['path'],
'file' => $data['file'],
);
@@ -156,17 +195,16 @@ function panels_theme() {
if (is_array($data['hook theme'])) {
$theme += $data['hook theme'];
}
- else if (function_exists($data['hook theme'])) {
+ elseif (function_exists($data['hook theme'])) {
$data['hook theme']($theme, $data);
}
}
}
-
return $theme;
}
/**
- * Implementation of hook_menu
+ * Implements hook_menu().
*/
function panels_menu() {
// Safety: go away if CTools is not at an appropriate version.
@@ -234,13 +272,11 @@ function panels_menu() {
if (is_array($data['hook menu'])) {
$items += $data['hook menu'];
}
- else if (function_exists($data['hook menu'])) {
+ elseif (function_exists($data['hook menu'])) {
$data['hook menu']($items, $data);
}
}
}
-
-
return $items;
}
@@ -261,7 +297,7 @@ function panels_edit_cache_load($cache_key) {
}
/**
- * Implementation of hook_init()
+ * Implements hook_init().
*/
function panels_init() {
// Safety: go away if CTools is not at an appropriate version.
@@ -276,7 +312,7 @@ function panels_init() {
}
/**
- * Implementation of hook_permission().
+ * Implements hook_permission().
*
* @todo Almost all of these need to be moved into pipelines.
*/
@@ -286,11 +322,13 @@ function panels_permission() {
'title' => t("Use Panels Dashboard"),
'description' => t('Allows a user to access the <a href="@url">Panels Dashboard</a>.', array('@url' => url('admin/structure/panels'))),
),
- 'view pane admin links' => array( // @todo
+ // @todo
+ 'view pane admin links' => array(
'title' => t("View administrative links on Panel panes"),
- 'description' => t(""),
+ 'description' => "",
),
- 'administer pane access' => array( // @todo should we really have a global perm for this, or should it be moved into a pipeline question?
+ // @todo should we really have a global perm for this, or should it be moved into a pipeline question?
+ 'administer pane access' => array(
'title' => t("Configure access settings on Panel panes"),
'description' => t("Access rules (often also called visibility rules) can be configured on a per-pane basis. This permission allows users to configure those settings."),
),
@@ -309,7 +347,7 @@ function panels_permission() {
),
'administer advanced pane settings' => array(
'title' => t("Configure advanced settings on Panel panes"),
- 'description' => t(""),
+ 'description' => "",
),
'administer panels layouts' => array(
'title' => t("Administer Panels layouts"),
@@ -355,16 +393,17 @@ function panels_flush_caches() {
}
}
-// ---------------------------------------------------------------------------
-// CTools hook implementations
-//
-// These aren't core Drupal hooks but they are just as important.
+/**
+ * CTools hook implementations.
+ *
+ * These aren't core Drupal hooks but they are just as important.
+ */
/**
- * Implementation of hook_ctools_plugin_directory() to let the system know
- * we implement task and task_handler plugins.
+ * Implements hook_ctools_plugin_directory().
*/
function panels_ctools_plugin_directory($module, $plugin) {
+ // To let the system know we implement task and task_handler plugins.
// Safety: go away if CTools is not at an appropriate version.
if (!module_invoke('ctools', 'api_version', PANELS_REQUIRED_CTOOLS_API)) {
return;
@@ -373,8 +412,8 @@ function panels_ctools_plugin_directory($module, $plugin) {
// We don't support the 'ctools' 'cache' plugin and pretending to causes
// errors when they're in use.
if ($module == 'ctools' && $plugin == 'cache') {
+ // If we did we'd make a plugin/ctools_cache or something.
return;
- // if we did we'd make a plugin/ctools_cache or something.
}
if ($module == 'page_manager' || $module == 'panels' || $module == 'ctools' || $module == 'stylizer') {
@@ -383,7 +422,6 @@ function panels_ctools_plugin_directory($module, $plugin) {
if ($module == 'ctools' && $plugin == 'cache') {
return;
}
-
return 'plugins/' . $plugin;
}
}
@@ -397,7 +435,8 @@ function panels_ctools_plugin_directory($module, $plugin) {
function panels_ctools_plugin_type() {
return array(
'layouts' => array(
- 'load themes' => TRUE, // Can define layouts in themes
+ // We can define layouts in themes.
+ 'load themes' => TRUE,
'process' => 'panels_layout_process',
'child plugins' => TRUE,
),
@@ -425,18 +464,11 @@ function panels_layout_process(&$plugin) {
}
/**
- * Implementation of hook_ctools_plugin_api().
- *
- * Inform CTools about version information for various plugins implemented by
- * Panels.
- *
- * @param string $owner
- * The system name of the module owning the API about which information is
- * being requested.
- * @param string $api
- * The name of the API about which information is being requested.
+ * Implements hook_ctools_plugin_api().
*/
function panels_ctools_plugin_api($owner, $api) {
+ // Inform CTools about version information for various plugins implemented by
+ // panels.
if ($owner == 'panels' && $api == 'styles') {
// As of 6.x-3.6, Panels has a slightly new system for style plugins.
return array('version' => 2.0);
@@ -451,7 +483,7 @@ function panels_ctools_plugin_api($owner, $api) {
}
/**
- * Implementation of hook_views_api().
+ * Implements hook_views_api().
*/
function panels_views_api() {
return array(
@@ -468,12 +500,12 @@ function panels_views_api() {
* parameters to a style plugin in a hybrid environment of both new and old
* plugins.
*
- * @see _ctools_process_data()
- *
* @param array $plugin
* The style plugin that is being processed.
* @param array $info
* The style plugin type info array.
+ *
+ * @see _ctools_process_data()
*/
function panels_plugin_styles_process(&$plugin, $info) {
$plugin += array(
@@ -492,22 +524,49 @@ function panels_ctools_style_base_types() {
'region' => array(
'title' => t('Panel region'),
'preview' => 'panels_stylizer_region_preview',
- 'theme variables' => array('settings' => NULL, 'class' => NULL, 'content' => NULL),
+ 'theme variables' => array(
+ 'settings' => NULL,
+ 'class' => NULL,
+ 'content' => NULL,
+ ),
),
'pane' => array(
'title' => t('Panel pane'),
'preview' => 'panels_stylizer_pane_preview',
- 'theme variables' => array('settings' => NULL, 'content' => NULL, 'pane' => NULL, 'display' => NULL),
+ 'theme variables' => array(
+ 'settings' => NULL,
+ 'content' => NULL,
+ 'pane' => NULL,
+ 'display' => NULL,
+ ),
),
);
}
+/**
+ * Generates Lorem Ipsum.
+ *
+ * @return string
+ * Lorem ipsum string.
+ */
function panels_stylizer_lipsum() {
- return "
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus at velit dolor. Donec egestas tellus sit amet urna rhoncus adipiscing. Proin nec porttitor sem. Maecenas aliquam, purus nec tempus dignissim, nulla arcu aliquam diam, non tincidunt massa ante vel dolor. Aliquam sapien sapien, tincidunt id tristique at, pretium sagittis libero.</p>
-
- <p>Nulla facilisi. Curabitur lacinia, tellus sed tristique consequat, diam lorem scelerisque felis, at dictum purus augue facilisis lorem. Duis pharetra dignissim rutrum. Curabitur ac elit id dui dapibus tincidunt. Nulla eget sem quam, non eleifend eros. Cras porttitor tempus lectus ac scelerisque. Curabitur vehicula bibendum lorem, vitae ornare ligula venenatis ut.</p>
- ";
+ return <<<LIPSUM
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus at
+ velit dolor. Donec egestas tellus sit amet urna rhoncus adipiscing. Proin
+ nec porttitor sem. Maecenas aliquam, purus nec tempus dignissim, nulla arcu
+ aliquam diam, non tincidunt massa ante vel dolor. Aliquam sapien sapien,
+ tincidunt id tristique at, pretium sagittis libero.
+ </p>
+ <p>
+ Nulla facilisi. Curabitur lacinia, tellus sed tristique consequat, diam
+ lorem scelerisque felis, at dictum purus augue facilisis lorem. Duis
+ pharetra dignissim rutrum. Curabitur ac elit id dui dapibus tincidunt.
+ Nulla eget sem quam, non eleifend eros. Cras porttitor tempus lectus ac
+ scelerisque. Curabitur vehicula bibendum lorem, vitae ornare ligula
+ venenatis ut.
+ </p>
+LIPSUM;
}
/**
@@ -515,7 +574,14 @@ function panels_stylizer_lipsum() {
*/
function panels_stylizer_region_preview($plugin, $settings) {
ctools_stylizer_add_css($plugin, $settings);
- return theme($plugin['theme'], array('settings' => $settings, 'class' => ctools_stylizer_get_css_class($plugin, $settings), 'content' => panels_stylizer_lipsum()));
+ return theme(
+ $plugin['theme'],
+ array(
+ 'settings' => $settings,
+ 'class' => ctools_stylizer_get_css_class($plugin, $settings),
+ 'content' => panels_stylizer_lipsum(),
+ )
+ );
}
/**
@@ -525,7 +591,7 @@ function panels_stylizer_pane_preview($plugin, $settings) {
ctools_stylizer_add_css($plugin, $settings);
$pane = new stdClass();
- $content = new stdClass;
+ $content = new stdClass();
$content->title = t('Lorem ipsum');
$content->content = panels_stylizer_lipsum();
$content->type = 'dummy';
@@ -536,78 +602,103 @@ function panels_stylizer_pane_preview($plugin, $settings) {
$display = new panels_display();
if (!empty($plugin['theme'])) {
- return theme($plugin['theme'], array('settings' => $settings, 'content' => $content, 'pane' => $pane, 'display' => $display));
+ return theme(
+ $plugin['theme'],
+ array(
+ 'settings' => $settings,
+ 'content' => $content,
+ 'pane' => $pane,
+ 'display' => $display,
+ )
+ );
}
else {
- return theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $display));
+ return theme(
+ 'panels_pane',
+ array(
+ 'content' => $content,
+ 'pane' => $pane,
+ 'display' => $display,
+ )
+ );
}
}
-// ---------------------------------------------------------------------------
-// Panels display editing
+/**
+ * Panels display editing.
+ */
/**
- * @defgroup mainapi Functions comprising the main panels API
- * @{
+ * @defgroup mainapi Functions comprising the main panels API.
*/
/**
* Main API entry point to edit a panel display.
*
- * Sample implementations utiltizing the the complex $destination behavior can be found
- * in panels_page_edit_content() and, in a separate contrib module, OG Blueprints
- * (http://drupal.org/project/og_blueprints), og_blueprints_blueprint_edit().
+ * Sample implementations utiltizing the the complex $destination behavior can
+ * be found in panels_page_edit_content() and, in a separate contrib module,
+ * OG Blueprints (http://drupal.org/project/og_blueprints),
+ * og_blueprints_blueprint_edit().
*
- * @ingroup mainapi
+ * @param object $display
+ * Instanceof panels_display.
+ *
+ * A fully loaded panels $display object, as returned from
+ * panels_load_display(). Merely passing a did is NOT sufficient.
+ * Note that 'fully loaded' means the $display must already be loaded with
+ * any contexts the caller wishes to have set for the display.
+ * @param mixed $destination
+ * The redirect destination that the user should be taken to on form
+ * submission or cancellation. With panels_edit, $destination has complex
+ * effects on the return values of panels_edit() once the form has been
+ * submitted. See the explanation of the return value below to understand the
+ * different types of values returned by panels_edit() at different stages of
+ * FAPI. Under most circumstances, simply passing in drupal_get_destination()
+ * is all that's necessary.
+ * @param array $content_types
+ * An associative array of allowed content types, typically as returned from
+ * panels_common_get_allowed_types(). Note that context partially governs
+ * available content types, so you will want to create any relevant contexts
+ * using panels_create_context() or panels_create_context_empty() to make sure
+ * all the appropriate content types are available.
+ *
+ * @return mixed
+ * Because the functions called by panels_edit() invoke the form API,
+ * this function returns different values depending on the stage of form
+ * submission we're at. In Drupal 5, the phase of form submission is indicated
+ * by the contents of $_POST['op']. Here is what you'll get at different
+ * stages:
+ * - If !$_POST['op']: then we're on on the initial passthrough and the
+ * form is being rendered, so it's the $form itself that's being
+ * returned. Because negative margins, a common CSS technique, bork the
+ * display editor's ajax drag-and-drop, it's important that the $output
+ * be printed, not returned. Use this syntax in the caller function:
+ * print theme('page', panels_edit($display, $destination, $content_types), FALSE);
+ * - If $_POST['op'] == t('Cancel'): form submission has been cancelled.
+ * If empty($destination) == FALSE, then there is no return value and the
+ * panels API takes care of redirecting to $destination.
+ * If empty($destination) == TRUE, then there's still no return value,
+ * but the caller function has to take care of form redirection.
+ * - If $_POST['op'] == ('Save'): the form has been submitted successfully
+ * and has run through panels_edit_display_submit().
+ * $output depends on the value of $destination:
+ * - If empty($destination) == TRUE: $output contains the modified $display
+ * object, and no redirection will occur. This option is useful if the
+ * caller needs to perform additional operations on or with the modified
+ * $display before the page request is complete. Using hook_form_alter()
+ * to add an additional submit handler is typically the preferred method
+ * for something like this, but there are certain use cases where that is
+ * infeasible and $destination = NULL should be used instead. If this
+ * method is employed, the caller will need to handle form redirection.
+ * Note that having $_REQUEST['destination'] set, whether via
+ * drupal_get_destination() or some other method, will NOT interfere with
+ * this functionality; consequently, you can use drupal_get_destination()
+ * to safely store your desired redirect in the caller function, then
+ * simply use drupal_goto() once panels_edit() has done its business.
+ * - If empty($destination) == FALSE: the form will redirect to the URL
+ * string given in $destination and NO value will be returned.
*
- * @param object $display instanceof panels_display \n
- * A fully loaded panels $display object, as returned from panels_load_display().
- * Merely passing a did is NOT sufficient. \n
- * Note that 'fully loaded' means the $display must already be loaded with any contexts
- * the caller wishes to have set for the display.
- * @param mixed $destination \n
- * The redirect destination that the user should be taken to on form submission or
- * cancellation. With panels_edit, $destination has complex effects on the return
- * values of panels_edit() once the form has been submitted. See the explanation of
- * the return value below to understand the different types of values returned by panels_edit()
- * at different stages of FAPI. Under most circumstances, simply passing in
- * drupal_get_destination() is all that's necessary.
- * @param array $content_types \n
- * An associative array of allowed content types, typically as returned from
- * panels_common_get_allowed_types(). Note that context partially governs available content types,
- * so you will want to create any relevant contexts using panels_create_context() or
- * panels_create_context_empty() to make sure all the appropriate content types are available.
- *
- * @return
- * Because the functions called by panels_edit() invoke the form API, this function
- * returns different values depending on the stage of form submission we're at. In Drupal 5,
- * the phase of form submission is indicated by the contents of $_POST['op']. Here's what you'll
- * get at different stages:
- * -# If !$_POST['op']: then we're on on the initial passthrough and the form is being
- * rendered, so it's the $form itself that's being returned. Because negative margins,
- * a common CSS technique, bork the display editor's ajax drag-and-drop, it's important
- * that the $output be printed, not returned. Use this syntax in the caller function: \n
- * print theme('page', panels_edit($display, $destination, $content_types), FALSE); \n
- * -# If $_POST['op'] == t('Cancel'): form submission has been cancelled. If empty($destination) == FALSE,
- * then there is no return value and the panels API takes care of redirecting to $destination.
- * If empty($destination) == TRUE, then there's still no return value, but the caller function
- * has to take care of form redirection.
- * -# If $_POST['op'] == ('Save'): the form has been submitted successfully and has run through
- * panels_edit_display_submit(). $output depends on the value of $destination:
- * - If empty($destination) == TRUE: $output contains the modified $display
- * object, and no redirection will occur. This option is useful if the caller
- * needs to perform additional operations on or with the modified $display before
- * the page request is complete. Using hook_form_alter() to add an additional submit
- * handler is typically the preferred method for something like this, but there
- * are certain use cases where that is infeasible and $destination = NULL should
- * be used instead. If this method is employed, the caller will need to handle form
- * redirection. Note that having $_REQUEST['destination'] set, whether via
- * drupal_get_destination() or some other method, will NOT interfere with this
- * functionality; consequently, you can use drupal_get_destination() to safely store
- * your desired redirect in the caller function, then simply use drupal_goto() once
- * panels_edit() has done its business.
- * - If empty($destination) == FALSE: the form will redirect to the URL string
- * given in $destination and NO value will be returned.
+ * @ingroup mainapi
*/
function panels_edit($display, $destination = NULL, $content_types = NULL, $title = FALSE) {
ctools_include('display-edit', 'panels');
@@ -619,40 +710,47 @@ function panels_edit($display, $destination = NULL, $content_types = NULL, $titl
/**
* API entry point for selecting a layout for a given display.
*
- * Layout selection is nothing more than a list of radio items encompassing the available
- * layouts for this display, as defined by .inc files in the panels/layouts subdirectory.
- * The only real complexity occurs when a user attempts to change the layout of a display
- * that has some content in it.
+ * Layout selection is nothing more than a list of radio items encompassing the
+ * available layouts for this display, as defined by .inc files in the
+ * panels/layouts subdirectory. The only real complexity occurs when a user
+ * attempts to change the layout of a display that has some content in it.
*
- * @param object $display instanceof panels_display \n
- * A fully loaded panels $display object, as returned from panels_load_display().
- * Merely passing a did is NOT sufficient.
+ * @param object $display
+ * A fully loaded panels $display object, as returned from
+ * panels_load_display(). Merely passing a did is NOT sufficient.
* @param string $finish
- * A string that will be used for the text of the form submission button. If no value is provided,
- * then the form submission button will default to t('Save').
+ * A string that will be used for the text of the form submission button. If
+ * no value is provided, then the form submission button will default to
+ * t('Save').
* @param mixed $destination
- * Basic usage is a string containing the URL that the form should redirect to upon submission.
- * For a discussion of advanced usages, see panels_edit().
+ * Basic usage is a string containing the URL that the form should redirect to
+ * upon submission. For a discussion of advanced usages, see panels_edit().
* @param mixed $allowed_layouts
- * Allowed layouts has three different behaviors that depend on which of three value types
- * are passed in by the caller:
- * #- if $allowed_layouts instanceof panels_allowed_layouts (includes subclasses): the most
- * complex use of the API. The caller is passing in a loaded panels_allowed_layouts object
- * that the client module previously created and stored somewhere using a custom storage
- * mechanism.
- * #- if is_string($allowed_layouts): the string will be used in a call to variable_get() which
- * will call the $allowed_layouts . '_allowed_layouts' var. If the data was stored properly
- * in the system var, the $allowed_layouts object will be unserialized and recreated.
- * @see panels_common_set_allowed_layouts()
- * #- if is_null($allowed_layouts): the default behavior, which also provides backwards
- * compatibility for implementations of the Panels2 API written before beta4. In this case,
- * a dummy panels_allowed_layouts object is created which does not restrict any layouts.
- * Subsequent behavior is indistinguishable from pre-beta4 behavior.
- *
- * @return
- * Can return nothing, or a modified $display object, or a redirection string; return values for the
- * panels_edit* family of functions are quite complex. See panels_edit() for detailed discussion.
+ * Allowed layouts has three different behaviors that depend on which of three
+ * value types are passed in by the caller:
+ * #- if $allowed_layouts instanceof panels_allowed_layouts
+ * (includes subclasses): the most complex use of the API. The caller is
+ * passing in a loaded panels_allowed_layouts object that the client
+ * module previously created and stored somewhere using a custom storage
+ * mechanism.
+ * #- if is_string($allowed_layouts): the string will be used in a call to
+ * variable_get() which will call the
+ * $allowed_layouts . '_allowed_layouts' var. If the data was stored
+ * properly in the system var, the $allowed_layouts object will be
+ * unserialized and recreated.
+ * #- if is_null($allowed_layouts): the default behavior, which also
+ * provides backwards compatibility for implementations of the Panels2
+ * API written before beta4. In this case, a dummy panels_allowed_layouts
+ * object is created which does not restrict any layouts. Subsequent
+ * behavior is indistinguishable from pre-beta4 behavior.
+ *
+ * @return mixed
+ * Can return nothing, or a modified $display object, or a redirection string;
+ * return values for the panels_edit* family of functions are quite complex.
+ * See panels_edit() for detailed discussion.
+ *
* @see panels_edit()
+ * @see panels_common_set_allowed_layouts()
*/
function panels_edit_layout($display, $finish, $destination = NULL, $allowed_layouts = NULL) {
ctools_include('display-layout', 'panels');
@@ -660,23 +758,27 @@ function panels_edit_layout($display, $finish, $destination = NULL, $allowed_lay
return _panels_edit_layout($display, $finish, $destination, $allowed_layouts);
}
-// ---------------------------------------------------------------------------
-// Panels database functions
+/**
+ * Panels database functions.
+ */
/**
- * Forms the basis of a panel display
+ * Forms the basis of a panel display.
*/
class panels_display {
- var $args = array();
- var $content = array();
- var $panels = array();
- var $incoming_content = NULL;
- var $css_id = NULL;
- var $context = array();
- var $did = 'new';
- var $renderer = 'standard';
-
- function add_pane(&$pane, $location = NULL) {
+ public $args = array();
+ public $content = array();
+ public $panels = array();
+ public $incoming_content = NULL;
+ public $css_id = NULL;
+ public $context = array();
+ public $did = 'new';
+ public $renderer = 'standard';
+
+ /**
+ * Add a pane.
+ */
+ public function add_pane(&$pane, $location = NULL) {
// If no location specified, use what's set in the pane.
if (empty($location)) {
$location = $pane->panel;
@@ -690,33 +792,30 @@ class panels_display {
$pane->uuid = ctools_uuid_generate();
$pane->pid = 'new-' . $pane->uuid;
- // Add the pane to the approprate spots.
+ // Add the pane to the appropriate spots.
$this->content[$pane->pid] = &$pane;
$this->panels[$location][] = $pane->pid;
}
- function duplicate_pane($pid, $location = FALSE) {
+ /**
+ * Duplicate a pane.
+ */
+ public function duplicate_pane($pid, $location = FALSE) {
$pane = $this->clone_pane($pid);
$this->add_pane($pane, $location);
}
- function clone_pane($pid) {
- $pane = clone $this->content[$pid];
- $pane->uuid = ctools_uuid_generate();
- return $pane;
- }
-
/**
* Get the title from a display.
*
* The display must have already been rendered, or the setting to set the
* display's title from a pane's title will not have worked.
*
- * @return
- * The title to use. If NULL, this means to let any default title that may be in use
- * pass through. i.e, do not actually set the title.
+ * @return mixed
+ * The title to use. If NULL, this means to let any default title that may
+ * be in use pass through. i.e, do not actually set the title.
*/
- function get_title() {
+ public function get_title() {
switch ($this->hide_title) {
case PANELS_TITLE_NONE:
return '';
@@ -725,7 +824,8 @@ class panels_display {
return isset($this->stored_pane_title) ? $this->stored_pane_title : '';
case PANELS_TITLE_FIXED:
- case FALSE; // For old exported panels that are not in the database.
+ case FALSE;
+ // For old exported panels that are not in the database.
if (!empty($this->title)) {
return filter_xss_admin(ctools_context_keyword_substitute($this->title, array(), $this->context));
}
@@ -743,8 +843,11 @@ class panels_display {
* An instantiated display renderer object, or the name of a display
* renderer plugin+class to be fetched. Defaults to NULL. When NULL, the
* predesignated display renderer will be used.
+ *
+ * @return mixed
+ * NULL or output of render function.
*/
- function render($renderer = NULL) {
+ public function render($renderer = NULL) {
$layout = panels_get_layout($this->layout);
if (!$layout) {
return NULL;
@@ -788,7 +891,7 @@ class panels_display {
* @return bool
* TRUE if access is granted; otherwise FALSE.
*/
- function access($op, $account = NULL) {
+ public function access($op, $account = NULL) {
global $user;
if (!$account) {
@@ -825,10 +928,11 @@ class panels_display {
return $access_callback($this->storage_type, $this->storage_id, $op, $account);
}
+
}
/**
- * }@ End of 'defgroup mainapi', although other functions are specifically added later
+ * End of 'defgroup mainapi', although other functions are specifically added later.
*/
/**
@@ -869,10 +973,10 @@ function panels_new_pane($type, $subtype, $set_defaults = FALSE) {
* Helper function primarily for for panels_load_display().
*
* @param array $dids
- * An indexed array of dids to be loaded from the database.
+ * An indexed array of dids to be loaded from the database.
*
- * @return $displays
- * An array of displays, keyed by their display dids.
+ * @return array
+ * An array of displays, keyed by their display dids.
*
* @todo schema API can drasticly simplify this code.
*/
@@ -882,7 +986,10 @@ function panels_load_displays($dids) {
return $displays;
}
- $result = db_query("SELECT * FROM {panels_display} WHERE did IN (:dids)", array(':dids' => $dids));
+ $result = db_query(
+ "SELECT * FROM {panels_display} WHERE did IN (:dids)",
+ array(':dids' => $dids)
+ );
ctools_include('export');
foreach ($result as $obj) {
@@ -890,28 +997,28 @@ function panels_load_displays($dids) {
// Modify the hide_title field to go from a bool to an int if necessary.
}
- $result = db_query("SELECT * FROM {panels_pane} WHERE did IN (:dids) ORDER BY did, panel, position", array(':dids' => $dids));
+ $result = db_query(
+ "SELECT * FROM {panels_pane} WHERE did IN (:dids) ORDER BY did, panel, position",
+ array(':dids' => $dids)
+ );
foreach ($result as $obj) {
$pane = ctools_export_unpack_object('panels_pane', $obj);
$displays[$pane->did]->panels[$pane->panel][] = $pane->pid;
$displays[$pane->did]->content[$pane->pid] = $pane;
}
-
return $displays;
}
/**
* Load a single display.
*
- * @ingroup mainapi
- *
* @param int $did
- * The display id (did) of the display to be loaded.
+ * The display id (did) of the display to be loaded.
*
- * @return object $display instanceof panels_display \n
- * Returns a partially-loaded panels_display object. $display objects returned from
- * from this function have only the following data:
+ * @return object $display
+ * Returns a partially-loaded panels_display object. $display objects returned
+ * from this function have only the following data:
* - $display->did (the display id)
* - $display->name (the 'name' of the display, where applicable - it often isn't)
* - $display->layout (a string with the system name of the display's layout)
@@ -923,9 +1030,10 @@ function panels_load_displays($dids) {
* - $display->cache (any relevant data from panels_simple_cache)
* - $display->args
* - $display->incoming_content
+ * While all of these members are defined, $display->context is NEVER defined in the returned $display;
+ * it must be set using one of the ctools_context_create() functions.
*
- * While all of these members are defined, $display->context is NEVER defined in the returned $display;
- * it must be set using one of the ctools_context_create() functions.
+ * @ingroup mainapi
*/
function panels_load_display($did) {
$displays = panels_load_displays(array($did));
@@ -937,8 +1045,6 @@ function panels_load_display($did) {
/**
* Save a display object.
*
- * @ingroup mainapi
- *
* Note that a new $display only receives a real did once it is run through
* this function, and likewise for the pid of any new pane.
*
@@ -947,11 +1053,14 @@ function panels_load_display($did) {
* universally-unique identifier (which is stored permanently in the 'uuid'
* field). This format is also used in place of the real pid for exports.
*
- * @param object $display instanceof panels_display \n
- * The display object to be saved. Passed by reference so the caller need not use
- * the return value for any reason except convenience.
+ * @param object $display
+ * The display object to be saved. Passed by reference so the caller need not
+ * use the return value for any reason except convenience.
+ *
+ * @return object $display
+ * This display panel display object to return.
*
- * @return object $display instanceof panels_display \n
+ * @ingroup mainapi
*/
function panels_save_display(&$display) {
$update = (isset($display->did) && is_numeric($display->did)) ? array('did') : array();
@@ -962,15 +1071,19 @@ function panels_save_display(&$display) {
$pids = array();
if ($update) {
- // Get a list of all panes currently in the database for this display so we can know if there
- // are panes that need to be deleted. (i.e, aren't currently in our list of panes).
- $result = db_query("SELECT pid FROM {panels_pane} WHERE did = :did", array(':did' => $display->did));
+ // Get a list of all panes currently in the database for this display so we
+ // can know if there are panes that need to be deleted. (i.e, aren't
+ // currently in our list of panes).
+ $result = db_query(
+ "SELECT pid FROM {panels_pane} WHERE did = :did",
+ array(':did' => $display->did)
+ );
foreach ($result as $pane) {
$pids[$pane->pid] = $pane->pid;
}
}
- // update all the panes
+ // Update all the panes.
ctools_include('plugins', 'panels');
ctools_include('content');
@@ -1007,7 +1120,7 @@ function panels_save_display(&$display) {
// Remove the old new-* entry from the displays content.
unset($display->content[$pid]);
- // and put it back so our pids and positions can be used.
+ // Put it back so our pids and positions can be used.
$display->content[$pane->pid] = $pane;
// If the title pane was one of our panes that just got its ID changed,
@@ -1019,7 +1132,7 @@ function panels_save_display(&$display) {
// because it was needed to get the did. Chicken, egg, more chicken.
db_update('panels_display')
->fields(array(
- 'title_pane' => $pane->pid
+ 'title_pane' => $pane->pid,
))
->condition('did', $display->did)
->execute();
@@ -1049,7 +1162,7 @@ function panels_save_display(&$display) {
// Allow other modules to take action when a display is saved.
module_invoke_all('panels_display_save', $display);
- // Log the change to watchdog, using the same style as node.module
+ // Log the change to watchdog, using the same style as node.module.
$watchdog_args = array('%did' => $display->did);
if (!empty($display->title)) {
$watchdog_args['%title'] = $display->title;
@@ -1059,7 +1172,7 @@ function panels_save_display(&$display) {
watchdog('content', 'Panels: saved display with id %did', $watchdog_args, WATCHDOG_NOTICE);
}
- // to be nice, even tho we have a reference.
+ // To be nice, even though we have a reference.
return $display;
}
@@ -1089,23 +1202,25 @@ function panels_delete_display($display) {
* Only once panels_save_display() is called on the code version of $display
* will the exported display be written to the database and permanently saved.
*
- * @see panels_page_export() or _panels_page_fetch_display() for sample implementations.
- *
- * @ingroup mainapi
- *
- * @param object $display instanceof panels_display \n
- * This export function does no loading of additional data about the provided
- * display. Consequently, the caller should make sure that all the desired data
- * has been loaded into the $display before calling this function.
+ * @param object $display
+ * This export function does no loading of additional data about the provided
+ * display. Consequently, the caller should make sure that all the desired
+ * data has been loaded into the $display before calling this function.
* @param string $prefix
- * A string prefix that is prepended to each line of exported code. This is primarily
- * used for prepending a double space when exporting so that the code indents and lines up nicely.
+ * A string prefix that is prepended to each line of exported code. This is
+ * primarily used for prepending a double space when exporting so that the
+ * code indents and lines up nicely.
*
* @return string $output
- * The passed-in $display expressed as code, ready to be imported. Import by running
- * eval($output) in the caller function; doing so will create a new $display variable
- * with all the exported values. Note that if you have already defined a $display variable in
- * the same scope as where you eval(), your existing $display variable WILL be overwritten.
+ * The passed-in $display expressed as code, ready to be imported. Import by
+ * running eval($output) in the caller function; doing so will create a new
+ * $display variable with all the exported values. Note that if you have
+ * already defined a $display variable in the same scope as where you eval(),
+ * your existing $display variable WILL be overwritten.
+ *
+ * @see panels_page_export() or _panels_page_fetch_display() for samples.
+ *
+ * @ingroup mainapi
*/
function panels_export_display($display, $prefix = '') {
ctools_include('export');
@@ -1139,7 +1254,7 @@ function panels_export_display($display, $prefix = '') {
if (!isset($region_counters[$pane->panel])) {
$region_counters[$pane->panel] = 0;
}
- $output .= $prefix . '$display->panels[\'' . $pane->panel . '\'][' . $region_counters[$pane->panel]++ .'] = \'' . $pane->pid . "';\n";
+ $output .= $prefix . '$display->panels[\'' . $pane->panel . '\'][' . $region_counters[$pane->panel]++ . '] = \'' . $pane->pid . "';\n";
}
}
$output .= $prefix . '$display->hide_title = ';
@@ -1147,9 +1262,11 @@ function panels_export_display($display, $prefix = '') {
case PANELS_TITLE_FIXED:
$output .= 'PANELS_TITLE_FIXED';
break;
+
case PANELS_TITLE_NONE:
$output .= 'PANELS_TITLE_NONE';
break;
+
case PANELS_TITLE_PANE:
$output .= 'PANELS_TITLE_PANE';
break;
@@ -1161,11 +1278,14 @@ function panels_export_display($display, $prefix = '') {
}
/**
+ * Panels Render Display.
+ *
* Render a display by loading the content into an appropriate
* array and then passing through to panels_render_layout.
*
* if $incoming_content is NULL, default content will be applied. Use
* an empty string to indicate no content.
+ *
* @ingroup hook_invocations
*/
function panels_render_display(&$display, $renderer = NULL) {
@@ -1197,16 +1317,32 @@ function theme_panels_render_display_form($vars) {
return $vars['element']['#display']->render();
}
-// @layout
+/**
+ * Panels layout icon function.
+ */
function panels_print_layout_icon($id, $layout, $title = NULL) {
ctools_add_css('panels_admin', 'panels');
$file = $layout['path'] . '/' . $layout['icon'];
- return theme('panels_layout_icon', array('id' => $id, 'image' => theme('image', array('path' => $file, 'alt' => strip_tags($layout['title']), 'title' => strip_tags($layout['description']))), 'title' => $title));
+ return theme(
+ 'panels_layout_icon',
+ array(
+ 'id' => $id,
+ 'image' => theme(
+ 'image',
+ array(
+ 'path' => $file,
+ 'alt' => strip_tags($layout['title']),
+ 'title' => strip_tags($layout['description']),
+ )
+ ),
+ 'title' => $title,
+ )
+ );
}
/**
- * Theme the layout icon image
- * @layout
+ * Theme the layout icon image.
+ *
* @todo move to theme.inc
*/
function theme_panels_layout_icon($vars) {
@@ -1224,18 +1360,15 @@ function theme_panels_layout_icon($vars) {
}
/**
- * Theme the layout link image
+ * Theme the layout link image.
+ *
* @layout
*
* @todo Why isn't this a template at this point?
* @todo Why does this take 4 arguments but only makes use of two?
*/
function theme_panels_layout_link($vars) {
- $title = $vars['title'];
- $image = $vars['image'];
- $class = $vars['class'];
-
- $output = '<div class="' . implode(' ', $class) . '">';
+ $output = '<div class="' . implode(' ', $vars['class']) . '">';
$output .= $vars['image'];
$output .= '<div>' . $vars['title'] . '</div>';
$output .= '</div>';
@@ -1244,6 +1377,7 @@ function theme_panels_layout_link($vars) {
/**
* Print the layout link. Sends out to a theme function.
+ *
* @layout
*/
function panels_print_layout_link($id, $layout, $link, $options = array(), $current_layout = FALSE) {
@@ -1251,7 +1385,7 @@ function panels_print_layout_link($id, $layout, $link, $options = array(), $curr
unset($options['query']['q']);
}
- // Setup classes for layout link, including current-layout information
+ // Setup classes for layout link, including current-layout information.
$class = array('layout-link');
if ($current_layout == $id) {
$options['attributes']['class'][] = 'current-layout-link';
@@ -1260,17 +1394,31 @@ function panels_print_layout_link($id, $layout, $link, $options = array(), $curr
ctools_add_css('panels_admin', 'panels');
$file = $layout['path'] . '/' . $layout['icon'];
- $image = l(theme('image', array('path' => $file)), $link, array('html' => true) + $options);
+ $image = l(
+ theme('image', array('path' => $file)),
+ $link,
+ array('html' => TRUE) + $options
+ );
$title = l($layout['title'], $link, $options);
- return theme('panels_layout_link', array('title' => $title, 'image' => $image, 'class' => $class));
+ return theme(
+ 'panels_layout_link',
+ array(
+ 'title' => $title,
+ 'image' => $image,
+ 'class' => $class,
+ )
+ );
}
/**
+ * Panels Get legacy state.
+ *
* Gateway to the PanelsLegacyState class/object, which does all legacy state
* checks and provides information about the cause of legacy states as needed.
*
* @return PanelsLegacyState $legacy
+ * Returns a legacy panels state.
*/
function panels_get_legacy_state() {
static $legacy = NULL;
@@ -1325,13 +1473,13 @@ function template_preprocess_panels_pane(&$vars) {
);
unset($content->content['#contextual_links']);
- // Add content to $element array
+ // Add content to $element array.
if (is_array($content->content)) {
$element['#element'] = $content->content;
}
$element = contextual_pre_render_links($element);
- if(!empty($element['#links'])) {
+ if (!empty($element['#links'])) {
$links += $element['#links'];
}
}
@@ -1352,14 +1500,14 @@ function template_preprocess_panels_pane(&$vars) {
}
}
- // basic classes
+ // Basic classes.
$vars['classes_array'][] = 'panel-pane';
$vars['id'] = '';
- // Add some usable classes based on type/subtype
+ // Add some usable classes based on type/subtype.
ctools_include('cleanstring');
- $type_class = $content->type ? 'pane-'. ctools_cleanstring($content->type, array('lower case' => TRUE)) : '';
- $subtype_class = $content->subtype ? 'pane-'. ctools_cleanstring($content->subtype, array('lower case' => TRUE)) : '';
+ $type_class = $content->type ? 'pane-' . ctools_cleanstring($content->type, array('lower case' => TRUE)) : '';
+ $subtype_class = $content->subtype ? 'pane-' . ctools_cleanstring($content->subtype, array('lower case' => TRUE)) : '';
// Sometimes type and subtype are the same. Avoid redundant classes.
$vars['classes_array'][] = $type_class;
@@ -1487,22 +1635,21 @@ function panels_ajax_router() {
}
}
-// --------------------------------------------------------------------------
-// Panels caching functions and callbacks
-//
-// When editing displays and the like, Panels has a caching system that relies
-// on a callback to determine where to get the actual cache.
-
-// @todo This system needs to be better documented so that it can be
-// better used.
+/**
+ * Panels caching functions and callbacks.
+ *
+ * When editing displays and the like, Panels has a caching system that relies
+ * on a callback to determine where to get the actual cache.
+ *
+ * @todo This system needs to be better documented so that it can be better used.
+ */
/**
* Get an object from cache.
*/
function panels_cache_get($obj, $did, $skip_cache = FALSE) {
ctools_include('object-cache');
- // we often store contexts in cache, so let's just make sure we can load
- // them.
+ // We often store contexts in cache, so let's just make sure we can load them.
ctools_include('context');
return ctools_object_cache_get($obj, 'panels_display:' . $did, $skip_cache);
}
@@ -1548,6 +1695,8 @@ function panels_edit_cache_get_default(&$display, $content_types = NULL, $title
}
/**
+ * Panels Editor Cache Get.
+ *
* Method to allow modules to provide their own caching mechanism for the
* display editor.
*/
@@ -1557,11 +1706,13 @@ function panels_edit_cache_get($cache_key) {
return module_invoke($module, 'panels_cache_get', $argument);
}
- // Fall back to our normal method:
+ // Fall back to our normal method.
return panels_cache_get('display', $cache_key);
}
/**
+ * Panels Editor Cache Set.
+ *
* Method to allow modules to provide their own caching mechanism for the
* display editor.
*/
@@ -1572,11 +1723,13 @@ function panels_edit_cache_set($cache) {
return module_invoke($module, 'panels_cache_set', $argument, $cache);
}
- // Fall back to our normal method:
+ // Fall back to our normal method.
return panels_cache_set('display', $cache_key, $cache);
}
/**
+ * Panels Editor Cache Save.
+ *
* Method to allow modules to provide their own mechanism to write the
* cache used in the display editor.
*/
@@ -1589,11 +1742,13 @@ function panels_edit_cache_save($cache) {
}
}
- // Fall back to our normal method:
+ // Fall back to our normal method.
return panels_save_display($cache->display);
}
/**
+ * Panels Editor Cache Clear.
+ *
* Method to allow modules to provide their own mechanism to clear the
* cache used in the display editor.
*/
@@ -1606,7 +1761,7 @@ function panels_edit_cache_clear($cache) {
}
}
- // Fall back to our normal method:
+ // Fall back to our normal method.
return panels_cache_clear('display', $cache_key);
}
@@ -1628,16 +1783,16 @@ function panels_edit_cache_break_lock($cache) {
// Normal panel display editing has no locks, so we do nothing if there is
// no fallback.
- return;
}
-// --------------------------------------------------------------------------
-// Callbacks on behalf of the panel_context plugin.
-//
-// The panel_context plugin lets Panels be used in page manager. These
-// callbacks allow the display editing system to use the page manager
-// cache rather than the default display cache. They are routed by the cache
-// key via panels_edit_cache_* functions.
+/**
+ * Callbacks on behalf of the panel_context plugin.
+ *
+ * The panel_context plugin lets Panels be used in page manager. These
+ * callbacks allow the display editing system to use the page manager
+ * cache rather than the default display cache. They are routed by the cache
+ * key via panels_edit_cache_* functions.
+ */
/**
* Get display edit cache on behalf of panel context.
@@ -1649,7 +1804,7 @@ function panel_context_panels_cache_get($key) {
ctools_include('common', 'panels');
ctools_include('context');
ctools_include('context-task-handler');
- // this loads the panel context inc even if we don't use the plugin.
+ // This loads the panel context inc even if we don't use the plugin.
$plugin = page_manager_get_task_handler('panel_context');
list($task_name, $handler_name, $args, $q) = explode('::', $key, 4);
@@ -1667,7 +1822,6 @@ function panel_context_panels_cache_get($key) {
$cache = new stdClass();
$task = page_manager_get_task($page->task_id);
- //ctools_context_handler_get_all_contexts($page->task, $page->subtask, $handler);
$arguments = array();
if ($args) {
$arguments = explode('\\', $args);
@@ -1738,20 +1892,21 @@ function panel_context_panels_cache_break_lock($key, $cache) {
ctools_object_cache_clear_all('page_manager_page', $page->task_name);
}
-// --------------------------------------------------------------------------
-// Callbacks on behalf of the panels page wizards
-//
-// The page wizards are a pluggable set of 'wizards' to make it easy to create
-// specific types of pages based upon whatever someone felt like putting
-// together. Since they will very often have content editing, we provide
-// a generic mechanism to allow them to store their editing cache in the
-// wizard cache.
-//
-// For them to use this mechanism, they just need to use:
-// $cache = panels_edit_cache_get('panels_page_wizard:' . $plugin['name']);
+/**
+ * Callbacks on behalf of the panels page wizards.
+ *
+ * The page wizards are a pluggable set of 'wizards' to make it easy to create
+ * specific types of pages based upon whatever someone felt like putting
+ * together. Since they will very often have content editing, we provide
+ * a generic mechanism to allow them to store their editing cache in the
+ * wizard cache.
+ *
+ * For them to use this mechanism, they just need to use:
+ * $cache = panels_edit_cache_get('panels_page_wizard:' . $plugin['name']);.
+ */
/**
- * Get display edit cache for the panels mini export UI
+ * Get display edit cache for the panels mini export UI.
*
* The key is the second half of the key in this form:
* panels_page_wizard:TASK_NAME:HANDLER_NAME;
@@ -1811,8 +1966,9 @@ function panels_default_page_manager_pages_alter(&$pages) {
}
}
-// --------------------------------------------------------------------------
-// General utility functions
+/**
+ * General utility functions.
+ */
/**
* Perform a drupal_goto on a destination that may be an array like url().
@@ -1822,30 +1978,33 @@ function panels_goto($destination) {
return drupal_goto($destination);
}
else {
- // Prevent notices by adding defaults
+ // Prevent notices by adding defaults.
$destination += array(
'query' => NULL,
'fragment' => NULL,
'http_response_code' => NULL,
);
- return drupal_goto($destination['path'], $destination['query'], $destination['fragment'], $destination['http_response_code']);
+ return drupal_goto(
+ $destination['path'],
+ $destination['query'],
+ $destination['fragment'],
+ $destination['http_response_code']
+ );
}
}
/**
- * For external use: Given a layout ID and a $content array, return the
- * panel display.
+ * For external use: Given a layout ID and $content array, return panel display.
*
* The content array is filled in based upon the content available in the
- * layout. If it's a two column with a content array defined like
+ * layout. If it's a two column with a content array defined like.
* @code
* array(
* 'left' => t('Left side'),
* 'right' => t('Right side')
* ),
- * @endcode
*
* Then the $content array should be
* @code
@@ -1853,7 +2012,6 @@ function panels_goto($destination) {
* 'left' => $output_left,
* 'right' => $output_right,
* )
- * @endcode
*
* The output within each panel region can be either a single rendered
* HTML string or an array of rendered HTML strings as though they were
@@ -1867,7 +2025,7 @@ function panels_print_layout($layout, $content, $meta = 'standard') {
$display->layout = is_array($layout) ? $layout['name'] : $layout;
$display->content = $content;
- // Get our simple renderer
+ // Get our simple renderer.
$renderer = panels_get_renderer_handler('simple', $display);
$renderer->meta_location = $meta;
@@ -1883,29 +2041,28 @@ function _panels_builder_filter($layout) {
/**
* Implements hook_get_pane_links_alter().
- *
- * add links to the Panels pane dropdown menu.
*/
function panels_get_pane_links_alter(&$links, $pane, $content_type) {
- if ($pane->type === "block"){
+ // Add links to the Panels pane dropdown menu.
+ if ($pane->type === "block") {
$prefixed_name = $pane->subtype;
- // breakup the subtype string into parts.
+ // Breakup the subtype string into parts.
$exploded_subtype = explode('-', $pane->subtype);
- // get the first part of the string.
+ // Get the first part of the string.
$subtype_prefix = $exploded_subtype[0];
- // get the first part of the string and add a hyphen.
+ // Get the first part of the string and add a hyphen.
$subtype_prefix_hyphen = $exploded_subtype[0] . '-';
- // remove the prefix block- to get the name.
- $name_of_block = ltrim( $prefixed_name, $subtype_prefix_hyphen);
+ // Remove the prefix block- to get the name.
+ $name_of_block = ltrim($prefixed_name, $subtype_prefix_hyphen);
- // check for user added menus created at /admin/structure/menu/add
- // menus of that type have a subtype that is prefixed with menu-menu-
- if (substr($prefixed_name, 0, 10) === "menu-menu-"){
- // remove the first prefix menu- from menu-menu- to get the name.
+ // Check for user added menus created at /admin/structure/menu/add
+ // menus of that type have a subtype that is prefixed with menu-menu-.
+ if (substr($prefixed_name, 0, 10) === "menu-menu-") {
+ // Remove the first prefix menu- from menu-menu- to get the name.
$name_of_block = substr($prefixed_name, 5);
$links['top'][] = array(
@@ -1921,10 +2078,10 @@ function panels_get_pane_links_alter(&$links, $pane, $content_type) {
);
}
- // check for module provided menu blocks like Devels or Features
- // menus of that type have a subtype that is prefixed with menu-
- elseif(substr($prefixed_name, 0, 5) === "menu-"){
- // remove the first prefix menu- to get the name.
+ // Check for module provided menu blocks like Devels or Features
+ // menus of that type have a subtype that is prefixed with menu-.
+ elseif (substr($prefixed_name, 0, 5) === "menu-") {
+ // Remove the first prefix menu- to get the name.
$name_of_block = substr($prefixed_name, 5);
$links['top'][] = array(
@@ -1940,9 +2097,9 @@ function panels_get_pane_links_alter(&$links, $pane, $content_type) {
);
}
- // check for system blocks with menu links
- elseif(substr($prefixed_name, 0, 7) === "system-") {
- // remove the first prefix system- to get the name
+ // Check for system blocks with menu links.
+ elseif (substr($prefixed_name, 0, 7) === "system-") {
+ // Remove the first prefix system- to get the name.
$name_of_block = substr($prefixed_name, 7);
$names_of_system_menus = menu_list_system_menus();
@@ -1953,7 +2110,7 @@ function panels_get_pane_links_alter(&$links, $pane, $content_type) {
'attributes' => array('target' => array('_blank')),
);
- if (array_key_exists($name_of_block, $names_of_system_menus)){
+ if (array_key_exists($name_of_block, $names_of_system_menus)) {
$links['top'][] = array(
'title' => t('Edit menu links'),
'href' => url('admin/structure/menu/manage/' . $name_of_block, array('absolute' => TRUE)),
@@ -1962,8 +2119,8 @@ function panels_get_pane_links_alter(&$links, $pane, $content_type) {
}
}
- // for all other blocks without menus
- else{
+ // For all other blocks without menus.
+ else {
$links['top'][] = array(
'title' => t('Edit block'),
'href' => url('admin/structure/block/manage/' . $subtype_prefix . '/' . $name_of_block . '/configure', array('absolute' => TRUE)),
@@ -1973,13 +2130,14 @@ function panels_get_pane_links_alter(&$links, $pane, $content_type) {
}
}
-// --------------------------------------------------------------------------
-// Deprecated functions
-//
-// Everything below this line will eventually go away.
+/**
+ * Deprecated functions.
+ *
+ * Everything below this line will eventually go away.
+ */
/**
- * panels path helper function
+ * Panels path helper function.
*/
function panels_get_path($file, $base_path = FALSE, $module = 'panels') {
$output = $base_path ? base_path() : '';
@@ -1987,7 +2145,7 @@ function panels_get_path($file, $base_path = FALSE, $module = 'panels') {
}
/**
- * Remove default sidebar related body classes and provide own css classes
+ * Remove default sidebar related body classes and provide own css classes.
*/
function panels_preprocess_html(&$vars) {
$panel_body_css = &drupal_static('panel_body_css');
diff --git a/panels_ipe/css/panels_ipe-rtl.css b/panels_ipe/css/panels_ipe-rtl.css
index abfc50e..7aea8b1 100644
--- a/panels_ipe/css/panels_ipe-rtl.css
+++ b/panels_ipe/css/panels_ipe-rtl.css
@@ -1,4 +1,3 @@
-
div.panels-ipe-handlebar-wrapper ul {
float: right;
text-align: left;
diff --git a/panels_ipe/css/panels_ipe.css b/panels_ipe/css/panels_ipe.css
index 481c24c..4368547 100644
--- a/panels_ipe/css/panels_ipe.css
+++ b/panels_ipe/css/panels_ipe.css
@@ -21,12 +21,12 @@ html.overlay-open body.panels-ipe {
}
div.panels-ipe-handlebar-wrapper {
- border-bottom: 1px solid #CCC;
+ border-bottom: 1px solid #ccc;
}
.panels-ipe-editing div.panels-ipe-portlet-wrapper {
margin-top: 1em;
- border: 1px solid #CCC;
+ border: 1px solid #ccc;
width: 100%;
}
@@ -40,7 +40,7 @@ div.panels-ipe-handlebar-wrapper {
}
.panels-ipe-editing div.panels-ipe-portlet-wrapper:hover {
- border: 1px dashed #CCC;
+ border: 1px dashed #ccc;
}
.panels-ipe-editing .panels-ipe-sort-container {
@@ -57,12 +57,12 @@ div.panels-ipe-handlebar-wrapper {
.panels-ipe-editing .panels-ipe-sort-container .ui-sortable-placeholder {
border: 2px dashed #999;
- background-color: #FFFF99;
+ background-color: #ffff99;
margin: 1em 0;
-moz-border-radius: 0;
- -khtml-border-radius: 0;
- -webkit-border-radius: 0;
- border-radius: 0;
+ -khtml-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
}
div.panels-ipe-handlebar-wrapper ul {
@@ -83,20 +83,19 @@ div.panels-ipe-handlebar-wrapper li {
div.panels-ipe-draghandle,
div.panels-ipe-nodraghandle {
- background: #E9E9E9;
- background-image: linear-gradient(bottom, #D5D5D5 0%, #FCFCFC 100%);
- background-image: -o-linear-gradient(bottom, #D5D5D5 0%, #FCFCFC 100%);
- background-image: -moz-linear-gradient(bottom, #D5D5D5 0%, #FCFCFC 100%);
- background-image: -webkit-linear-gradient(bottom, #D5D5D5 0%, #FCFCFC 100%);
- background-image: -ms-linear-gradient(bottom, #D5D5D5 0%, #FCFCFC 100%);
+ background: #e9e9e9;
+ background-image: linear-gradient(bottom, #d5d5d5 0%, #fcfcfc 100%);
+ background-image: -o-linear-gradient(bottom, #d5d5d5 0%, #fcfcfc 100%);
+ background-image: -moz-linear-gradient(bottom, #d5d5d5 0%, #fcfcfc 100%);
+ background-image: -webkit-linear-gradient(bottom, #d5d5d5 0%, #fcfcfc 100%);
+ background-image: -ms-linear-gradient(bottom, #d5d5d5 0%, #fcfcfc 100%);
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #D5D5D5),
- color-stop(1, #FCFCFC)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #d5d5d5),
+ color-stop(1, #fcfcfc)
);
-
padding: 8px 7px;
}
@@ -121,7 +120,7 @@ div.panels-ipe-placeholder {
padding: .5em;
position: relative;
margin-top: .5em;
- background-color: #ECFAFF;
+ background-color: #ecfaff;
color: #999;
font: 15px/1.3em "Open Sans", "Lucida Grande", Tahoma, Verdana, sans-serif;
text-transform: none;
@@ -152,9 +151,9 @@ div.panels-ipe-placeholder h3 {
}
div.panels-ipe-newblock {
- -webkit-box-shadow: 0px 0 5px 5px #ECFAFF;
- -moz-box-shadow: 0px 0 5px 5px #ECFAFF;
- box-shadow: 0px 0 5px 5px #ECFAFF;
+ -webkit-box-shadow: 0px 0 5px 5px #ecfaff;
+ -moz-box-shadow: 0px 0 5px 5px #ecfaff;
+ box-shadow: 0px 0 5px 5px #ecfaff;
position: absolute;
right: 10px;
top: 50%;
@@ -174,32 +173,30 @@ div.panels-ipe-newblock a,
span.panels-ipe-draghandle-icon {
display: inline-block;
border: 1px solid #ccc;
- padding: 0 8px 1px;
- font: bold 12px/32px 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
- text-decoration: none;
- height: 33px;
- color: #666;
- cursor: pointer;
- outline: none;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
-
- background: #FAFAFA;
- background-image: linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
- background-image: -o-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
- background-image: -moz-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
- background-image: -webkit-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
- background-image: -ms-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+ padding: 0 8px 1px;
+ font: bold 12px/32px 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
+ text-decoration: none;
+ height: 33px;
+ color: #666;
+ cursor: pointer;
+ outline: none;
+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ background: #fafafa;
+ background-image: linear-gradient(bottom, #e9eaec 0%, #fafafa 100%);
+ background-image: -o-linear-gradient(bottom, #e9eaec 0%, #fafafa 100%);
+ background-image: -moz-linear-gradient(bottom, #e9eaec 0%, #fafafa 100%);
+ background-image: -webkit-linear-gradient(bottom, #e9eaec 0%, #fafafa 100%);
+ background-image: -ms-linear-gradient(bottom, #e9eaec 0%, #fafafa 100%);
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #E9EAEC),
- color-stop(1, #FAFAFA)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #e9eaec),
+ color-stop(1, #fafafa)
);
-
-webkit-box-shadow: 0px 3px 3px 0px #d2d2d2;
-moz-box-shadow: 0px 3px 3px 0px #d2d2d2;
box-shadow: 0px 3px 3px 0px #d2d2d2;
@@ -248,18 +245,18 @@ div.panels-ipe-newblock a:hover,
span.panels-ipe-draghandle-icon:hover,
div.panels-ipe-handlebar-wrapper li a:focus,
div.panels-ipe-newblock a:focus {
- background: #E6E6E6;
- background-image: linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
- background-image: -o-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
- background-image: -moz-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
- background-image: -webkit-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
- background-image: -ms-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+ background: #e6e6e6;
+ background-image: linear-gradient(bottom, #c5c5c5 0%, #fafafa 100%);
+ background-image: -o-linear-gradient(bottom, #c5c5c5 0%, #fafafa 100%);
+ background-image: -moz-linear-gradient(bottom, #c5c5c5 0%, #fafafa 100%);
+ background-image: -webkit-linear-gradient(bottom, #c5c5c5 0%, #fafafa 100%);
+ background-image: -ms-linear-gradient(bottom, #c5c5c5 0%, #fafafa 100%);
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #C5C5C5),
- color-stop(1, #FAFAFA)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #c5c5c5),
+ color-stop(1, #fafafa)
);
}
@@ -268,19 +265,18 @@ div.panels-ipe-dragtitle span:active,
div.panels-ipe-newblock a:active,
span.panels-ipe-draghandle-icon:active {
outline: none;
- background-image: linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
- background-image: -o-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
- background-image: -moz-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
- background-image: -webkit-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
- background-image: -ms-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
+ background-image: linear-gradient(bottom, #ffffff 0%, #e9eaec 100%);
+ background-image: -o-linear-gradient(bottom, #ffffff 0%, #e9eaec 100%);
+ background-image: -moz-linear-gradient(bottom, #ffffff 0%, #e9eaec 100%);
+ background-image: -webkit-linear-gradient(bottom, #ffffff 0%, #e9eaec 100%);
+ background-image: -ms-linear-gradient(bottom, #ffffff 0%, #e9eaec 100%);
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #FFFFFF),
- color-stop(1, #E9EAEC)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #ffffff),
+ color-stop(1, #e9eaec)
);
-
-webkit-box-shadow: 0px 0px 0px 0px #fff;
-moz-box-shadow: 0px 0px 0px 0px #fff;
box-shadow: 0px 0px 0px 0px #fff;
@@ -363,19 +359,18 @@ div.panels-ipe-control .form-submit {
background-image: -moz-linear-gradient(bottom, #383838 0%, #666666 100%);
background-image: -webkit-linear-gradient(bottom, #383838 0%, #666666 100%);
background-image: -ms-linear-gradient(bottom, #383838 0%, #666666 100%);
-
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #383838),
- color-stop(1, #666666)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #383838),
+ color-stop(1, #666666)
);
border: 0;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
- color: #CCC;
+ color: #ccc;
display: inline-block;
font: bold 12px/33px "Open Sans", "Lucida Grande", Tahoma, Verdana, sans-serif;
height: 33px;
@@ -386,10 +381,14 @@ div.panels-ipe-control .form-submit {
padding: 0 0.8em 2px 34px;
}
-div.panels-ipe-control input.panels-ipe-save, div.panels-ipe-control input.panels-ipe-cancel,
-div.panels-ipe-control input.panels-ipe-save:hover, div.panels-ipe-control input.panels-ipe-cancel:hover,
-div.panels-ipe-control input.panels-ipe-save:focus, div.panels-ipe-control input.panels-ipe-cancel:focus,
-div.panels-ipe-control input.panels-ipe-save:active, div.panels-ipe-control input.panels-ipe-cancel:active {
+div.panels-ipe-control input.panels-ipe-save,
+div.panels-ipe-control input.panels-ipe-cancel,
+div.panels-ipe-control input.panels-ipe-save:hover,
+div.panels-ipe-control input.panels-ipe-cancel:hover,
+div.panels-ipe-control input.panels-ipe-save:focus,
+div.panels-ipe-control input.panels-ipe-cancel:focus,
+div.panels-ipe-control input.panels-ipe-save:active,
+div.panels-ipe-control input.panels-ipe-cancel:active {
background-repeat: no-repeat;
}
@@ -397,7 +396,7 @@ div.panels-ipe-pseudobutton-container a {
height: 33px;
padding: 0 0.8em;
display: inline-block;
- color: #CCC;
+ color: #ccc;
text-decoration: none;
}
@@ -408,13 +407,12 @@ div.panels-ipe-control .panels-ipe-save {
background-image: url(../images/icon-save.png), -moz-linear-gradient(bottom, #383838 0%, #666666 100%);
background-image: url(../images/icon-save.png), -webkit-linear-gradient(bottom, #383838 0%, #666666 100%);
background-image: url(../images/icon-save.png), -ms-linear-gradient(bottom, #383838 0%, #666666 100%);
-
background-image: url(../images/icon-save.png), -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #383838),
- color-stop(1, #666666)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #383838),
+ color-stop(1, #666666)
);
}
@@ -425,13 +423,12 @@ div.panels-ipe-control .panels-ipe-cancel {
background-image: url(../images/icon-close.png), -moz-linear-gradient(bottom, #383838 0%, #666666 100%);
background-image: url(../images/icon-close.png), -webkit-linear-gradient(bottom, #383838 0%, #666666 100%);
background-image: url(../images/icon-close.png), -ms-linear-gradient(bottom, #383838 0%, #666666 100%);
-
background-image: url(../images/icon-close.png), -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #383838),
- color-stop(1, #666666)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #383838),
+ color-stop(1, #666666)
);
}
@@ -440,58 +437,55 @@ div.panels-ipe-control .form-submit:hover,
div.panels-ipe-pseudobutton-container:focus,
div.panels-ipe-control .form-submit:focus {
background: #999999;
- background-image: linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: -o-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: -moz-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: -webkit-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: -ms-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
+ background-image: linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: -o-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: -moz-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: -webkit-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: -ms-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #3D3D3D),
- color-stop(1, #999999)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #3d3d3d),
+ color-stop(1, #999999)
);
-
- color: #FFF;
+ color: #fff;
}
div.panels-ipe-pseudobutton-container a:hover,
div.panels-ipe-pseudobutton-container a:focus {
- color: #FFF;
+ color: #fff;
}
div.panels-ipe-control .panels-ipe-cancel:hover,
div.panels-ipe-control .panels-ipe-cancel:focus {
- background-image: url(../images/icon-close.png), linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-close.png), -o-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-close.png), -moz-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-close.png), -webkit-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-close.png), -ms-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
-
+ background-image: url(../images/icon-close.png), linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-close.png), -o-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-close.png), -moz-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-close.png), -webkit-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-close.png), -ms-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
background-image: url(../images/icon-close.png), -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #3D3D3D),
- color-stop(1, #999999)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #3d3d3d),
+ color-stop(1, #999999)
);
}
div.panels-ipe-control .panels-ipe-save:hover,
div.panels-ipe-control .panels-ipe-save:focus {
- background-image: url(../images/icon-save.png), linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-save.png), -o-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-save.png), -moz-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-save.png), -webkit-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
- background-image: url(../images/icon-save.png), -ms-linear-gradient(bottom, #3D3D3D 0%, #999999 100%);
-
+ background-image: url(../images/icon-save.png), linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-save.png), -o-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-save.png), -moz-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-save.png), -webkit-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
+ background-image: url(../images/icon-save.png), -ms-linear-gradient(bottom, #3d3d3d 0%, #999999 100%);
background-image: url(../images/icon-save.png), -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #3D3D3D),
- color-stop(1, #999999)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #3d3d3d),
+ color-stop(1, #999999)
);
}
@@ -503,20 +497,18 @@ div.panels-ipe-control .form-submit:active {
background-image: -moz-linear-gradient(bottom, #616161 0%, #333333 100%);
background-image: -webkit-linear-gradient(bottom, #616161 0%, #333333 100%);
background-image: -ms-linear-gradient(bottom, #616161 0%, #333333 100%);
-
background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #616161),
- color-stop(1, #333333)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #616161),
+ color-stop(1, #333333)
);
-
- color: #CCC;
+ color: #ccc;
}
div.panels-ipe-pseudobutton-container a:active {
- color: #CCC;
+ color: #ccc;
}
div.panels-ipe-control .panels-ipe-cancel:active {
@@ -525,13 +517,12 @@ div.panels-ipe-control .panels-ipe-cancel:active {
background-image: url(../images/icon-close.png), -moz-linear-gradient(bottom, #616161 0%, #333333 100%);
background-image: url(../images/icon-close.png), -webkit-linear-gradient(bottom, #616161 0%, #333333 100%);
background-image: url(../images/icon-close.png), -ms-linear-gradient(bottom, #616161 0%, #333333 100%);
-
background-image: url(../images/icon-close.png), -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #616161),
- color-stop(1, #333333)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #616161),
+ color-stop(1, #333333)
);
}
@@ -541,19 +532,21 @@ div.panels-ipe-control .panels-ipe-save:active {
background-image: url(../images/icon-save.png), -moz-linear-gradient(bottom, #616161 0%, #333333 100%);
background-image: url(../images/icon-save.png), -webkit-linear-gradient(bottom, #616161 0%, #333333 100%);
background-image: url(../images/icon-save.png), -ms-linear-gradient(bottom, #616161 0%, #333333 100%);
-
background-image: url(../images/icon-save.png), -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #616161),
- color-stop(1, #333333)
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, #616161),
+ color-stop(1, #333333)
);
}
-div.panels-ipe-control .panels-ipe-save, div.panels-ipe-control .panels-ipe-cancel,
-div.panels-ipe-control .panels-ipe-save:hover, div.panels-ipe-control .panels-ipe-cancel:hover,
-div.panels-ipe-control .panels-ipe-save:active, div.panels-ipe-control .panels-ipe-cancel:active {
+div.panels-ipe-control .panels-ipe-save,
+div.panels-ipe-control .panels-ipe-cancel,
+div.panels-ipe-control .panels-ipe-save:hover,
+div.panels-ipe-control .panels-ipe-cancel:hover,
+div.panels-ipe-control .panels-ipe-save:active,
+div.panels-ipe-control .panels-ipe-cancel:active {
background-repeat: no-repeat;
}
@@ -576,6 +569,6 @@ form#panels-ipe-edit-control-form {
text-align: center;
}
-.panels-ipe-dragbar-admin-title{
+.panels-ipe-dragbar-admin-title {
font-size: 0.9em;
}
diff --git a/panels_ipe/includes/panels_ipe.pipelines.inc b/panels_ipe/includes/panels_ipe.pipelines.inc
index 5bc3b03..49763df 100644
--- a/panels_ipe/includes/panels_ipe.pipelines.inc
+++ b/panels_ipe/includes/panels_ipe.pipelines.inc
@@ -11,7 +11,7 @@
function panels_ipe_default_panels_renderer_pipeline() {
$pipelines = array();
- $pipeline = new stdClass;
+ $pipeline = new stdClass();
$pipeline->disabled = FALSE; /* Edit this to true to make a default pipeline disabled initially */
$pipeline->api_version = 1;
$pipeline->name = 'ipe';
diff --git a/panels_ipe/panels_ipe.module b/panels_ipe/panels_ipe.module
index 1b21dbb..0e33fd1 100644
--- a/panels_ipe/panels_ipe.module
+++ b/panels_ipe/panels_ipe.module
@@ -1,6 +1,10 @@
<?php
/**
+ * @file
+ */
+
+/**
* Implementation of hook_ctools_plugin_directory().
*/
function panels_ipe_ctools_plugin_directory($module, $plugin) {
@@ -90,12 +94,12 @@ function template_preprocess_panels_ipe_pane_wrapper(&$vars) {
'attributes' => array(
'class' => array('ctools-use-modal', 'panels-ipe-hide-bar'),
'title' => isset($content_type['edit text']) ? $content_type['edit text'] : t('Settings'),
- // 'id' => "pane-edit-panel-pane-$pane->pid",
+ // 'id' => "pane-edit-panel-pane-$pane->pid",.
),
);
}
- // Add option to configure style in IPE
+ // Add option to configure style in IPE.
if (user_access('administer panels pane styles')) {
$vars['links']['style'] = array(
'title' => '<span>' . t('Style') . '</span>',
@@ -122,7 +126,7 @@ function template_preprocess_panels_ipe_pane_wrapper(&$vars) {
}
// Deleting is managed entirely in the js; this is just an attachment point
- // for it
+ // for it.
$vars['links']['delete'] = array(
'title' => '<span>' . t('Delete') . '</span>',
'href' => '#',
@@ -137,7 +141,7 @@ function template_preprocess_panels_ipe_pane_wrapper(&$vars) {
$context = array(
'pane' => $pane,
'display' => $display,
- 'renderer' => $renderer
+ 'renderer' => $renderer,
);
drupal_alter('panels_ipe_pane_links', $vars['links'], $context);
@@ -153,12 +157,12 @@ function theme_panels_ipe_pane_wrapper($vars) {
);
$type = ctools_get_content_type($pane->type);
- $title ='<span class = "panels-ipe-dragbar-admin-title">' . ctools_content_admin_title($type, $pane->subtype, $pane->configuration, $display->context) . '</span>';
+ $title = '<span class = "panels-ipe-dragbar-admin-title">' . ctools_content_admin_title($type, $pane->subtype, $pane->configuration, $display->context) . '</span>';
$links = theme('links', array('links' => $vars['links'], 'attributes' => $attributes));
if (!empty($pane->locks['type']) && $pane->locks['type'] == 'immovable') {
- $links = '<div class="panels-ipe-dragbar panels-ipe-nodraghandle clearfix">' . $links .$title .'</div>';
+ $links = '<div class="panels-ipe-dragbar panels-ipe-nodraghandle clearfix">' . $links . $title . '</div>';
}
else {
$links = '<div class="panels-ipe-dragbar panels-ipe-draghandle clearfix">' . $links . $title . '<span class="panels-ipe-draghandle-icon"><span class="panels-ipe-draghandle-icon-inner"></span></span></div>';
@@ -179,7 +183,7 @@ function template_preprocess_panels_ipe_add_pane_button(&$vars) {
$renderer = $vars['renderer'];
$vars['links'] = array();
- // Add option to configure style in IPE
+ // Add option to configure style in IPE.
if (user_access('administer panels region styles')) {
$vars['links']['style'] = array(
'title' => '<span>' . t('Region style') . '</span>',
@@ -192,7 +196,7 @@ function template_preprocess_panels_ipe_add_pane_button(&$vars) {
);
}
- // Add option to add items in the IPE
+ // Add option to add items in the IPE.
$vars['links']['add-pane'] = array(
'title' => '<span>' . t('Add new pane') . '</span>',
'href' => $renderer->get_url('select-content', $region_id),
@@ -239,7 +243,7 @@ function panels_ipe_toolbar_add_button($cache_key, $id, $button) {
}
/**
- * Implementation of hook_footer()
+ * Implementation of hook_footer().
*
* Adds the IPE control container.
*
diff --git a/panels_ipe/plugins/display_renderers/ipe.inc b/panels_ipe/plugins/display_renderers/ipe.inc
index ab63f9e..e369abf 100644
--- a/panels_ipe/plugins/display_renderers/ipe.inc
+++ b/panels_ipe/plugins/display_renderers/ipe.inc
@@ -1,5 +1,9 @@
<?php
+/**
+ * @file
+ */
+
$plugin = array(
'renderer' => 'panels_renderer_ipe',
);
diff --git a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
index 470c4e2..6a7326c 100644
--- a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -1,6 +1,10 @@
<?php
/**
+ * @file
+ */
+
+/**
* Renderer class for all In-Place Editor (IPE) behavior.
*/
class panels_renderer_ipe extends panels_renderer_editor {
@@ -54,7 +58,6 @@ class panels_renderer_ipe extends panels_renderer_editor {
// @todo we may need an else to load the cache, but I am not sure we
// actually need to load it if we already have our cache key, and doing
// so is a waste of resources.
-
ctools_include('cleanstring');
$this->clean_key = ctools_cleanstring($this->display->cache_key);
$button = array(
@@ -91,8 +94,8 @@ class panels_renderer_ipe extends panels_renderer_editor {
'ipe_cache_key' => $this->clean_key,
),
- '#prefix' => '<div class="panels-ipe-pseudobutton-container">',
- '#suffix' => '</div>',
+ '#prefix' => '<div class="panels-ipe-pseudobutton-container">',
+ '#suffix' => '</div>',
);
panels_ipe_toolbar_add_button($this->display->cache_key, 'panels-ipe-change-layout', $button);
@@ -156,13 +159,13 @@ class panels_renderer_ipe extends panels_renderer_editor {
if (empty($pane->IPE_empty)) {
// Add an inner layer wrapper to the pane content before placing it into
- // draggable portlet
+ // draggable portlet.
$output = "<div class=\"panels-ipe-portlet-content\">$output</div>";
}
else {
$output = "<div class=\"panels-ipe-portlet-content panels-ipe-empty-pane\">$output</div>";
}
- // Hand it off to the plugin/theme for placing draggers/buttons
+ // Hand it off to the plugin/theme for placing draggers/buttons.
$output = theme('panels_ipe_pane_wrapper', array('output' => $output, 'pane' => $pane, 'display' => $this->display, 'renderer' => $this));
if (!empty($pane->locks['type']) && $pane->locks['type'] == 'immovable') {
@@ -259,13 +262,17 @@ class panels_renderer_ipe extends panels_renderer_editor {
// Break the lock.
panels_edit_cache_break_lock($this->cache);
}
- }
+ }
+ /**
+ *
+ */
function get_panels_storage_op_for_ajax($method) {
switch ($method) {
case 'ajax_unlock_ipe':
case 'ajax_save_form':
return 'update';
+
case 'ajax_change_layout':
case 'ajax_set_layout':
return 'change layout';
@@ -299,7 +306,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
// Reset the $_POST['ajax_html_ids'] values to preserve
// proper IDs on form elements when they are rebuilt
- // by the Panels IPE without refreshing the page
+ // by the Panels IPE without refreshing the page.
$_POST['ajax_html_ids'] = array();
$form_state = array(
@@ -308,7 +315,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
'content_types' => $this->cache->content_types,
'rerender' => FALSE,
'no_redirect' => TRUE,
- // Panels needs this to make sure that the layout gets callbacks
+ // Panels needs this to make sure that the layout gets callbacks.
'layout' => $this->plugins['layout'],
);
@@ -383,13 +390,13 @@ class panels_renderer_ipe extends panels_renderer_editor {
$layouts = panels_common_get_allowed_layouts('panels_page');
}
- // Filter out builders
+ // Filter out builders.
$layouts = array_filter($layouts, '_panels_builder_filter');
// Let other modules filter the layouts.
drupal_alter('panels_layouts_available', $layouts);
- // Define the current layout
+ // Define the current layout.
$current_layout = $this->plugins['layout']['name'];
$output = panels_common_print_layout_links($layouts, $this->get_url('set_layout'), array('attributes' => array('class' => array('use-ajax'))), $current_layout);
@@ -414,7 +421,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
// Reset the $_POST['ajax_html_ids'] values to preserve
// proper IDs on form elements when they are rebuilt
- // by the Panels IPE without refreshing the page
+ // by the Panels IPE without refreshing the page.
$_POST['ajax_html_ids'] = array();
$output = drupal_build_form('panels_change_layout', $form_state);
@@ -485,6 +492,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
'key' => $this->clean_key,
);
}
+
}
/**
@@ -493,8 +501,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
function panels_ipe_edit_control_form($form, &$form_state) {
$display = &$form_state['display'];
// @todo -- this should be unnecessary as we ensure cache_key is set in add_meta()
-// $display->cache_key = isset($display->cache_key) ? $display->cache_key : $display->did;
-
+ // $display->cache_key = isset($display->cache_key) ? $display->cache_key : $display->did;
// Annoyingly, theme doesn't have access to form_state so we have to do this.
$form['#display'] = $display;
diff --git a/panels_mini/panels_mini.info b/panels_mini/panels_mini.info
index 0eae9f5..01cb4f5 100644
--- a/panels_mini/panels_mini.info
+++ b/panels_mini/panels_mini.info
@@ -3,4 +3,4 @@ description = Create mini panels that can be used as blocks by Drupal and panes
package = "Panels"
dependencies[] = panels
core = 7.x
-files[] = plugins/export_ui/panels_mini_ui.class.php \ No newline at end of file
+files[] = plugins/export_ui/panels_mini_ui.class.php
diff --git a/panels_mini/panels_mini.install b/panels_mini/panels_mini.install
index b3239dd..160a58b 100644
--- a/panels_mini/panels_mini.install
+++ b/panels_mini/panels_mini.install
@@ -1,6 +1,10 @@
<?php
/**
+ * @file
+ */
+
+/**
* Implementation of hook_schema().
*/
function panels_mini_schema() {
@@ -105,7 +109,7 @@ function panels_mini_uninstall() {
foreach ($result as $panel_mini) {
// Delete all associated displays.
if (!function_exists('panels_delete_display')) {
- require_once drupal_get_path('module', 'panels') .'/panels.module';
+ require_once drupal_get_path('module', 'panels') . '/panels.module';
}
if ($panels_exists) {
panels_delete_display($panel_mini->did);
@@ -127,7 +131,7 @@ function panels_mini_uninstall() {
* Implements hook_update_dependencies().
*/
function panels_mini_update_dependencies() {
- // Update 7301 requires panels storage support
+ // Update 7301 requires panels storage support.
$dependencies['panels_mini'][7301] = array(
'panels' => 7305,
);
@@ -140,19 +144,19 @@ function panels_mini_update_dependencies() {
*/
function panels_mini_update_7301() {
if (!isset($sandbox['progress'])) {
- // Initialize batch update information.
- $sandbox['progress'] = (float)0;
- $sandbox['current_did'] = -1;
- $sandbox['max'] = db_query("SELECT COUNT(pd.did)
+ // Initialize batch update information.
+ $sandbox['progress'] = (float) 0;
+ $sandbox['current_did'] = -1;
+ $sandbox['max'] = db_query("SELECT COUNT(pd.did)
FROM {panels_display} pd
JOIN {panels_mini} pm ON pm.did = pd.did
WHERE pd.storage_type = ''")->fetchField();
- }
+ }
// Set a limit of how many rows to process per batch.
$limit = 1000;
- // Run the query
+ // Run the query.
$result = db_query_range("SELECT pd.did, pm.name
FROM {panels_display} pd
JOIN {panels_mini} pm ON pm.did = pd.did
diff --git a/panels_mini/panels_mini.module b/panels_mini/panels_mini.module
index 2139de1..485d9c7 100644
--- a/panels_mini/panels_mini.module
+++ b/panels_mini/panels_mini.module
@@ -39,7 +39,7 @@ function panels_mini_menu() {
'type' => MENU_LOCAL_TASK,
);
- // Also provide settings on the main panel UI
+ // Also provide settings on the main panel UI.
$items['admin/structure/panels/settings/panels-mini'] = array(
'title' => 'Mini panels',
'page callback' => 'panels_mini_settings',
@@ -59,8 +59,7 @@ function panels_mini_settings() {
}
// ---------------------------------------------------------------------------
-// Allow the rest of the system access to mini panels
-
+// Allow the rest of the system access to mini panels.
/**
* Implementation of hook_block_info().
*/
@@ -91,7 +90,7 @@ function panels_mini_block_info() {
* @see panels_mini_panels_mini_content_type_render().
*/
function panels_mini_block_view($delta = 0) {
- // static recursion protection.
+ // Static recursion protection.
static $viewing = array();
if (!empty($viewing[$delta])) {
return;
@@ -114,7 +113,7 @@ function panels_mini_block_view($delta = 0) {
}
drupal_alter('panels_mini_block_contexts', $contexts, $panel_mini);
- $panel_mini->context = $panel_mini->display->context = ctools_context_load_contexts($panel_mini, FALSE, $contexts);
+ $panel_mini->context = $panel_mini->display->context = ctools_context_load_contexts($panel_mini, FALSE, $contexts);
$panel_mini->display->css_id = panels_mini_get_id($panel_mini->name);
$panel_mini->display->owner = $panel_mini;
@@ -133,7 +132,7 @@ function panels_mini_block_view($delta = 0) {
function panels_mini_block_configure($delta = 0) {
return array(
'admin_shortcut' => array(
- '#markup' => l(t('Manage this mini-panel'), 'admin/structure/mini-panels/list/' . $delta . '/edit')
+ '#markup' => l(t('Manage this mini-panel'), 'admin/structure/mini-panels/list/' . $delta . '/edit'),
),
);
}
@@ -241,7 +240,6 @@ function panels_mini_get_id($name) {
// ---------------------------------------------------------------------------
// Database functions.
-
/**
* Create a new page with defaults appropriately set from schema.
*/
@@ -331,7 +329,7 @@ function panels_mini_load_all($reset = FALSE) {
$dids[$mini->did] = $mini->name;
}
else {
- // Translate old style titles into new titles.
+ // Translate old style titles into new titles.
if (!empty($mini->title) && empty($mini->display->title)) {
$mini->display->title = $mini->title;
}
@@ -400,7 +398,7 @@ function panels_mini_delete($mini) {
function panels_mini_export($mini, $indent = '') {
ctools_include('export');
$output = ctools_export_object('panels_mini', $mini, $indent);
- // Export the primary display
+ // Export the primary display.
$display = !empty($mini->display) ? $mini->display : panels_load_display($mini->did);
$output .= panels_export_display($display, $indent);
$output .= $indent . '$mini->display = $display' . ";\n";
@@ -462,7 +460,7 @@ function _panels_mini_panels_cache_get($key) {
}
/**
- * Get display edit cache for the panels mini export UI
+ * Get display edit cache for the panels mini export UI.
*
* The key is the second half of the key in this form:
* panels_mini:TASK_NAME:HANDLER_NAME;
diff --git a/panels_mini/plugins/content_types/panels_mini.inc b/panels_mini/plugins/content_types/panels_mini.inc
index 2d092be..e176001 100644
--- a/panels_mini/plugins/content_types/panels_mini.inc
+++ b/panels_mini/plugins/content_types/panels_mini.inc
@@ -6,7 +6,6 @@
* need to be broken out into a .inc file, it's convenient that we do so
* that we don't load code unnecessarily. Plus it demonstrates plugins
* in modules other than Panels itself.
- *
*/
/**
@@ -105,7 +104,7 @@ function panels_mini_panels_mini_content_type_render($subtype, $conf, $panel_arg
$mini->display->args = $panel_args;
$mini->display->css_id = panels_mini_get_id($subtype);
$mini->display->owner = $mini;
- // unique ID of this mini.
+ // Unique ID of this mini.
$mini->display->owner->id = $mini->name;
$block = new stdClass();
diff --git a/panels_mini/plugins/export_ui/panels_mini.inc b/panels_mini/plugins/export_ui/panels_mini.inc
index 46cb894..78e1d84 100644
--- a/panels_mini/plugins/export_ui/panels_mini.inc
+++ b/panels_mini/plugins/export_ui/panels_mini.inc
@@ -1,5 +1,9 @@
<?php
+/**
+ * @file
+ */
+
$plugin = array(
'schema' => 'panels_mini',
'access' => 'administer mini panels',
@@ -38,4 +42,3 @@ $plugin = array(
),
);
-
diff --git a/panels_mini/plugins/export_ui/panels_mini_ui.class.php b/panels_mini/plugins/export_ui/panels_mini_ui.class.php
index cff8fe6..5b988da 100644
--- a/panels_mini/plugins/export_ui/panels_mini_ui.class.php
+++ b/panels_mini/plugins/export_ui/panels_mini_ui.class.php
@@ -1,5 +1,8 @@
<?php
+/**
+ * @file
+ */
class panels_mini_ui extends ctools_export_ui {
function init($plugin) {
parent::init($plugin);
@@ -62,23 +65,28 @@ class panels_mini_ui extends ctools_export_ui {
}
function list_build_row($item, &$form_state, $operations) {
- // Set up sorting
+ // Set up sorting.
switch ($form_state['values']['order']) {
case 'disabled':
$this->sorts[$item->name] = empty($item->disabled) . $item->admin_title;
break;
+
case 'title':
$this->sorts[$item->name] = $item->admin_title;
break;
+
case 'name':
$this->sorts[$item->name] = $item->name;
break;
+
case 'category':
$this->sorts[$item->name] = ($item->category ? $item->category : t('Mini panels')) . $item->admin_title;
break;
+
case 'layout':
$this->sorts[$item->name] = $item->display->layout . $item->admin_title;
break;
+
case 'storage':
$this->sorts[$item->name] = $item->type . $item->admin_title;
break;
@@ -115,7 +123,7 @@ class panels_mini_ui extends ctools_export_ui {
}
function edit_form(&$form, &$form_state) {
- // Get the basic edit form
+ // Get the basic edit form.
parent::edit_form($form, $form_state);
// Set the admin title machine name length.
@@ -295,4 +303,5 @@ class panels_mini_ui extends ctools_export_ui {
panels_edit_display_form_submit($form, $form_state);
$form_state['item']->display = $form_state['display'];
}
+
}
diff --git a/panels_mini/plugins/panels_storage/panels_mini.inc b/panels_mini/plugins/panels_storage/panels_mini.inc
index c9ba35d..2ba46be 100644
--- a/panels_mini/plugins/panels_storage/panels_mini.inc
+++ b/panels_mini/plugins/panels_storage/panels_mini.inc
@@ -5,7 +5,7 @@
* Provides a panels_storage plugin for mini panels.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'access callback' => 'panels_mini_panels_storage_access',
);
diff --git a/panels_node/panels_node.install b/panels_node/panels_node.install
index 1af682f..baaebd7 100644
--- a/panels_node/panels_node.install
+++ b/panels_node/panels_node.install
@@ -1,6 +1,10 @@
<?php
/**
+ * @file
+ */
+
+/**
* Implementation of hook_schema().
*/
function panels_node_schema() {
@@ -60,7 +64,7 @@ function panels_node_uninstall() {
* Implements hook_update_dependencies().
*/
function panels_node_update_dependencies() {
- // Update 7301 requires panels storage support
+ // Update 7301 requires panels storage support.
$dependencies['panels_node'][7301] = array(
'panels' => 7305,
);
@@ -69,7 +73,7 @@ function panels_node_update_dependencies() {
}
/**
- * Implementation of hook_update to handle adding a pipeline
+ * Implementation of hook_update to handle adding a pipeline.
*/
function panels_node_update_6001() {
$ret = array();
@@ -125,19 +129,19 @@ function panels_node_update_7301() {
*/
function panels_node_update_7302() {
if (!isset($sandbox['progress'])) {
- // Initialize batch update information.
- $sandbox['progress'] = (float)0;
- $sandbox['current_did'] = -1;
- $sandbox['max'] = db_query("SELECT COUNT(pd.did)
+ // Initialize batch update information.
+ $sandbox['progress'] = (float) 0;
+ $sandbox['current_did'] = -1;
+ $sandbox['max'] = db_query("SELECT COUNT(pd.did)
FROM {panels_display} pd
JOIN {panels_node} pn ON pn.did = pd.did
WHERE pd.storage_type = ''")->fetchField();
- }
+ }
// Set a limit of how many rows to process per batch.
$limit = 1000;
- // Run the query
+ // Run the query.
$result = db_query_range("SELECT pd.did, pn.nid
FROM {panels_display} pd
JOIN {panels_node} pn ON pn.did = pd.did
diff --git a/panels_node/panels_node.module b/panels_node/panels_node.module
index bc9d56f..e93fe26 100644
--- a/panels_node/panels_node.module
+++ b/panels_node/panels_node.module
@@ -1,6 +1,4 @@
<?php
-
-
/**
* @file panels_node.module
*
@@ -10,8 +8,7 @@
*/
// ---------------------------------------------------------------------------
-// General Drupal hooks
-
+// General Drupal hooks.
/**
* Implementation of hook_permission().
*/
@@ -81,7 +78,7 @@ function panels_node_menu() {
}
/**
- * Access callback to determine if a user has edit access
+ * Access callback to determine if a user has edit access.
*/
function panels_node_edit_node($node) {
if (!isset($node->panels_node)) {
@@ -113,8 +110,7 @@ function panels_node_add() {
}
// ---------------------------------------------------------------------------
-// Node hooks
-
+// Node hooks.
/**
* Implementation of hook_node_info().
*/
@@ -202,7 +198,7 @@ function panels_node_hook_form(&$node, &$form_state) {
);
// Support for different rendering pipelines
- // Mostly borrowed from panel_context.inc
+ // Mostly borrowed from panel_context.inc.
$pipelines = panels_get_renderer_pipelines();
$options = array();
@@ -257,7 +253,7 @@ function panels_node_hook_insert(&$node) {
// Special handling for nodes being imported from an export.module data dump.
if (!empty($node->export_display)) {
- // This works by overriding the $display set above
+ // This works by overriding the $display set above.
eval($node->export_display);
unset($node->export_display);
}
@@ -336,8 +332,7 @@ function panels_node_hook_view($node, $view_mode) {
}
// ---------------------------------------------------------------------------
-// Administrative pages
-
+// Administrative pages.
/**
* Settings for panel nodes.
*/
@@ -347,8 +342,7 @@ function panels_node_settings() {
}
// ---------------------------------------------------------------------------
-// Meat of the Panels API; almost completely passing through to panels.module
-
+// Meat of the Panels API; almost completely passing through to panels.module.
/**
* Pass through to the panels layout editor.
*/
@@ -385,7 +379,7 @@ function panels_node_get_context(&$node) {
}
/**
- * Implementation of hook_export_node_alter()
+ * Implementation of hook_export_node_alter().
*
* Integrate with export.module for saving panel_nodes into code.
*/
@@ -423,13 +417,12 @@ function panels_node_panels_ipe_access($display) {
// Only allow access to use the IPE if the user has 'update' access to
// the underlying node.
$node = $display->context['panel-node']->data;
- return node_access('update', $node);
+ return node_access('update', $node);
}
}
// ---------------------------------------------------------------------------
// Callbacks for panel caching.
-
/**
* Get display edit cache for a panel node being edited.
*
@@ -451,7 +444,7 @@ function panels_node_panels_cache_get($nid) {
$cache->display->css_id = $node->panels_node['css_id'];
$cache->display->context = panels_node_get_context($node);
$cache->display->cache_key = 'panels_node:' . $node->nid;
- $cache->content_types = panels_common_get_allowed_types('panels_node', $cache->display->context);
+ $cache->content_types = panels_common_get_allowed_types('panels_node', $cache->display->context);
$cache->allwed_layouts = panels_common_get_allowed_layouts('panels_node');
}
diff --git a/panels_node/plugins/panels_storage/panels_node.inc b/panels_node/plugins/panels_storage/panels_node.inc
index a7a7a3b..1696fc0 100644
--- a/panels_node/plugins/panels_storage/panels_node.inc
+++ b/panels_node/plugins/panels_storage/panels_node.inc
@@ -5,7 +5,7 @@
* Provides a panels_storage plugin for panels node.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'access callback' => 'panels_node_panels_storage_access',
);
diff --git a/plugins/cache/simple.inc b/plugins/cache/simple.inc
index 6b76678..26682c6 100644
--- a/plugins/cache/simple.inc
+++ b/plugins/cache/simple.inc
@@ -5,7 +5,7 @@
* Provides a simple time-based caching option for panel panes.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t("Simple cache"),
'description' => t('Simple caching is a time-based cache. This is a hard limit, and once cached it will remain that way until the time limit expires.'),
@@ -128,7 +128,7 @@ function panels_simple_cache_get_id($conf, $display, $args, $contexts, $pane) {
$id .= ':' . $language->language;
}
- if(!empty($pane->configuration['use_pager']) && !empty($_GET['page'])) {
+ if (!empty($pane->configuration['use_pager']) && !empty($_GET['page'])) {
$id .= ':p' . check_plain($_GET['page']);
}
@@ -158,4 +158,3 @@ function panels_simple_cache_settings_form($conf, $display, $pid) {
return $form;
}
-
diff --git a/plugins/display_renderers/editor.inc b/plugins/display_renderers/editor.inc
index 6bfdf84..c570e2a 100644
--- a/plugins/display_renderers/editor.inc
+++ b/plugins/display_renderers/editor.inc
@@ -1,5 +1,9 @@
<?php
+/**
+ * @file
+ */
+
$plugin = array(
'renderer' => 'panels_renderer_editor',
);
diff --git a/plugins/display_renderers/panels_renderer_editor.class.php b/plugins/display_renderers/panels_renderer_editor.class.php
index 0d3dfa6..897f983 100644
--- a/plugins/display_renderers/panels_renderer_editor.class.php
+++ b/plugins/display_renderers/panels_renderer_editor.class.php
@@ -4,7 +4,6 @@
* @file
* Class file to control the main Panels editor.
*/
-
class panels_renderer_editor extends panels_renderer_standard {
/**
@@ -20,8 +19,10 @@ class panels_renderer_editor extends panels_renderer_standard {
* builder that do not actually have real content.
*/
var $no_edit_links = FALSE;
- // -------------------------------------------------------------------------
- // Display edit rendering.
+ // -------------------------------------------------------------------------.
+ /**
+ * Display edit rendering.
+ */
function edit() {
$form_state = array(
@@ -119,7 +120,6 @@ class panels_renderer_editor extends panels_renderer_standard {
$buttons = $this->get_pane_links($pane, $content_type);
// Render administrative buttons for the pane.
-
$block = new stdClass();
if (empty($content_type)) {
$block->title = '<em>' . t('Missing content type') . '</em>';
@@ -136,7 +136,7 @@ class panels_renderer_editor extends panels_renderer_standard {
$settings['Panels']['RegionLock'][$pane->pid] = $pane->locks['regions'];
drupal_add_js($settings, 'setting');
}
- else if ($pane->locks['type'] == 'immovable') {
+ elseif ($pane->locks['type'] == 'immovable') {
$grabber_class = 'grab-title not-grabber';
}
}
@@ -163,15 +163,15 @@ class panels_renderer_editor extends panels_renderer_standard {
$output .= '<span class="buttons">' . $buttons . '</span>';
}
$output .= '<span class="text" title="' . check_plain($title) . '">' . $title . '</span>';
- $output .= '</div>'; // grabber
-
+ $output .= '</div>';
+ // Grabber.
$output .= '<div class="panel-pane-collapsible">';
$output .= '<div class="pane-title">' . $block->title . '</div>';
$output .= '<div class="pane-content">' . filter_xss_admin(render($block->content)) . '</div>';
- $output .= '</div>'; // panel-pane-collapsible
-
- $output .= '</div>'; // panel-pane
-
+ $output .= '</div>';
+ // panel-pane-collapsible.
+ $output .= '</div>';
+ // panel-pane.
return $output;
}
@@ -360,7 +360,7 @@ class panels_renderer_editor extends panels_renderer_standard {
if (user_access('administer pane access')) {
$contexts = $this->display->context;
- // Make sure we have the logged in user context
+ // Make sure we have the logged in user context.
if (!isset($contexts['logged-in-user'])) {
$contexts['logged-in-user'] = ctools_access_get_loggedin_context();
}
@@ -408,9 +408,11 @@ class panels_renderer_editor extends panels_renderer_standard {
case 'immovable':
$lock_method = t('Immovable');
break;
+
case 'regions':
$lock_method = t('Regions');
break;
+
case 'none':
default:
$lock_method = t('No lock');
@@ -464,7 +466,7 @@ class panels_renderer_editor extends panels_renderer_standard {
);
// Allow others to add/remove links from pane context menu.
- // Grouped by 'top', 'style', 'visibility', 'lock', 'cache' and 'bottom'
+ // Grouped by 'top', 'style', 'visibility', 'lock', 'cache' and 'bottom'.
drupal_alter('get_pane_links', $links, $pane, $content_type);
$dropdown_links = $links['top'];
@@ -499,7 +501,6 @@ class panels_renderer_editor extends panels_renderer_standard {
// -----------------------------------------------------------------------
// Display edit AJAX callbacks and helpers.
-
/**
* Generate a URL path for the AJAX editor.
*/
@@ -612,7 +613,7 @@ class panels_renderer_editor extends panels_renderer_standard {
if (!empty($content_type['top level'])) {
$category = 'root';
}
- else if (isset($content_type['category'])) {
+ elseif (isset($content_type['category'])) {
if (is_array($content_type['category'])) {
list($category, $weight) = $content_type['category'];
}
@@ -668,7 +669,7 @@ class panels_renderer_editor extends panels_renderer_standard {
}
}
- // Now sort
+ // Now sort.
natcasesort($category_names);
foreach ($category_names as $category => $name) {
$output[$category] = $categories[$category];
@@ -733,17 +734,17 @@ class panels_renderer_editor extends panels_renderer_standard {
$pane = $form_state['pane'];
unset($this->cache->new_pane);
- // Add the pane to the display
+ // Add the pane to the display.
$this->display->add_pane($pane, $region);
panels_edit_cache_set($this->cache);
- // Tell the client to draw the pane
+ // Tell the client to draw the pane.
$this->command_add_pane($pane);
// Dismiss the modal.
$this->commands[] = ctools_modal_command_dismiss();
}
- else if (!empty($form_state['cancel'])) {
+ elseif (!empty($form_state['cancel'])) {
// If cancelling, return to the activity.
list($category_key, $category) = $this->get_category($subtype);
$this->ajax_select_content($region, $category_key);
@@ -786,14 +787,14 @@ class panels_renderer_editor extends panels_renderer_standard {
'cancel callback' => 'panels_ajax_edit_pane_cancel',
);
- $output = ctools_content_form('edit', $form_info, $form_state, $content_type, $pane->subtype, $subtype, $pane->configuration, $step);
+ $output = ctools_content_form('edit', $form_info, $form_state, $content_type, $pane->subtype, $subtype, $pane->configuration, $step);
// If $rc is FALSE, there was no actual form.
if ($output === FALSE || !empty($form_state['cancel'])) {
// Dismiss the modal.
$this->commands[] = ctools_modal_command_dismiss();
}
- else if (!empty($form_state['complete'])) {
+ elseif (!empty($form_state['complete'])) {
// References get blown away with AJAX caching. This will fix that.
$this->cache->display->content[$pid] = $form_state['pane'];
@@ -852,7 +853,7 @@ class panels_renderer_editor extends panels_renderer_standard {
$conf = &$this->display->cache;
$title = t('Cache method for this display');
}
- else if (!empty($this->display->content[$pid])) {
+ elseif (!empty($this->display->content[$pid])) {
$pane = &$this->display->content[$pid];
$subtype = ctools_content_get_subtype($pane->type, $pane->subtype);
$conf = &$pane->cache;
@@ -896,7 +897,7 @@ class panels_renderer_editor extends panels_renderer_standard {
else {
$this->cache->method = $form_state['method'];
panels_edit_cache_set($this->cache);
- // send them to next form.
+ // Send them to next form.
return $this->ajax_cache_settings($pid);
}
}
@@ -917,7 +918,7 @@ class panels_renderer_editor extends panels_renderer_standard {
$conf = &$this->display->cache;
$title = t('Cache settings for this display');
}
- else if (!empty($this->display->content[$pid])) {
+ elseif (!empty($this->display->content[$pid])) {
$pane = &$this->display->content[$pid];
$subtype = ctools_content_get_subtype($pane->type, $pane->subtype);
@@ -979,7 +980,8 @@ class panels_renderer_editor extends panels_renderer_standard {
break;
case 'region':
- $style = isset($this->display->panel_settings[$pid]['style']) ? $this->display->panel_settings[$pid]['style'] : '-1'; // -1 signifies to use the default setting.
+ $style = isset($this->display->panel_settings[$pid]['style']) ? $this->display->panel_settings[$pid]['style'] : '-1';
+ // -1 signifies to use the default setting.
$title = t('Panel style for region "!region"', array('!region' => $this->plugins['layout']['regions'][$pid]));
break;
@@ -1032,7 +1034,7 @@ class panels_renderer_editor extends panels_renderer_standard {
}
// If there's no settings form, just change the style and exit.
- switch($type) {
+ switch ($type) {
case 'display':
$this->display->panel_settings['style'] = $form_state['style'];
if (isset($this->display->panel_settings['style_settings']['default'])) {
@@ -1062,7 +1064,7 @@ class panels_renderer_editor extends panels_renderer_standard {
if ($type == 'pane') {
$this->command_update_pane($pane);
}
- else if ($type == 'region') {
+ elseif ($type == 'region') {
$this->command_update_region_links($pid);
}
else {
@@ -1075,7 +1077,7 @@ class panels_renderer_editor extends panels_renderer_standard {
panels_edit_cache_set($this->cache);
}
- // send them to next form.
+ // Send them to next form.
return $this->ajax_style_settings($type, $pid);
}
}
@@ -1214,11 +1216,11 @@ class panels_renderer_editor extends panels_renderer_standard {
}
// Copy settings from form state back into the cache.
- if(!empty($form_state['values']['settings'])) {
+ if (!empty($form_state['values']['settings'])) {
if ($type == 'pane') {
$this->cache->display->content[$pid]->style['settings'] = $form_state['values']['settings'];
}
- else if($type == 'region') {
+ elseif ($type == 'region') {
$this->cache->display->panel_settings['style_settings'][$pid] = $form_state['values']['settings'];
}
}
@@ -1230,7 +1232,7 @@ class panels_renderer_editor extends panels_renderer_standard {
if ($type == 'pane') {
$this->command_update_pane($pane);
}
- else if ($type == 'region') {
+ elseif ($type == 'region') {
$this->command_update_region_links($pid);
}
else {
@@ -1354,12 +1356,12 @@ class panels_renderer_editor extends panels_renderer_standard {
$output = ctools_modal_form_wrapper('panels_edit_add_access_test_form', $form_state);
if (!empty($form_state['executed'])) {
- // Set up the plugin in cache
+ // Set up the plugin in cache.
$plugin = ctools_get_access_plugin($form_state['values']['type']);
$this->cache->new_plugin = ctools_access_new_test($plugin);
panels_edit_cache_set($this->cache);
- // go to the next step.
+ // Go to the next step.
return $this->ajax_access_configure_test($pid, 'add');
}
@@ -1387,7 +1389,7 @@ class panels_renderer_editor extends panels_renderer_standard {
$pane->access['plugins'][] = $this->cache->new_plugin;
$id = max(array_keys($pane->access['plugins']));
}
- else if (empty($pane->access['plugins'][$id])) {
+ elseif (empty($pane->access['plugins'][$id])) {
ctools_modal_render(t('Error'), t('Invalid test id.'));
}
@@ -1407,7 +1409,7 @@ class panels_renderer_editor extends panels_renderer_standard {
return;
}
- // Unset the new plugin
+ // Unset the new plugin.
if (isset($this->cache->new_plugin)) {
unset($this->cache->new_plugin);
}
@@ -1483,7 +1485,6 @@ class panels_renderer_editor extends panels_renderer_standard {
//
// These are used to make sure that child implementations can control their
// own AJAX commands as needed.
-
/**
* Create a command array to redraw a pane.
*/
@@ -1527,6 +1528,7 @@ class panels_renderer_editor extends panels_renderer_standard {
function command_update_region_links($id) {
$this->commands[] = ajax_command_replace('.panels-region-links-' . $id, $this->get_region_links($id));
}
+
}
/**
@@ -1559,10 +1561,9 @@ function panels_ajax_edit_pane_cancel(&$form_state) {
}
// --------------------------------------------------------------------------
-// Forms for the editor object
-
+// Forms for the editor object.
/**
- * Choose cache method form
+ * Choose cache method form.
*/
function panels_edit_cache_method_form($form, &$form_state) {
ctools_form_include($form_state, 'plugins', 'panels');
@@ -1612,7 +1613,7 @@ function panels_edit_cache_method_form_submit($form, &$form_state) {
}
/**
- * Cache settings form
+ * Cache settings form.
*/
function panels_edit_cache_settings_form($form, &$form_state) {
ctools_form_include($form_state, 'plugins', 'panels');
@@ -1674,7 +1675,7 @@ function panels_edit_cache_settings_form_submit($form, &$form_state) {
}
/**
- * Choose style form
+ * Choose style form.
*/
function panels_edit_style_type_form($form, &$form_state) {
ctools_form_include($form_state, 'plugins', 'panels');
@@ -1726,7 +1727,7 @@ function panels_edit_style_type_form_submit($form, &$form_state) {
}
/**
- * Style settings form
+ * Style settings form.
*/
function panels_edit_style_settings_form($form, &$form_state) {
ctools_form_include($form_state, 'plugins', 'panels');
@@ -1755,7 +1756,6 @@ function panels_edit_style_settings_form($form, &$form_state) {
'#value' => t('Save'),
);
-
// Need a cancel button since the style cache can persist and impact the wrong
// pane (or region, or display).
$form['cancel_style'] = array(
@@ -2038,7 +2038,7 @@ function panels_edit_configure_access_test_form($form, &$form_state) {
}
/**
- * Validate handler for visibility rule settings
+ * Validate handler for visibility rule settings.
*/
function panels_edit_configure_access_test_form_validate(&$form, &$form_state) {
if (!empty($form_state['clicked_button']['#remove'])) {
@@ -2051,7 +2051,7 @@ function panels_edit_configure_access_test_form_validate(&$form, &$form_state) {
}
/**
- * Submit handler for visibility rule settings
+ * Submit handler for visibility rule settings.
*/
function panels_edit_configure_access_test_form_submit(&$form, &$form_state) {
if (!empty($form_state['clicked_button']['#remove'])) {
@@ -2069,4 +2069,3 @@ function panels_edit_configure_access_test_form_submit(&$form, &$form_state) {
}
$form_state['test']['not'] = !empty($form_state['values']['not']);
}
-
diff --git a/plugins/display_renderers/panels_renderer_simple.class.php b/plugins/display_renderers/panels_renderer_simple.class.php
index a4779b8..deff976 100644
--- a/plugins/display_renderers/panels_renderer_simple.class.php
+++ b/plugins/display_renderers/panels_renderer_simple.class.php
@@ -23,10 +23,11 @@ class panels_renderer_simple extends panels_renderer_standard {
}
function render_panes() {
- // NOP
+ // NOP.
}
function prepare($external_settings = NULL) {
$this->prep_run = TRUE;
}
+
}
diff --git a/plugins/display_renderers/panels_renderer_standard.class.php b/plugins/display_renderers/panels_renderer_standard.class.php
index 58a72ee..88ac1df 100644
--- a/plugins/display_renderers/panels_renderer_standard.class.php
+++ b/plugins/display_renderers/panels_renderer_standard.class.php
@@ -1,6 +1,10 @@
<?php
/**
+ * @file
+ */
+
+/**
* The standard render pipeline for a Panels display object.
*
* Given a fully-loaded panels_display object, this class will turn its
@@ -48,6 +52,9 @@
* with some exceptions (@see panels_renderer_legacy for details). The approach
* here differs primarily in its friendliness to tweaking in subclasses.
*/
+/**
+ *
+ */
class panels_renderer_standard {
/**
* The fully-loaded Panels display object that is to be rendered. "Fully
@@ -209,9 +216,9 @@ class panels_renderer_standard {
* method via parent::prepare(), or manually set $this->prep_run = TRUE.
*
* @param mixed $external_settings
- * An optional parameter allowing external code to pass in additional
- * settings for use in the preparation process. Not used in the default
- * renderer, but included for interface consistency.
+ * An optional parameter allowing external code to pass in additional
+ * settings for use in the preparation process. Not used in the default
+ * renderer, but included for interface consistency.
*/
function prepare($external_settings = NULL) {
$this->prepare_panes($this->display->content);
@@ -232,22 +239,24 @@ class panels_renderer_standard {
* regularly make additions to the set of panes that will be rendered.
*
* @param array $panes
- * An associative array of pane data (stdClass objects), keyed on pane id.
+ * An associative array of pane data (stdClass objects), keyed on pane id.
+ *
* @return array
* An associative array of panes to be rendered, keyed on pane id and sorted
* into proper rendering order.
*/
function prepare_panes($panes) {
ctools_include('content');
- // Use local variables as writing to them is very slightly faster
+ // Use local variables as writing to them is very slightly faster.
$first = $normal = $last = array();
- // Prepare the list of panes to be rendered
+ // Prepare the list of panes to be rendered.
foreach ($panes as $pid => $pane) {
if (empty($this->admin)) {
- // TODO remove in 7.x and ensure the upgrade path weeds out any stragglers; it's been long enough
- $pane->shown = !empty($pane->shown); // guarantee this field exists.
- // If this pane is not visible to the user, skip out and do the next one
+ // TODO remove in 7.x and ensure the upgrade path weeds out any stragglers; it's been long enough.
+ $pane->shown = !empty($pane->shown);
+ // Guarantee this field exists.
+ // If this pane is not visible to the user, skip out and do the next one.
if (!$pane->shown || !panels_pane_access($pane, $this->display)) {
continue;
}
@@ -272,7 +281,7 @@ class panels_renderer_standard {
// If it wants to render first, add it to the $first array. This is used
// by panes that need to do some processing before other panes are
// rendered.
- else if (!empty($content_type['render first'])) {
+ elseif (!empty($content_type['render first'])) {
$first[$pid] = $pane;
}
// Otherwise, render it in the normal order.
@@ -318,6 +327,7 @@ class panels_renderer_standard {
* @param array $settings
* All known region style settings, including both the top-level display's
* settings (if any) and all region-specific settings (if any).
+ *
* @return array
* An array of regions prepared for rendering.
*/
@@ -497,9 +507,10 @@ class panels_renderer_standard {
case 'standard':
drupal_add_css($filename);
break;
+
case 'inline':
$url = base_path() . $filename;
- $this->prefix .= '<link type="text/css" rel="stylesheet" href="' . file_create_url($url) . '" />'."\n";
+ $this->prefix .= '<link type="text/css" rel="stylesheet" href="' . file_create_url($url) . '" />' . "\n";
break;
}
}
@@ -533,8 +544,8 @@ class panels_renderer_standard {
* an individual pane can be bubbled up to take over the title for the entire
* display.
*
- * @param stdClass $pane
- * A Panels pane object, as loaded from the database.
+ * @param object $pane
+ * A Panels pane object, as loaded from the database.
*/
function render_pane(&$pane) {
module_invoke_all('panels_pane_prerender', $pane);
@@ -567,7 +578,7 @@ class panels_renderer_standard {
}
}
- // fallback
+ // Fallback.
return theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $this->display));
}
}
@@ -578,8 +589,9 @@ class panels_renderer_standard {
* This method retrieves pane content and produces a ready-to-render content
* object. It also manages pane-specific caching.
*
- * @param stdClass $pane
+ * @param object $pane
* A Panels pane object, as loaded from the database.
+ *
* @return stdClass $content
* A renderable object, containing a subject, content, etc. Based on the
* renderable objects used by the block system.
@@ -693,4 +705,5 @@ class panels_renderer_standard {
$output = theme($style['render region'], array('display' => $this->display, 'owner_id' => $owner_id, 'panes' => $panes, 'settings' => $style_settings, 'region_id' => $region_id, 'style' => $style));
return $output;
}
+
}
diff --git a/plugins/display_renderers/simple.inc b/plugins/display_renderers/simple.inc
index a370216..b3b8fb5 100644
--- a/plugins/display_renderers/simple.inc
+++ b/plugins/display_renderers/simple.inc
@@ -1,5 +1,6 @@
<?php
/**
+ * @file
* Create a simple renderer plugin that renders a layout but the content is
* already rendered, not in panes.
*/
diff --git a/plugins/display_renderers/standard.inc b/plugins/display_renderers/standard.inc
index 2e86b31..eea986d 100644
--- a/plugins/display_renderers/standard.inc
+++ b/plugins/display_renderers/standard.inc
@@ -1,5 +1,9 @@
<?php
+/**
+ * @file
+ */
+
$plugin = array(
'renderer' => 'panels_renderer_standard',
);
diff --git a/plugins/export_ui/panels_layouts.inc b/plugins/export_ui/panels_layouts.inc
index 20bf44d..6fc8de3 100644
--- a/plugins/export_ui/panels_layouts.inc
+++ b/plugins/export_ui/panels_layouts.inc
@@ -1,5 +1,9 @@
<?php
+/**
+ * @file
+ */
+
$plugin = array(
'schema' => 'panels_layout',
'access' => 'administer panels layouts',
@@ -20,4 +24,3 @@ $plugin = array(
'class' => 'panels_layouts_ui',
),
);
-
diff --git a/plugins/export_ui/panels_layouts_ui.class.php b/plugins/export_ui/panels_layouts_ui.class.php
index 0716125..bb32f28 100644
--- a/plugins/export_ui/panels_layouts_ui.class.php
+++ b/plugins/export_ui/panels_layouts_ui.class.php
@@ -4,7 +4,6 @@
* @file
* Contains the administrative UI for reusable layouts.
*/
-
class panels_layouts_ui extends ctools_export_ui {
var $lipsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam egestas congue nibh, vel dictum ante posuere vitae. Cras gravida massa tempor metus eleifend sed elementum tortor scelerisque. Vivamus egestas, tortor quis luctus tristique, sem velit adipiscing risus, et tempus enim felis in massa. Morbi viverra, nisl quis rhoncus imperdiet, turpis massa vestibulum turpis, egestas faucibus nibh metus vel nunc. In hac habitasse platea dictumst. Nunc sit amet nisi quis ipsum tincidunt semper. Donec ac urna enim, et placerat arcu. Morbi eu laoreet justo. Nullam nec velit eu neque mattis pulvinar sed non libero. Sed sed vulputate erat. Fusce sit amet dui nibh.";
@@ -18,7 +17,7 @@ class panels_layouts_ui extends ctools_export_ui {
// Change the item to a tab on the Panels page.
$this->plugin['menu']['items']['list callback']['type'] = MENU_LOCAL_TASK;
- // Establish a base for adding plugins
+ // Establish a base for adding plugins.
$base = $this->plugin['menu']['items']['add'];
// Remove the default 'add' menu item.
unset($this->plugin['menu']['items']['add']);
@@ -27,7 +26,7 @@ class panels_layouts_ui extends ctools_export_ui {
$this->builders = panels_get_layout_builders();
asort($this->builders);
foreach ($this->builders as $name => $builder) {
- // Create a new menu item for the builder
+ // Create a new menu item for the builder.
$item = $base;
$item['title'] = !empty($builder['builder tab title']) ? $builder['builder tab title'] : 'Add ' . $builder['title'];
$item['page arguments'][] = $name;
@@ -195,23 +194,28 @@ class panels_layouts_ui extends ctools_export_ui {
}
function list_build_row($item, &$form_state, $operations) {
- // Set up sorting
+ // Set up sorting.
switch ($form_state['values']['order']) {
case 'disabled':
$this->sorts[$item->name] = empty($item->disabled) . $item->admin_title;
break;
+
case 'title':
$this->sorts[$item->name] = $item->admin_title;
break;
+
case 'name':
$this->sorts[$item->name] = $item->name;
break;
+
case 'category':
$this->sorts[$item->name] = ($item->category ? $item->category : t('Miscellaneous')) . $item->admin_title;
break;
+
case 'plugin':
$this->sorts[$item->name] = $item->plugin;
break;
+
case 'storage':
$this->sorts[$item->name] = $item->type . $item->admin_title;
break;
@@ -244,4 +248,5 @@ class panels_layouts_ui extends ctools_export_ui {
array('data' => t('Operations'), 'class' => array('ctools-export-ui-operations')),
);
}
+
}
diff --git a/plugins/layouts/flexible/flexible-admin.css b/plugins/layouts/flexible/flexible-admin.css
index 744e46e..8445050 100644
--- a/plugins/layouts/flexible/flexible-admin.css
+++ b/plugins/layouts/flexible/flexible-admin.css
@@ -1,4 +1,3 @@
-
#panels-dnd-main .panel-flexible-edit-layout div.panels-display .pane-add-link,
.panel-flexible-edit-layout .panel-pane {
display: none;
@@ -54,8 +53,8 @@
float: left;
margin-left: -7px;
margin-right: -6px;
- cursor: e-resize; /* in case col-resize isn't supported */
- cursor: col-resize;
+ cursor: e-resize; /* in case col-resize isn't supported */
+ cursor: col-resize;
height: 30px;
position: relative;
z-index: 1;
@@ -84,4 +83,3 @@
#panels-edit-display .helperclass {
margin: .5em;
}
-
diff --git a/plugins/layouts/flexible/flexible.css b/plugins/layouts/flexible/flexible.css
index 0d1fbe6..ce7f420 100644
--- a/plugins/layouts/flexible/flexible.css
+++ b/plugins/layouts/flexible/flexible.css
@@ -1,4 +1,3 @@
-
.panel-flexible .panel-separator {
margin: 0 0 1em 0;
}
diff --git a/plugins/layouts/flexible/flexible.inc b/plugins/layouts/flexible/flexible.inc
index 4cdb216..93bc4e7 100644
--- a/plugins/layouts/flexible/flexible.inc
+++ b/plugins/layouts/flexible/flexible.inc
@@ -1,9 +1,14 @@
<?php
/**
- * Implementation of hook_panels_layouts()
+ * @file
+ * Flexible layout plugin.
*/
-// Plugin definition
+
+/**
+ * Implementation of hook_panels_layouts().
+ */
+// Plugin definition.
$plugin = array(
'title' => t('Flexible'),
'category' => t('Builders'),
@@ -18,14 +23,13 @@ $plugin = array(
'regions function' => 'panels_flexible_panels',
'hook menu' => 'panels_flexible_menu',
- // Reuisable layout Builder specific directives
+ // Reusable layout Builder specific directives.
'builder' => TRUE,
- 'builder tab title' => 'Add flexible layout', // menu so translated elsewhere
-
+ 'builder tab title' => 'Add flexible layout',
'get child' => 'panels_flexible_get_sublayout',
'get children' => 'panels_flexible_get_sublayouts',
- // Define ajax callbacks
+ // Define ajax callbacks.
'ajax' => array(
'settings' => 'panels_ajax_flexible_edit_settings',
'add' => 'panels_ajax_flexible_edit_add',
@@ -79,9 +83,16 @@ function panels_flexible_get_sublayouts($plugin, $layout_name) {
}
/**
+ * Flexible panel settings converter.
+ *
* Convert settings from old style to new, or provide defaults for
* empty settings.
- * @param <type> $settings
+ *
+ * @param array $settings
+ * Drupal settings for the layout.
+ *
+ * @return null
+ * Nothing to return.
*/
function panels_flexible_convert_settings(&$settings, &$layout) {
// This indicates that this is a layout that they used the checkbox
@@ -99,7 +110,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
}
if (empty($settings)) {
- // set up a default
+ // Set up a default.
$settings = array(
'items' => array(
// The 'canvas' is a special row that does not get rendered
@@ -133,7 +144,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
),
);
}
- else if (!isset($settings['items'])) {
+ elseif (!isset($settings['items'])) {
// Convert an old style flexible to a new style flexible.
$old = $settings;
$settings = array();
@@ -143,7 +154,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
'children' => array(),
'parent' => NULL,
);
- // add the left sidebar column, row and region if it exists.
+ // Add the left sidebar column, row and region if it exists.
if (!empty($old['sidebars']['left'])) {
$settings['items']['canvas']['children'][] = 'sidebar-left';
$settings['items']['sidebar-left'] = array(
@@ -205,28 +216,28 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
// Add rows and regions.
for ($row = 1; $row <= intval($old['rows']); $row++) {
- // Create entry for the row
+ // Create entry for the row:
$settings['items']["row_$row"] = array(
'type' => 'row',
'contains' => 'region',
'children' => array(),
'parent' => 'main',
);
- // Add the row to the parent's children
+ // Add the row to the parent's children:
$settings['items']['main']['children'][] = "row_$row";
for ($col = 1; $col <= intval($old["row_$row"]['columns']); $col++) {
- // Create entry for the region
+ // Create entry for the region:
$settings['items']["row_${row}_$col"] = array(
'type' => 'region',
'width' => $old["row_$row"]["width_$col"],
'width_type' => '%',
'parent' => "row_$row",
);
- // Add entry for the region to the row's children
+ // Add entry for the region to the row's children:
$settings['items']["row_$row"]['children'][] = "row_${row}_$col";
- // Apply the proper title to the region
+ // Apply the proper title to the region:
if (!empty($old["row_$row"]['names'][$col - 1])) {
$settings['items']["row_${row}_$col"]['title'] = $old["row_$row"]['names'][$col - 1];
}
@@ -236,7 +247,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
}
}
}
- else if (isset($settings['canvas'])) {
+ elseif (isset($settings['canvas'])) {
// Convert the old 'canvas' to the new canvas row.
$settings['items']['canvas'] = array(
'type' => 'row',
@@ -259,7 +270,7 @@ function panels_flexible_panels($display, $settings, $layout) {
if (!isset($item['type'])) {
unset($items[$id]);
}
- else if ($item['type'] == 'region') {
+ elseif ($item['type'] == 'region') {
$items[$id] = $item['title'];
}
}
@@ -276,13 +287,13 @@ function panels_flexible_panels($display, $settings, $layout) {
* @todo Convert the functions to methods and make this properly OO.
*/
function panels_flexible_create_renderer($admin, $css_id, $content, $settings, &$display, $layout, $handler) {
- $renderer = new stdClass;
+ $renderer = new stdClass();
$renderer->settings = $settings;
$renderer->content = $content;
$renderer->css_id = $css_id;
$renderer->did = &$display->did;
if ($admin) {
- // always scale in admin mode.
+ // Always scale in admin mode.
$renderer->scale_base = 99.0;
}
else {
@@ -325,7 +336,6 @@ function panels_flexible_create_renderer($admin, $css_id, $content, $settings, &
$renderer->row_separation = !empty($settings['items']['canvas']['row_separation']) ? $settings['items']['canvas']['row_separation'] : '0.5em';
// Make some appended classes so it's easier to reference them.
-
$renderer->base['column'] = $renderer->item_class['column'] . '-' . $renderer->base_class;
$renderer->base['row'] = $renderer->item_class['row'] . '-' . $renderer->base_class;
$renderer->base['region'] = $renderer->item_class['region'] . '-' . $renderer->base_class;
@@ -386,7 +396,7 @@ function theme_panels_flexible($vars) {
}
// Also store the CSS on the display in case the live preview or something
- // needs it
+ // needs it.
$display->add_css = $css;
$output = "<div class=\"panel-flexible " . $renderer->base['canvas'] . " clearfix\" $renderer->id_str>\n";
@@ -394,7 +404,7 @@ function theme_panels_flexible($vars) {
$output .= panels_flexible_render_items($renderer, $settings['items']['canvas']['children'], $renderer->base['canvas']);
- // Wrap the whole thing up nice and snug
+ // Wrap the whole thing up nice and snug.
$output .= "</div>\n</div>\n";
return $output;
@@ -443,7 +453,7 @@ function theme_panels_flexible_admin($vars) {
$content = panels_flexible_render_items($renderer, $settings['items']['canvas']['children'], $renderer->base['row'] . '-canvas');
$output .= panels_flexible_render_item($renderer, $settings['items']['canvas'], $content, 'canvas', 0, 0, TRUE);
- // Wrap the whole thing up nice and snug
+ // Wrap the whole thing up nice and snug.
$output .= "</div>\n</div>\n";
drupal_add_js($layout['path'] . '/flexible-admin.js');
@@ -464,7 +474,7 @@ function panels_flexible_render_items($renderer, $list, $owner_id) {
$item = $renderer->settings['items'][$id];
$location = isset($renderer->positions[$id]) ? $renderer->positions[$id] : 'middle';
- if ($renderer->admin && $item['type'] != 'row' && $prev ) {
+ if ($renderer->admin && $item['type'] != 'row' && $prev) {
$groups[$location] .= panels_flexible_render_splitter($renderer, $prev, $id);
}
@@ -475,12 +485,14 @@ function panels_flexible_render_items($renderer, $list, $owner_id) {
$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);
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':
if (empty($renderer->settings['items'][$id]['hide_empty'])) {
$content = isset($renderer->content[$id]) ? $renderer->content[$id] : "&nbsp;";
@@ -611,7 +623,7 @@ function panels_flexible_render_splitter($renderer, $left_id, $right_id) {
$output = '<div tabindex="0"
class="panels-flexible-splitter flexible-splitter-for-' . $left_class . '">';
- // Name the left object
+ // Name the left object:
$output .= '<span class="panels-flexible-splitter-left">';
$output .= '.' . $left_class;
$output .= '</span>';
@@ -632,7 +644,7 @@ function panels_flexible_render_splitter($renderer, $left_id, $right_id) {
$output .= $left['width_type'];
$output .= '</span>';
- // Name the right object
+ // Name the right object:
$output .= '<span class="panels-flexible-splitter-right">';
$output .= '.' . $right_class;
$output .= '</span>';
@@ -677,7 +689,7 @@ function panels_flexible_render_item_links($renderer, $id, $item) {
$add2 = t('Add row to bottom');
}
}
- else if ($item['type'] == 'row') {
+ elseif ($item['type'] == 'row') {
if ($id == 'canvas') {
$title = t('Canvas');
$settings = t('Canvas settings');
@@ -697,7 +709,7 @@ function panels_flexible_render_item_links($renderer, $id, $item) {
$add2 = $item['contains'] == 'region' ? t('Add region to right') : t('Add column to right');
}
}
- else if ($item['type'] == 'region') {
+ elseif ($item['type'] == 'region') {
$title = t('Region');
$settings = t('Region settings');
$remove = t('Remove region');
@@ -757,7 +769,7 @@ function panels_flexible_render_css($renderer) {
function panels_flexible_render_css_group($renderer, $list, $owner_id, $type, $id) {
$css = array();
- // Start off with some generic CSS to properly pad regions
+ // Start off with some generic CSS to properly pad regions.
$css[$owner_id . ' .' . $renderer->item_class['region']] = array(
'padding' => '0',
);
@@ -792,7 +804,7 @@ function panels_flexible_render_css_group($renderer, $list, $owner_id, $type, $i
'padding-right' => '0',
);
- // And properly pad rows too
+ // And properly pad rows too:
$css[$owner_id . ' .' . $renderer->item_class['row']] = array(
'padding' => '0 0 ' . $renderer->row_separation . ' 0',
'margin' => '0',
@@ -818,7 +830,6 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
if ($type != 'row') {
// Go through our items and break up into right/center/right groups so we
// can figure out our offsets.
-
// right == any items on the right that are 'fixed'.
// middle == all fluid items.
// right == any items on the right that are 'fixed'.
@@ -827,7 +838,7 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
$current = 'left';
foreach ($list as $id) {
if ($renderer->settings['items'][$id]['width_type'] == 'px') {
- // fixed
+ // Fixed:
if ($current == 'left') {
$left[] = $id;
$renderer->positions[$id] = 'left';
@@ -841,14 +852,14 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
}
}
else {
- // fluid
+ // Fluid:
if ($current != 'right') {
$current = 'middle';
$middle[] = $id;
$renderer->positions[$id] = 'middle';
$middle_total += $renderer->settings['items'][$id]['width'];
}
- // fall through: if current is 'right' and we ran into a 'fluid' then
+ // Fall through: if current is 'right' and we ran into a 'fluid' then
// it gets *dropped* because that is invalid.
}
}
@@ -903,7 +914,7 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
$css["$owner_id-inside"]['padding-left'] = '0px';
if ($renderer->admin || count($middle)) {
$css["$owner_id-middle"]['margin-left'] = $left_total . 'px';
- // IE hack
+ // IE hack!
$css["* html $owner_id-left"]['left'] = $left_total . "px";
// Make this one very specific to the admin CSS so that preview
// does not stomp it.
@@ -912,7 +923,7 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
else {
$css["$owner_id-inside"]['margin-left'] = '-' . $left_total . 'px';
$css["$owner_id-inside"]['padding-left'] = $left_total . 'px';
- // IE hack
+ // IE hack!
$css["* html $owner_id-inside"]['left'] = $left_total . "px";
}
}
@@ -958,8 +969,10 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
/**
* AJAX responder to edit flexible settings for an item.
*
- * $handler object
+ * @param object $handler
* The display renderer handler object.
+ * @param mixed $id
+ * Id for the panel.
*/
function panels_ajax_flexible_edit_settings($handler, $id) {
$settings = &$handler->display->layout_settings;
@@ -976,11 +989,11 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
$siblings = $settings['items'][$item['parent']]['children'];
}
-
switch ($item['type']) {
case 'column':
$title = t('Configure column');
break;
+
case 'row':
if ($id == 'canvas') {
$title = t('Configure canvas');
@@ -989,6 +1002,7 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
$title = t('Configure row');
}
break;
+
case 'region':
$title = t('Configure region');
break;
@@ -1026,9 +1040,9 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
$output[] = ajax_command_replace('.flexible-links-' . $id,
panels_flexible_render_item_links($renderer, $id, $item));
- // If editing the canvas, reset the CSS width
+ // If editing the canvas, reset the CSS width.
if ($id == 'canvas') {
- // update canvas CSS.
+ // Update canvas CSS.
$css = array(
'.' . $renderer->item_class['column'] . '-inside' => array(
'padding-left' => $renderer->column_separation,
@@ -1061,9 +1075,6 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
/**
* Configure a row, column or region on the flexible page.
- *
- * @param <type> $form_state
- * @return <type>
*/
function panels_flexible_config_item_form($form, &$form_state) {
$display = &$form_state['display'];
@@ -1162,8 +1173,9 @@ function panels_flexible_config_item_form($form, &$form_state) {
if ($sibling == $id) {
$current = 'right';
}
- else if ($settings['items'][$sibling]['width_type'] == '%') {
- $$current = TRUE; // Indirection.
+ elseif ($settings['items'][$sibling]['width_type'] == '%') {
+ // Indirection.
+ $$current = TRUE;
}
}
@@ -1234,7 +1246,7 @@ function panels_flexible_config_item_form_submit(&$form, &$form_state) {
$item['region_separation'] = $form_state['values']['region_separation'];
$item['row_separation'] = $form_state['values']['row_separation'];
}
- else if ($item['type'] != 'row') {
+ elseif ($item['type'] != 'row') {
$item['width_type'] = $form_state['values']['width_type'];
}
else {
@@ -1270,6 +1282,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
'parent' => $id,
);
break;
+
case 'row':
switch ($parent['contains']) {
case 'region':
@@ -1282,6 +1295,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
'parent' => $id,
);
break;
+
case 'column':
$title = $location == 'left' ? t('Add column to left') : t('Add column to right');
$item = array(
@@ -1295,6 +1309,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
}
// Create the new item with defaults.
break;
+
case 'region':
// Cannot add items to regions.
break;
@@ -1344,8 +1359,8 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
}
- // render the item
- $parent_class = $renderer->base[$parent['type']] . '-' . $id;
+ // Render the item.
+ $parent_class = $renderer->base[$parent['type']] . '-' . $id;
$item_output = panels_flexible_render_item($renderer, $item, $content, $form_state['key'], 0, 0, $item['type'] == 'row');
// Get all the CSS necessary for the entire row (as width adjustments may
@@ -1364,22 +1379,24 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
$item_output .= panels_flexible_render_splitter($renderer, $form_state['key'], $form_state['sibling']);
$output[] = ajax_command_prepend('#panels-dnd-main .' . $parent_class . '-left', $item_output);
}
- else if ($location == 'right') {
+ elseif ($location == 'right') {
// If we are adding to the right side of the left box, there is
// a splitter that we have to remove; then we add our box normally,
// and then add a new splitter for just our guy.
$output[] = ajax_command_remove('panels-flexible-splitter-for-' . $renderer->base[$item['type']] . '-' . $form_state['key']);
- $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
+ $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
$item_output .= panels_flexible_render_splitter($renderer, $form_state['key'], NULL);
$output[] = ajax_command_append('#panels-dnd-main .' . $parent_class . '-left', $item_output);
}
break;
+
case 'right':
if (!empty($form_state['sibling'])) {
- $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
+ $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
}
$output[] = ajax_command_append('#panels-dnd-main .' . $parent_class . '-right', $item_output);
break;
+
case 'middle':
if ($location == 'left') {
if (!empty($form_state['sibling'])) {
@@ -1389,7 +1406,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
}
else {
if (!empty($form_state['sibling'])) {
- $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
+ $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
}
$output[] = ajax_command_append('#panels-dnd-main .' . $parent_class . '-middle', $item_output);
}
@@ -1429,8 +1446,6 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
}
/**
* Form to add a row, column or region to a flexible layout.
- * @param <type> $form_state
- * @return <type>
*/
function panels_flexible_add_item_form($form, &$form_state) {
$display = &$form_state['display'];
@@ -1543,7 +1558,7 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
$item['hide_empty'] = $form_state['values']['hide_empty'];
if ($item['type'] == 'region') {
- // derive the region key from the title
+ // Derive the region key from the title.
$key = preg_replace("/[^a-z0-9]/", '_', drupal_strtolower($item['title']));
while (isset($settings['items'][$key])) {
$key .= '_';
@@ -1569,7 +1584,7 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
// If there is no sibling, or the sibling is of a different type,
// the default 100 will work for either fixed or fluid.
if ($form_state['sibling'] && $settings['items'][$form_state['sibling']]['width_type'] == $item['width_type']) {
- // steal half of the sibling's space.
+ // Steal half of the sibling's space.
$width = $settings['items'][$form_state['sibling']]['width'] / 2;
$settings['items'][$form_state['sibling']]['width'] = $width;
$item['width'] = $width;
@@ -1587,8 +1602,9 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
}
/**
- * AJAX responder to remove an existing row, column or region from a flexible
- * layout.
+ * Panels remove AJAX responder.
+ *
+ * Removes an existing row, column or region from a flexible layout.
*/
function panels_ajax_flexible_edit_remove($handler, $id) {
$settings = &$handler->display->layout_settings;
@@ -1602,10 +1618,8 @@ function panels_ajax_flexible_edit_remove($handler, $id) {
$css_id = isset($handler->display->css_id) ? $handler->display->css_id : '';
// Create a renderer object so we can render our new stuff.
$renderer = panels_flexible_create_renderer(TRUE, $css_id, array(), $settings, $handler->display, $handler->plugins['layout'], $handler);
-
-
$siblings = &$settings['items'][$item['parent']]['children'];
- $parent_class = '.' . $renderer->base[$settings['items'][$item['parent']]['type']] . '-' . $item['parent'];
+ $parent_class = '.' . $renderer->base[$settings['items'][$item['parent']]['type']] . '-' . $item['parent'];
// Find the offset of our array. This will also be the key because
// this is a simple array.
@@ -1627,7 +1641,7 @@ function panels_ajax_flexible_edit_remove($handler, $id) {
$settings['items'][$next]['width'] += $item['width'];
}
// If that failed, try the previous one.
- else if (isset($prev) && $settings['items'][$prev]['width_type'] == '%') {
+ elseif (isset($prev) && $settings['items'][$prev]['width_type'] == '%') {
$settings['items'][$prev]['width'] += $item['width'];
}
}
@@ -1687,8 +1701,7 @@ function panels_ajax_flexible_edit_remove($handler, $id) {
}
/**
- * AJAX responder to store resize information when the user adjusts the
- * splitter.
+ * AJAX responder to store resize information when the user adjusts splitter.
*/
function panels_ajax_flexible_edit_resize($handler) {
ctools_include('ajax');
diff --git a/plugins/layouts/onecol/onecol.css b/plugins/layouts/onecol/onecol.css
index 83f284a..70ff173 100644
--- a/plugins/layouts/onecol/onecol.css
+++ b/plugins/layouts/onecol/onecol.css
@@ -1,4 +1,3 @@
-
.panel-1col {
/* overflow: hidden; */
}
diff --git a/plugins/layouts/onecol/onecol.inc b/plugins/layouts/onecol/onecol.inc
index 4043566..b2335a7 100644
--- a/plugins/layouts/onecol/onecol.inc
+++ b/plugins/layouts/onecol/onecol.inc
@@ -1,9 +1,10 @@
<?php
/**
- * implementation of hook_panels_layouts()
+ * @file
+ * Implementation of hook_panels_layouts().
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('Single column'),
'category' => t('Columns: 1'),
diff --git a/plugins/layouts/onecol/panels-onecol.tpl.php b/plugins/layouts/onecol/panels-onecol.tpl.php
index 73ad5b8..04765d3 100644
--- a/plugins/layouts/onecol/panels-onecol.tpl.php
+++ b/plugins/layouts/onecol/panels-onecol.tpl.php
@@ -12,7 +12,7 @@
* $content['middle']: The only panel in the layout.
*/
?>
-<div class="panel-display panel-1col clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-1col clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<div class="panel-panel panel-col">
<div><?php print $content['middle']; ?></div>
</div>
diff --git a/plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php b/plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php
index 588e593..eca0359 100644
--- a/plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php
+++ b/plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php
@@ -14,7 +14,7 @@
* - $content['right']: Content in the right column.
*/
?>
-<div class="panel-display panel-3col clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<div class="panel-panel panel-col-first">
<div class="inside"><?php print $content['left']; ?></div>
</div>
diff --git a/plugins/layouts/threecol_25_50_25/threecol_25_50_25.css b/plugins/layouts/threecol_25_50_25/threecol_25_50_25.css
index 2bffe57..96ec6c6 100644
--- a/plugins/layouts/threecol_25_50_25/threecol_25_50_25.css
+++ b/plugins/layouts/threecol_25_50_25/threecol_25_50_25.css
@@ -1,32 +1,31 @@
-
-.panel-3col {
+.panel-3col {
/* overflow: hidden; */
}
-.panel-3col .panel-col-first {
- float: left;
- width: 25%;
+.panel-3col .panel-col-first {
+ float: left;
+ width: 25%;
}
-.panel-3col .panel-col-first .inside {
+.panel-3col .panel-col-first .inside {
margin: 0 .5em 1em 0;
}
-.panel-3col .panel-col {
- float: left;
- width: 50%;
+.panel-3col .panel-col {
+ float: left;
+ width: 50%;
}
-.panel-3col .panel-col .inside {
+.panel-3col .panel-col .inside {
margin: 0 .5em 1em .5em;
}
-.panel-3col .panel-col-last {
- float: left;
- width: 25%;
+.panel-3col .panel-col-last {
+ float: left;
+ width: 25%;
}
-.panel-3col .panel-col-last .inside {
+.panel-3col .panel-col-last .inside {
margin: 0 0 1em .5em;
}
diff --git a/plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc b/plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc
index 78ab682..138236a 100644
--- a/plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc
+++ b/plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc
@@ -1,9 +1,10 @@
<?php
/**
- * implementation of hook_panels_layouts
+ * @file
+ * Implementation of hook_panels_layouts.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('Three column 25/50/25'),
'category' => t('Columns: 3'),
@@ -14,7 +15,6 @@ $plugin = array(
'regions' => array(
'left' => t('Left side'),
'middle' => t('Middle column'),
- 'right' => t('Right side')
+ 'right' => t('Right side'),
),
);
-
diff --git a/plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php b/plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php
index 48aa523..f9d6422 100644
--- a/plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php
+++ b/plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php
@@ -17,7 +17,7 @@
* - $content['bottom']: Content in the bottom row.
*/
?>
-<div class="panel-display panel-3col-stacked clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col-stacked clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<?php if ($content['top']): ?>
<div class="panel-panel panel-col-top">
<div class="inside"><?php print $content['top']; ?></div>
diff --git a/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css b/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css
index c24dabf..0954fdc 100644
--- a/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css
+++ b/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css
@@ -1,11 +1,10 @@
-
-.panel-3col-stacked {
+.panel-3col-stacked {
/* overflow: hidden; */
}
.panel-3col-stacked .panel-col-top,
-.panel-3col-stacked .panel-col-bottom {
- width: 100%;
+.panel-3col-stacked .panel-col-bottom {
+ width: 100%;
clear: both;
}
@@ -13,30 +12,30 @@
margin-bottom: .5em;
}
-.panel-3col-stacked .panel-col-first {
- float: left;
- width: 25%;
+.panel-3col-stacked .panel-col-first {
+ float: left;
+ width: 25%;
}
-.panel-3col-stacked .panel-col-first .inside {
+.panel-3col-stacked .panel-col-first .inside {
margin: 0 .5em 1em .5em;
}
-.panel-3col-stacked .panel-col {
- float: left;
- width: 50%;
+.panel-3col-stacked .panel-col {
+ float: left;
+ width: 50%;
}
-.panel-3col-stacked .panel-col .inside {
+.panel-3col-stacked .panel-col .inside {
margin: 0 .5em 1em .5em;
}
-.panel-3col-stacked .panel-col-last {
- float: left;
- width: 25%;
+.panel-3col-stacked .panel-col-last {
+ float: left;
+ width: 25%;
}
-.panel-3col-stacked .panel-col-last .inside {
+.panel-3col-stacked .panel-col-last .inside {
margin: 0 0 1em .5em;
}
diff --git a/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc b/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc
index a5a450d..acee9f5 100644
--- a/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc
+++ b/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc
@@ -1,6 +1,9 @@
<?php
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
$plugin = array(
'title' => t('Three column 25/50/25 stacked'),
'category' => t('Columns: 3'),
diff --git a/plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php b/plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php
index 73a7437..8a065be 100644
--- a/plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php
+++ b/plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php
@@ -16,7 +16,7 @@
*/
?>
-<div class="panel-display panel-3col-33 clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col-33 clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<div class="panel-panel panel-col-first">
<div class="inside"><?php print $content['left']; ?></div>
</div>
diff --git a/plugins/layouts/threecol_33_34_33/threecol_33_34_33.css b/plugins/layouts/threecol_33_34_33/threecol_33_34_33.css
index da2d931..23de423 100644
--- a/plugins/layouts/threecol_33_34_33/threecol_33_34_33.css
+++ b/plugins/layouts/threecol_33_34_33/threecol_33_34_33.css
@@ -1,32 +1,31 @@
-
-.panel-3col-33 {
+.panel-3col-33 {
/* overflow: hidden; */
}
-.panel-3col-33 .panel-col-first {
- float: left;
- width: 33%;
+.panel-3col-33 .panel-col-first {
+ float: left;
+ width: 33%;
}
-.panel-3col-33 .panel-col-first .inside {
+.panel-3col-33 .panel-col-first .inside {
margin: 0 .5em 1em 0;
}
-.panel-3col-33 .panel-col {
- float: left;
- width: 33%;
+.panel-3col-33 .panel-col {
+ float: left;
+ width: 33%;
}
-.panel-3col-33 .panel-col .inside {
+.panel-3col-33 .panel-col .inside {
margin: 0 .5em 1em .5em;
}
-.panel-3col-33 .panel-col-last {
- float: left;
- width: 33%;
+.panel-3col-33 .panel-col-last {
+ float: left;
+ width: 33%;
}
-.panel-3col-33 .panel-col-last .inside {
+.panel-3col-33 .panel-col-last .inside {
margin: 0 0 1em .5em;
}
diff --git a/plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc b/plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc
index ea4809a..7e6e8c0 100644
--- a/plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc
+++ b/plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc
@@ -1,6 +1,9 @@
<?php
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
$plugin = array(
'title' => t('Three column 33/34/33'),
'category' => t('Columns: 3'),
@@ -10,6 +13,6 @@ $plugin = array(
'regions' => array(
'left' => t('Left side'),
'middle' => t('Middle column'),
- 'right' => t('Right side')
- ),
+ 'right' => t('Right side'),
+ ),
);
diff --git a/plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php b/plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php
index 276e2bf..3bfdffd 100644
--- a/plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php
+++ b/plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php
@@ -17,7 +17,7 @@
* - $content['bottom']: Content in the bottom row.
*/
?>
-<div class="panel-display panel-3col-33-stacked clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col-33-stacked clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<?php if ($content['top']): ?>
<div class="panel-panel panel-col-top">
<div class="inside"><?php print $content['top']; ?></div>
diff --git a/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css b/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css
index 57b87ee..531b0a9 100644
--- a/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css
+++ b/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css
@@ -1,11 +1,10 @@
-
-.panel-3col-33-stacked {
+.panel-3col-33-stacked {
/* overflow: hidden; */
}
.panel-3col-33-stacked .panel-col-top,
-.panel-3col-33-stacked .panel-col-bottom {
- width: 100%;
+.panel-3col-33-stacked .panel-col-bottom {
+ width: 100%;
clear: both;
}
@@ -13,30 +12,30 @@
margin-bottom: 1em;
}
-.panel-3col-33-stacked .panel-col-first {
- float: left;
- width: 33%;
+.panel-3col-33-stacked .panel-col-first {
+ float: left;
+ width: 33%;
}
-.panel-3col-33-stacked .panel-col-first .inside {
+.panel-3col-33-stacked .panel-col-first .inside {
margin: 0 .5em 1em 0;
}
-.panel-3col-33-stacked .panel-col {
- float: left;
- width: 33%;
+.panel-3col-33-stacked .panel-col {
+ float: left;
+ width: 33%;
}
-.panel-3col-33-stacked .panel-col .inside {
+.panel-3col-33-stacked .panel-col .inside {
margin: 0 .5em 1em .5em;
}
-.panel-3col-33-stacked .panel-col-last {
- float: left;
- width: 33%;
+.panel-3col-33-stacked .panel-col-last {
+ float: left;
+ width: 33%;
}
-.panel-3col-33-stacked .panel-col-last .inside {
+.panel-3col-33-stacked .panel-col-last .inside {
margin: 0 0 1em .5em;
}
diff --git a/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc b/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc
index 3ac011b..e9a9a17 100644
--- a/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc
+++ b/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc
@@ -1,6 +1,9 @@
<?php
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
$plugin = array(
'title' => t('Three column 33/34/33 stacked'),
'category' => t('Columns: 3'),
@@ -12,6 +15,6 @@ $plugin = array(
'left' => t('Left side'),
'middle' => t('Middle column'),
'right' => t('Right side'),
- 'bottom' => t('Bottom')
+ 'bottom' => t('Bottom'),
),
);
diff --git a/plugins/layouts/twocol/panels-twocol.tpl.php b/plugins/layouts/twocol/panels-twocol.tpl.php
index 2cda08e..64ecd7c 100644
--- a/plugins/layouts/twocol/panels-twocol.tpl.php
+++ b/plugins/layouts/twocol/panels-twocol.tpl.php
@@ -14,7 +14,7 @@
* - $content['right']: Content in the right column.
*/
?>
-<div class="panel-display panel-2col clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-2col clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<div class="panel-panel panel-col-first">
<div class="inside"><?php print $content['left']; ?></div>
</div>
diff --git a/plugins/layouts/twocol/twocol.css b/plugins/layouts/twocol/twocol.css
index 6e53eca..d077431 100644
--- a/plugins/layouts/twocol/twocol.css
+++ b/plugins/layouts/twocol/twocol.css
@@ -1,29 +1,28 @@
-
-.panel-2col {
+.panel-2col {
/* overflow: hidden; */
}
-.panel-2col .panel-col-first {
- float: left;
- width: 50%;
+.panel-2col .panel-col-first {
+ float: left;
+ width: 50%;
}
* html .panel-2col .panel-col-first {
width: 49.9%;
}
-.panel-2col .panel-col-first .inside {
+.panel-2col .panel-col-first .inside {
margin: 0 .5em 1em 0;
}
-.panel-2col .panel-col-last {
- float: left;
- width: 50%;
+.panel-2col .panel-col-last {
+ float: left;
+ width: 50%;
}
* html .panel-2col .panel-col-last {
width: 49.9%;
}
-.panel-2col .panel-col-last .inside {
+.panel-2col .panel-col-last .inside {
margin: 0 0 1em .5em;
}
diff --git a/plugins/layouts/twocol/twocol.inc b/plugins/layouts/twocol/twocol.inc
index 1faedca..47e5973 100644
--- a/plugins/layouts/twocol/twocol.inc
+++ b/plugins/layouts/twocol/twocol.inc
@@ -1,6 +1,9 @@
<?php
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
$plugin = array(
'title' => t('Two column'),
'category' => t('Columns: 2'),
@@ -9,6 +12,6 @@ $plugin = array(
'css' => 'twocol.css',
'regions' => array(
'left' => t('Left side'),
- 'right' => t('Right side')
+ 'right' => t('Right side'),
),
);
diff --git a/plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php b/plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php
index e626844..32016fc 100644
--- a/plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php
+++ b/plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php
@@ -22,7 +22,7 @@
* - $content['bottom']: Content in the bottom row.
*/
?>
-<div class="panel-display panel-2col-bricks clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-2col-bricks clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<div class="panel-panel panel-col-top">
<div class="inside"><?php print $content['top']; ?></div>
</div>
diff --git a/plugins/layouts/twocol_bricks/twocol_bricks.css b/plugins/layouts/twocol_bricks/twocol_bricks.css
index 4997ce6..083b34d 100644
--- a/plugins/layouts/twocol_bricks/twocol_bricks.css
+++ b/plugins/layouts/twocol_bricks/twocol_bricks.css
@@ -1,5 +1,4 @@
-
-.panel-2col-bricks {
+.panel-2col-bricks {
/* overflow: hidden; */
margin-top: 0;
padding-top: 0;
@@ -7,8 +6,8 @@
.panel-2col-bricks .panel-col-top,
.panel-2col-bricks .panel-col-middle,
-.panel-2col-bricks .panel-col-bottom {
- width: 99.9%;
+.panel-2col-bricks .panel-col-bottom {
+ width: 99.9%;
clear: both;
}
@@ -17,27 +16,27 @@
margin-bottom: .5em;
}
-.panel-2col-bricks .panel-col-first {
- float: left;
- width: 50%;
+.panel-2col-bricks .panel-col-first {
+ float: left;
+ width: 50%;
}
* html .panel-2col-bricks .panel-col-first {
width: 49.9%;
}
-.panel-2col-bricks .panel-col-first .inside {
+.panel-2col-bricks .panel-col-first .inside {
margin: 0 .5em .5em 0;
}
-.panel-2col-bricks .panel-col-last {
- float: left;
- width: 50%;
+.panel-2col-bricks .panel-col-last {
+ float: left;
+ width: 50%;
}
* html .panel-2col-bricks .panel-col-last {
width: 49.9%;
}
-.panel-2col-bricks .panel-col-last .inside {
+.panel-2col-bricks .panel-col-last .inside {
margin: 0 0 .5em .5em;
}
diff --git a/plugins/layouts/twocol_bricks/twocol_bricks.inc b/plugins/layouts/twocol_bricks/twocol_bricks.inc
index 0cb6f1a..dbf1a9e 100644
--- a/plugins/layouts/twocol_bricks/twocol_bricks.inc
+++ b/plugins/layouts/twocol_bricks/twocol_bricks.inc
@@ -2,10 +2,10 @@
/**
* @file
- * Implementation for the two column bricked layout
+ * Implementation for the two column bricked layout.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('Two column bricks'),
'category' => t('Columns: 2'),
@@ -22,4 +22,3 @@ $plugin = array(
'bottom' => t('Bottom'),
),
);
-
diff --git a/plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php b/plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php
index 901d27c..b9ba058 100644
--- a/plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php
+++ b/plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php
@@ -16,7 +16,7 @@
* - $content['bottom']: Content in the bottom row.
*/
?>
-<div class="panel-2col-stacked clearfix panel-display" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-2col-stacked clearfix panel-display" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
<?php if ($content['top']): ?>
<div class="panel-col-top panel-panel">
<div class="inside"><?php print $content['top']; ?></div>
diff --git a/plugins/layouts/twocol_stacked/twocol_stacked.css b/plugins/layouts/twocol_stacked/twocol_stacked.css
index 56eb3e3..c5a63bc 100644
--- a/plugins/layouts/twocol_stacked/twocol_stacked.css
+++ b/plugins/layouts/twocol_stacked/twocol_stacked.css
@@ -1,13 +1,12 @@
-
-.panel-2col-stacked {
+.panel-2col-stacked {
/* overflow: hidden; */
margin-top: 0;
padding-top: 0;
}
.panel-2col-stacked .panel-col-top,
-.panel-2col-stacked .panel-col-bottom {
- width: 99.9%;
+.panel-2col-stacked .panel-col-bottom {
+ width: 99.9%;
clear: both;
}
@@ -15,24 +14,24 @@
margin-bottom: .5em;
}
-.panel-2col-stacked .panel-col-first {
- float: left;
- width: 50%;
+.panel-2col-stacked .panel-col-first {
+ float: left;
+ width: 50%;
}
* html .panel-2col-stacked .panel-col-first {
width: 49.9%;
}
-.panel-2col-stacked .panel-col-first .inside {
+.panel-2col-stacked .panel-col-first .inside {
margin: 0 .5em 1em 0;
}
-.panel-2col-stacked .panel-col-last {
- float: left;
- width: 49.9%;
+.panel-2col-stacked .panel-col-last {
+ float: left;
+ width: 49.9%;
}
-.panel-2col-stacked .panel-col-last .inside {
+.panel-2col-stacked .panel-col-last .inside {
margin: 0 0 1em .5em;
}
diff --git a/plugins/layouts/twocol_stacked/twocol_stacked.inc b/plugins/layouts/twocol_stacked/twocol_stacked.inc
index 5916a15..8b6dc2b 100644
--- a/plugins/layouts/twocol_stacked/twocol_stacked.inc
+++ b/plugins/layouts/twocol_stacked/twocol_stacked.inc
@@ -1,6 +1,9 @@
<?php
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
$plugin = array(
'title' => t('Two column stacked'),
'category' => t('Columns: 2'),
@@ -11,6 +14,6 @@ $plugin = array(
'top' => t('Top'),
'left' => t('Left side'),
'right' => t('Right side'),
- 'bottom' => t('Bottom')
+ 'bottom' => t('Bottom'),
),
);
diff --git a/plugins/page_wizards/landing_page.inc b/plugins/page_wizards/landing_page.inc
index 030318f..33bb8c8 100644
--- a/plugins/page_wizards/landing_page.inc
+++ b/plugins/page_wizards/landing_page.inc
@@ -103,7 +103,7 @@ function panels_landing_page_basic($form, &$form_state) {
'#default_value' => $cache->admin_description,
);
- // path
+ // Path.
$form['path'] = array(
'#type' => 'textfield',
'#title' => t('Path'),
@@ -136,7 +136,7 @@ function panels_landing_page_basic($form, &$form_state) {
'#options' => menu_get_menus(),
'#default_value' => $cache->menu['name'],
'#process' => array('ctools_dependent_process'),
- '#dependency' => array('edit-menu-entry' => array(1)),
+ '#dependency' => array('edit-menu-entry' => array(1)),
);
}
else {
@@ -185,7 +185,7 @@ function panels_landing_page_basic_validate(&$form, &$form_state) {
form_error($form['path'], t('%, !, ?, #, or & cannot appear in the path.'));
}
- // Check to see if something is already using the path
+ // Check to see if something is already using the path.
$result = db_query("SELECT * FROM {menu_router} WHERE path = :path", array(':path' => $form_state['values']['path']))->fetch();
if ($result) {
form_error($form['path'], t('That path is already in use. This system cannot override existing paths.'));
@@ -256,7 +256,7 @@ function panels_landing_page_finish(&$form_state) {
$subtask->path = $cache->path;
$subtask->menu = $cache->menu;
- // Create the the panel context variant configured with our display
+ // Create the the panel context variant configured with our display.
$plugin = page_manager_get_task_handler('panel_context');
// Set the storage id.
@@ -274,7 +274,7 @@ function panels_landing_page_finish(&$form_state) {
page_manager_page_new_page_cache($subtask, $page);
page_manager_handler_add_to_page($page, $handler);
- // Save it
+ // Save it.
page_manager_save_page_cache($page);
// Send us to the new page immediately.
diff --git a/plugins/panels_storage/page_manager.inc b/plugins/panels_storage/page_manager.inc
index afb3aec..c88a443 100644
--- a/plugins/panels_storage/page_manager.inc
+++ b/plugins/panels_storage/page_manager.inc
@@ -5,7 +5,7 @@
* Provides a panels_storage plugin for page_manager.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'access callback' => 'page_manager_panels_storage_access',
);
diff --git a/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css b/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css
index 5a01336..2e34365 100644
--- a/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css
+++ b/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css
@@ -8,4 +8,3 @@
color: %header-text;
background-color: %header-background;
}
-
diff --git a/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css b/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css
index 86eea4a..c85e402 100644
--- a/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css
+++ b/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css
@@ -1,12 +1,16 @@
/* Show only to IE7 */
*:first-child+html .rounded-shadow-background,
/* Show only to IE6 */
-* html .rounded-shadow-background {
+* html .rounded-shadow-background {
margin: 0 -10px 0 0 !important;
padding: 10px 0 5px 0 !important;
}
-.rounded-shadow-top-edge, .rounded-shadow-bottom-edge, .rounded-shadow-left-edge, .rounded-shadow-right-edge, .rounded-shadow-wrap-corner {
+.rounded-shadow-top-edge,
+.rounded-shadow-bottom-edge,
+.rounded-shadow-left-edge,
+.rounded-shadow-right-edge,
+.rounded-shadow-wrap-corner {
position: relative;
/* hasLayout -1 ? For IE only */
zoom: 1;
@@ -88,7 +92,8 @@
}
%style .panel-pane {
- position: relative; top: -6px;
+ position: relative;
+ top: -6px;
}
/*
diff --git a/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc b/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc
index ff582ca..a471333 100644
--- a/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc
+++ b/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc
@@ -96,4 +96,3 @@ function panels_pane_rounded_shadow_style_base_build($plugin, $settings, &$css,
ctools_stylizer_font_apply_style($css, '%style .pane-content', $settings['text_font']);
ctools_stylizer_padding_apply_style($css, '%style', $settings['padding']);
}
-
diff --git a/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css b/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css
index 924a6bf..07b092e 100644
--- a/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css
+++ b/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css
@@ -1,12 +1,16 @@
/* Show only to IE7 */
*:first-child+html .rounded-shadow-background,
/* Show only to IE6 */
-* html .rounded-shadow-background {
+* html .rounded-shadow-background {
margin: 0 -10px 0 0 !important;
padding: 10px 0 5px 0 !important;
}
-.rounded-shadow-top-edge, .rounded-shadow-bottom-edge, .rounded-shadow-left-edge, .rounded-shadow-right-edge, .rounded-shadow-wrap-corner {
+.rounded-shadow-top-edge,
+.rounded-shadow-bottom-edge,
+.rounded-shadow-left-edge,
+.rounded-shadow-right-edge,
+.rounded-shadow-wrap-corner {
position: relative;
/* hasLayout -1 ? For IE only */
zoom: 1;
diff --git a/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc b/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc
index b73da90..9eb353a 100644
--- a/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc
+++ b/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc
@@ -68,4 +68,3 @@ function panels_region_rounded_shadow_style_base_build($plugin, $settings, &$css
ctools_stylizer_font_apply_style($css, '%style', $settings['font']);
ctools_stylizer_padding_apply_style($css, '%style', $settings['padding']);
}
-
diff --git a/plugins/styles/block.inc b/plugins/styles/block.inc
index 58815a3..e1ec432 100644
--- a/plugins/styles/block.inc
+++ b/plugins/styles/block.inc
@@ -5,7 +5,7 @@
* Definition of the 'block' panel style.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('System block'),
'description' => t('Display the pane as a system block; this is more restrictive than the default.'),
@@ -56,4 +56,3 @@ function theme_panels_block_style_render_pane($vars) {
// might want to utilize.
return drupal_render($build);
}
-
diff --git a/plugins/styles/corners/rounded_corners.inc b/plugins/styles/corners/rounded_corners.inc
index a1d800b..bf952f9 100644
--- a/plugins/styles/corners/rounded_corners.inc
+++ b/plugins/styles/corners/rounded_corners.inc
@@ -5,7 +5,7 @@
* Definition of the 'rounded_corners' panel style.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('Rounded corners'),
'description' => t('Presents the panes or panels with a rounded corner box around them'),
diff --git a/plugins/styles/default.inc b/plugins/styles/default.inc
index 9e89cbc..2b95859 100644
--- a/plugins/styles/default.inc
+++ b/plugins/styles/default.inc
@@ -5,7 +5,7 @@
* Definition of the 'default' panel style.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('No style'),
'description' => t('The default panel rendering style; displays each pane with a separator.'),
@@ -24,4 +24,3 @@ function theme_panels_default_style_render_region($vars) {
// $output .= '</div>';
return $output;
}
-
diff --git a/plugins/styles/list.inc b/plugins/styles/list.inc
index c13c532..d97b5a9 100644
--- a/plugins/styles/list.inc
+++ b/plugins/styles/list.inc
@@ -6,7 +6,7 @@
* Definition of the 'list' panel style.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('List'),
'description' => t('Presents the panes in the form of an HTML list.'),
@@ -55,4 +55,3 @@ function panels_list_style_settings_form($style_settings) {
return $form;
}
-
diff --git a/plugins/styles/naked.inc b/plugins/styles/naked.inc
index 1fdb3e2..1957177 100644
--- a/plugins/styles/naked.inc
+++ b/plugins/styles/naked.inc
@@ -5,7 +5,7 @@
* Definition of the 'naked' panel style.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
'title' => t('No markup at all'),
'description' => t('Display the pane or region with no markup, not even a title.'),
@@ -31,4 +31,3 @@ function theme_panels_naked_style_render_region($vars) {
function theme_panels_naked_style_render_pane($vars) {
return render($vars['content']->content);
}
-
diff --git a/plugins/styles/stylizer.inc b/plugins/styles/stylizer.inc
index f892024..665a060 100644
--- a/plugins/styles/stylizer.inc
+++ b/plugins/styles/stylizer.inc
@@ -6,7 +6,7 @@
*/
if (module_exists('stylizer')) {
- // Plugin definition
+ // Plugin definition.
$plugin = array(
'title' => t('Custom style'),
'weight' => -10,
@@ -22,7 +22,7 @@ if (module_exists('stylizer')) {
'get child' => 'panels_stylizer_get_substyle',
'get children' => 'panels_stylizer_get_substyles',
- // Set up an AJAX callback for the style
+ // Set up an AJAX callback for the style.
'ajax' => array(
'custom' => 'panels_stylizer_pane_add_style',
),
@@ -140,13 +140,13 @@ function theme_panels_stylizer_stylizer_style_render_region($vars) {
return theme($plugin['theme'], array('settings' => $settings, 'class' => ctools_stylizer_get_css_class($plugin, $settings), 'content' => $output));
}
else {
- // if the style is gone, just display the output.
+ // If the style is gone, just display the output.
return $output;
}
}
/**
- * Pane render theme
+ * Pane render theme.
*/
function theme_panels_stylizer_stylizer_style_render_pane($vars) {
$content = $vars['content'];
@@ -174,7 +174,7 @@ function theme_panels_stylizer_stylizer_style_render_pane($vars) {
}
}
- // if the style is gone or has no theme of its own, just display the output.
+ // If the style is gone or has no theme of its own, just display the output.
return theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $display));
}
@@ -257,7 +257,7 @@ function panels_stylizer_pane_add_style(&$renderer, $plugin, &$conf, $type, $pid
if ($type == 'pane') {
$renderer->command_update_pane($pid);
}
- else if ($type == 'region') {
+ elseif ($type == 'region') {
$renderer->command_update_region_links($pid);
}
else {
@@ -308,7 +308,7 @@ function panels_stylizer_edit_pane_style_form(&$form, &$form_state) {
'#dependency' => array('edit-preconfigured' => array(1)),
);
- // Add the checkbox, set the weight early
+ // Add the checkbox, set the weight early.
$form['panels']['preconfigured'] = array(
'#type' => 'checkbox',
'#title' => t('Make this style available to other regions or panes'),
@@ -365,7 +365,7 @@ function panels_stylizer_edit_pane_style_form_submit(&$form, &$form_state) {
$form_state['owner info']['owner settings']['admin_title'] = $form_state['values']['admin_title'];
$form_state['owner info']['owner settings']['admin_description'] = $form_state['values']['admin_description'];
- // Clean up preview files before we set the name
+ // Clean up preview files before we set the name.
ctools_stylizer_cleanup_style($form_state['plugin'], $form_state['settings']);
$form_state['settings']['name'] = $form_state['values']['name'];
diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc
index daa98ac..34758db 100644
--- a/plugins/task_handlers/panel_context.inc
+++ b/plugins/task_handlers/panel_context.inc
@@ -2,22 +2,21 @@
/**
* @file
- *
* This is the task handler plugin to handle attaching a panel to any
* task that advertises itself as a 'context' type, which all of the
* basic page tasks provided by page_manager.module do by default.
*/
-// Plugin definition
+// Plugin definition.
$plugin = array(
- // is a 'context' handler type, meaning it supports the API of the
+ // Is a 'context' handler type, meaning it supports the API of the
// context handlers provided by ctools context plugins.
'handler type' => 'context',
'visible' => TRUE, // may be added up front.
// Administrative fields.
'title' => t('Panel'),
- 'admin summary' =>'panels_panel_context_admin_summary',
+ 'admin summary' => 'panels_panel_context_admin_summary',
'admin title' => 'panels_panel_context_title',
'operations' => array(
'settings' => array(
@@ -115,7 +114,7 @@ $plugin = array(
// Callback to render the data.
'render' => 'panels_panel_context_render',
- // Callback to return addressable data
+ // Callback to return addressable data.
'addressable callback' => 'panels_panel_context_get_addressable',
// Various callbacks for operations performed on the handler to ensure
@@ -216,7 +215,7 @@ function panels_panel_context_tab_operation($handler, $contexts, $args) {
* simply means that the display has been modified and is awaiting
* save. The modified one should always be used for editing purposes.
* - If none of the above is true, then a new display needs to be created
- * for the handler and pla
+ * for the handler and pla.
*/
function &panels_panel_context_get_display(&$handler) {
if (!isset($handler->conf['display'])) {
@@ -269,7 +268,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
ctools_include('context-task-handler');
ctools_include('plugins', 'panels');
- // Add my contexts
+ // Add my contexts.
$contexts = ctools_context_handler_get_handler_contexts($base_contexts, $handler);
// Test.
@@ -281,7 +280,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
ctools_context_handler_pre_render($handler, $contexts, $args);
}
- // Load the display
+ // Load the display.
$display = panels_panel_context_get_display($handler);
$display->context = $contexts;
@@ -298,7 +297,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
$css_id = 'panel_context:' . $handler->name;
$filename = ctools_css_retrieve($css_id);
if (!$filename) {
- // Add keywords from context
+ // Add keywords from context.
$css = ctools_context_keyword_substitute($handler->conf['css'], array(), $contexts, array('css safe' => TRUE));
$filename = ctools_css_store($css_id, $css);
}
@@ -311,13 +310,12 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
$renderer = panels_get_renderer($handler->conf['pipeline'], $display);
// If the IPE is enabled, but the user does not have access to edit
// load the standard renderer instead.
-
$parents = class_parents($renderer);
if (!empty($parents['panels_renderer_editor']) && !user_access('user page manager') && !user_access('use ipe with page manager')) {
$renderer = panels_get_renderer_handler('standard', $display);
}
- // Remove and add body element classes
+ // Remove and add body element classes.
$panel_body_css = &drupal_static('panel_body_css');
if (isset($handler->conf['body_classes_to_remove'])) {
@@ -325,17 +323,17 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
if (!isset($panel_body_css['body_classes_to_remove'])) {
$panel_body_css['body_classes_to_remove'] = check_plain($classes);
}
- else{
+ else {
$panel_body_css['body_classes_to_remove'] .= ' ' . check_plain($classes);
}
}
if (isset($handler->conf['body_classes_to_add'])) {
$classes = ctools_context_keyword_substitute($handler->conf['body_classes_to_add'], array(), $contexts, array('css safe' => TRUE));
if (!isset($panel_body_css['body_classes_to_add'])) {
- $panel_body_css['body_classes_to_add'] = check_plain($classes);
+ $panel_body_css['body_classes_to_add'] = check_plain($classes);
}
else {
- $panel_body_css['body_classes_to_add'] .= ' '. check_plain($classes);
+ $panel_body_css['body_classes_to_add'] .= ' ' . check_plain($classes);
}
}
@@ -399,7 +397,7 @@ function panels_panel_context_export(&$handler, $indent) {
/**
* When a handler is cloned, we have to clone the display.
*/
- function panels_panel_context_clone(&$handler) {
+function panels_panel_context_clone(&$handler) {
$old_display = panels_panel_context_get_display($handler);
$code = panels_export_display($old_display);
eval($code);
@@ -454,7 +452,7 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
ctools_include('context');
ctools_include('context-task-handler');
- // Get the operations
+ // Get the operations.
$operations = page_manager_get_operations($page);
// Get operations for just this handler.
@@ -529,7 +527,7 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
$output .= '<div class="clearfix">';
if ($show_title) {
- $output .= '<div class="handler-title clearfix">';
+ $output .= '<div class="handler-title clearfix">';
$output .= '<div class="actions handler-actions">' . $rendered_operations['actions'] . '</div>';
$output .= '<span class="title-label">' . $title . '</span>';
}
@@ -537,24 +535,23 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
$output .= '</div>';
$output .= $info;
$output .= '</div>';
-/*
+ /*
$output .= '<div class="right-container">';
$output .= '<h3 class="context-title">' . t('Contexts') . $context_link . '</h3>';
$output .= $contexts;
$output .= '</div>';
$output .= '<div class="left-container">';
-// $output .= $icon;
+ // $output .= $icon;
$output .= '<h3 class="handler-title">' . t('Content') . $content_link . '</h3>';
$output .= $content;
$output .= '</div>';
-*/
+ */
return $output;
}
// --------------------------------------------------------------------------
-// Forms
-
+// Forms.
/**
* General notes about forms: The handler is automatically cached by the form
* wizard, so anything we store on $form_state['handler'] anywhere will get
@@ -689,10 +686,9 @@ function panels_panel_context_edit_move($form, &$form_state) {
$form = panels_change_layout($form, $form_state);
// Change the 'back' button to just go directly to the previous form
-// $task_id = $form_state['task']['name'];
-// $handler_id = $form_state['handler']->handler;
-// $name = $form_state['handler']->name;
-
+ // $task_id = $form_state['task']['name'];
+ // $handler_id = $form_state['handler']->handler;
+ // $name = $form_state['handler']->name;
// This form is outside the normal wizard list, so we need to specify the
// previous/next forms.
$form['buttons']['previous']['#next'] = 'layout';
@@ -750,7 +746,7 @@ function panels_panel_context_edit_content_submit(&$form, &$form_state) {
panels_edit_display_form_submit($form, $form_state);
$handler = &$form_state['handler'];
- // update the cached display:
+ // Update the cached display:
$display = $form_state['page']->display_cache[$form_state['handler_id']]->display;
$handler->conf['display'] = $display;
unset($form_state['page']->display_cache[$form_state['handler_id']]);
@@ -761,7 +757,7 @@ function panels_panel_context_edit_content_submit(&$form, &$form_state) {
}
/**
- * General settings for the panel
+ * General settings for the panel.
*/
function panels_panel_context_edit_settings($form, &$form_state) {
$conf = $form_state['handler']->conf;
@@ -874,7 +870,7 @@ function panels_panel_context_edit_preview($form, &$form_state) {
$form['preview'] = array();
ctools_context_replace_form($form['preview'], $contexts);
- // automatically preview if there are no argument placeholders.
+ // Automatically preview if there are no argument placeholders.
if (empty($form['preview'])) {
$display = panels_panel_context_get_display($form_state['handler']);
$display->context = $contexts;
@@ -913,7 +909,7 @@ function panels_panel_context_edit_preview_submit(&$form, &$form_state) {
}
function panels_panel_context_get_addressable($task, $subtask_name, $handler, $address, $contexts, $arguments, $type) {
- // Load the display
+ // Load the display.
$display = panels_panel_context_get_display($handler);
$display->context = $contexts;
diff --git a/plugins/views/panels.views.inc b/plugins/views/panels.views.inc
index 2418da5..e1f8e67 100644
--- a/plugins/views/panels.views.inc
+++ b/plugins/views/panels.views.inc
@@ -1,7 +1,11 @@
<?php
/**
- * Implementation of hook_views_plugins
+ * @file
+ */
+
+/**
+ * Implementation of hook_views_plugins.
*/
function panels_views_plugins() {
$plugins = array(
diff --git a/plugins/views/panels_views_plugin_row_fields.inc b/plugins/views/panels_views_plugin_row_fields.inc
index 4a404ab..d939915 100644
--- a/plugins/views/panels_views_plugin_row_fields.inc
+++ b/plugins/views/panels_views_plugin_row_fields.inc
@@ -5,7 +5,7 @@
*/
/**
- * The basic 'fields' row plugin
+ * The basic 'fields' row plugin.
*
* This displays fields one after another, giving options for inline
* or not.
@@ -148,10 +148,11 @@ class panels_views_plugin_row_fields extends views_plugin_row_fields {
// Now that we have a rendered content array, render it.
return panels_print_layout($layout, $content, $meta);
}
+
}
/**
- * Override handler for views_ui_edit_display_form
+ * Override handler for views_ui_edit_display_form.
*/
function panels_change_layout_button($form, &$form_state) {
$display = &$form_state['view']->display[$form_state['display_id']];
diff --git a/templates/panels-dashboard-block.tpl.php b/templates/panels-dashboard-block.tpl.php
index c2a665e..3c57069 100644
--- a/templates/panels-dashboard-block.tpl.php
+++ b/templates/panels-dashboard-block.tpl.php
@@ -1,4 +1,8 @@
<?php
+
+/**
+ * @file
+ */
?>
<div class="dashboard-block">
<h3 class="dashboard-title"><?php print $block['title']; ?></h3>
diff --git a/templates/panels-dashboard-link.tpl.php b/templates/panels-dashboard-link.tpl.php
index 22f1241..23d5517 100644
--- a/templates/panels-dashboard-link.tpl.php
+++ b/templates/panels-dashboard-link.tpl.php
@@ -1,4 +1,8 @@
<?php
+
+/**
+ * @file
+ */
?>
<div class="dashboard-entry clearfix">
<div class="dashboard-text">
diff --git a/templates/panels-dashboard.tpl.php b/templates/panels-dashboard.tpl.php
index 109deab..8000685 100644
--- a/templates/panels-dashboard.tpl.php
+++ b/templates/panels-dashboard.tpl.php
@@ -1,4 +1,8 @@
<?php
+
+/**
+ * @file
+ */
?>
<div class="panels-dashboard clearfix">
<div class="dashboard-left clearfix">
diff --git a/templates/panels-pane.tpl.php b/templates/panels-pane.tpl.php
index 0aa0102..9dd92e3 100644
--- a/templates/panels-pane.tpl.php
+++ b/templates/panels-pane.tpl.php
@@ -1,7 +1,7 @@
<?php
/**
- * @file panels-pane.tpl.php
- * Main panel pane template
+ * @file Panels-pane.tpl.php
+ * Main panel pane template.
*
* Variables available:
* - $pane->type: the content type inside this pane