+ 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.
+
+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().
+ *
+ * @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.
*
* @ingroup mainapi
- *
- * @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.
*/
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.
+ * 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.
*
- * @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.
* @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';
+ 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';
- function add_pane(&$pane, $location = NULL) {
+ /**
+ * 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 instanceof panels_display \n
+ * @return object $display
+ * This display panel display object to return.
+ *
+ * @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) {
@@ -1176,7 +1296,7 @@ function panels_render_display(&$display, $renderer = NULL) {
if ($form_context = ctools_context_get_form($display->context)) {
$form_context->form['#theme'] = 'panels_render_display_form';
if (empty($form_context->form['#theme_wrappers']) || !in_array('form', $form_context->form['#theme_wrappers'])) {
- $form_context['#theme_wrappers'][] = 'form';
+ $form_context->form['#theme_wrappers'][] = 'form';
}
$form_context->form['#display'] = &$display;
return $form_context->form;
@@ -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 = '';
+ $output = '
';
$output .= $vars['image'];
$output .= '
' . $vars['title'] . '
';
$output .= '
';
@@ -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;
@@ -1403,6 +1551,10 @@ function template_preprocess_panels_pane(&$vars) {
$vars['more'] = l($content->more['title'], $content->more['href'], $content->more);
}
+ if (!empty($content->attributes)) {
+ $vars['attributes_array'] = array_merge($vars['attributes_array'], $content->attributes);
+ }
+
$vars['content'] = !empty($content->content) ? $content->content : '';
}
@@ -1483,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);
}
@@ -1544,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.
*/
@@ -1553,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.
*/
@@ -1568,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.
*/
@@ -1585,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.
*/
@@ -1602,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);
}
@@ -1624,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.
@@ -1645,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);
@@ -1663,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);
@@ -1734,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;
@@ -1807,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().
@@ -1818,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
@@ -1849,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
@@ -1863,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;
@@ -1879,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(
@@ -1917,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(
@@ -1936,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();
@@ -1949,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)),
@@ -1958,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)),
@@ -1969,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() : '';
@@ -1983,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/sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe-rtl.css b/sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe-rtl.css
index abfc50e1..7aea8b10 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe-rtl.css
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe.css b/sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe.css
index e7896e26..43685472 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe.css
+++ b/sites/all/modules/contrib/panels/panels/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;
@@ -220,6 +217,10 @@ div.panels-ipe-handlebar-wrapper li.edit a span {
background-image: url(../images/icon-settings.png);
}
+div.panels-ipe-handlebar-wrapper li.css a span {
+ background-image: url(../images/icon-css.png);
+}
+
div.panels-ipe-handlebar-wrapper li.style a span,
div.panels-ipe-newblock a.style span {
background-image: url(../images/icon-style.png);
@@ -244,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)
);
}
@@ -264,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;
@@ -359,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;
@@ -382,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;
}
@@ -393,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;
}
@@ -404,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)
);
}
@@ -421,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)
);
}
@@ -436,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)
);
}
@@ -499,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 {
@@ -521,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)
);
}
@@ -537,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;
}
@@ -572,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/sites/all/modules/contrib/panels/panels/panels_ipe/includes/panels_ipe.pipelines.inc b/sites/all/modules/contrib/panels/panels/panels_ipe/includes/panels_ipe.pipelines.inc
index 5bc3b032..49763df9 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/includes/panels_ipe.pipelines.inc
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/panels_ipe/js/panels_ipe.js b/sites/all/modules/contrib/panels/panels/panels_ipe/js/panels_ipe.js
index f6cae923..4f1fcaf8 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/js/panels_ipe.js
+++ b/sites/all/modules/contrib/panels/panels/panels_ipe/js/panels_ipe.js
@@ -50,7 +50,7 @@ Drupal.behaviors.PanelsIPE = {
Drupal.PanelsIPE.editors[key].showContainer();
});
}
- $('.panels-ipe-hide-bar').once('panels-ipe-hide-bar-processed').click(function() {
+ $('.panels-ipe-hide-bar').once('panels-ipe-hide-bar').click(function() {
Drupal.PanelsIPE.editors[key].hideContainer();
});
Drupal.PanelsIPE.bindClickDelete(context);
@@ -83,6 +83,7 @@ function DrupalPanelsIPE(cache_key, cfg) {
items: 'div.panels-ipe-portlet-wrapper',
handle: 'div.panels-ipe-draghandle',
cancel: '.panels-ipe-nodrag',
+ tolerance: 'pointer',
dropOnEmpty: true
}, cfg.sortableOptions || {});
@@ -311,6 +312,7 @@ function DrupalPanelsIPE(cache_key, cfg) {
// @todo this isn't ideal but I can't seem to figure out how to keep an unprocessed backup
// that will later get processed.
$('.ctools-use-modal-processed', ipe.topParent).removeClass('ctools-use-modal-processed');
+ $('.panels-ipe-hide-bar-processed', ipe.topParent).removeClass('panels-ipe-hide-bar-processed');
$('.pane-delete-processed', ipe.topParent).removeClass('pane-delete-processed');
ipe.topParent.fadeIn('medium');
Drupal.attachBehaviors();
diff --git a/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.info b/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.info
index 299c694a..0b520909 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.info
+++ b/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.info
@@ -6,9 +6,9 @@ core = 7.x
configure = admin/structure/panels
files[] = panels_ipe.module
-; Information added by Drupal.org packaging script on 2016-10-16
-version = "7.x-3.8"
+; Information added by Drupal.org packaging script on 2017-02-06
+version = "7.x-3.9"
core = "7.x"
project = "panels"
-datestamp = "1476582295"
+datestamp = "1486394388"
diff --git a/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.module b/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.module
index 35dfa6f5..0e33fd15 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.module
+++ b/sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.module
@@ -1,5 +1,9 @@
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' => '
' . t('Style') . '',
@@ -108,8 +112,21 @@ function template_preprocess_panels_ipe_pane_wrapper(&$vars) {
);
}
+ // Add option to configure CSS.
+ if (user_access('administer advanced pane settings')) {
+ $vars['links']['css'] = array(
+ 'title' => '
' . t('CSS') . '',
+ 'href' => $renderer->get_url('pane-css', $pane->pid),
+ 'html' => TRUE,
+ 'attributes' => array(
+ 'class' => array('ctools-use-modal', 'panels-ipe-hide-bar'),
+ 'title' => t('CSS'),
+ ),
+ );
+ }
+
// Deleting is managed entirely in the js; this is just an attachment point
- // for it
+ // for it.
$vars['links']['delete'] = array(
'title' => '
' . t('Delete') . '',
'href' => '#',
@@ -124,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);
@@ -140,12 +157,12 @@ function theme_panels_ipe_pane_wrapper($vars) {
);
$type = ctools_get_content_type($pane->type);
- $title ='
' . ctools_content_admin_title($type, $pane->subtype, $pane->configuration, $display->context) . '';
+ $title = '
' . ctools_content_admin_title($type, $pane->subtype, $pane->configuration, $display->context) . '';
$links = theme('links', array('links' => $vars['links'], 'attributes' => $attributes));
if (!empty($pane->locks['type']) && $pane->locks['type'] == 'immovable') {
- $links = '
' . $links .$title .'
';
+ $links = '
' . $links . $title . '
';
}
else {
$links = '
' . $links . $title . '
';
@@ -164,9 +181,9 @@ function template_preprocess_panels_ipe_add_pane_button(&$vars) {
$region_id = $vars['region_id'];
$display = $vars['display'];
$renderer = $vars['renderer'];
- $vars['links'] = '';
+ $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' => '
' . t('Region style') . '',
@@ -179,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' => '
' . t('Add new pane') . '',
'href' => $renderer->get_url('select-content', $region_id),
@@ -226,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/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/ipe.inc b/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/ipe.inc
index ab63f9ee..e369abf9 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/ipe.inc
+++ b/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/ipe.inc
@@ -1,5 +1,9 @@
'panels_renderer_ipe',
);
diff --git a/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php b/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
index 470c4e2e..361e53e9 100644
--- a/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -1,5 +1,9 @@
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' => '
',
- '#suffix' => '
',
+ '#prefix' => '
',
+ '#suffix' => '
',
);
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 = "
$output
";
}
else {
$output = "
$output
";
}
- // 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'],
);
@@ -348,6 +355,9 @@ class panels_renderer_ipe extends panels_renderer_editor {
$buttons = &drupal_static('panels_ipe_toolbar_buttons', array());
$output = theme('panels_ipe_toolbar', array('buttons' => $buttons));
$this->commands[] = ajax_command_replace('#panels-ipe-control-container', $output);
+
+ $storage_id = $this->cache->display->storage_id;
+ cache_clear_all('panels_mini_load:' . $storage_id, 'cache_panels', TRUE);
}
else {
// Cancelled. Clear the cache.
@@ -383,13 +393,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 +424,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 +495,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
'key' => $this->clean_key,
);
}
+
}
/**
@@ -493,8 +504,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/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.info b/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.info
index 49558562..b6b915e8 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.info
+++ b/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.info
@@ -4,9 +4,10 @@ package = "Panels"
dependencies[] = panels
core = 7.x
files[] = plugins/export_ui/panels_mini_ui.class.php
-; Information added by Drupal.org packaging script on 2016-10-16
-version = "7.x-3.8"
+
+; Information added by Drupal.org packaging script on 2017-02-06
+version = "7.x-3.9"
core = "7.x"
project = "panels"
-datestamp = "1476582295"
+datestamp = "1486394388"
diff --git a/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.install b/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.install
index b3239dde..160a58b9 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.install
+++ b/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.install
@@ -1,5 +1,9 @@
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/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.module b/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.module
index 2139de1c..485d9c71 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.module
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/panels_mini/plugins/content_types/panels_mini.inc b/sites/all/modules/contrib/panels/panels/panels_mini/plugins/content_types/panels_mini.inc
index 2d092bed..e1760012 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/plugins/content_types/panels_mini.inc
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini.inc b/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini.inc
index 46cb8947..78e1d84d 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini.inc
+++ b/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini.inc
@@ -1,5 +1,9 @@
'panels_mini',
'access' => 'administer mini panels',
@@ -38,4 +42,3 @@ $plugin = array(
),
);
-
diff --git a/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini_ui.class.php b/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini_ui.class.php
index cff8fe63..5b988daa 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini_ui.class.php
+++ b/sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini_ui.class.php
@@ -1,5 +1,8 @@
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/sites/all/modules/contrib/panels/panels/panels_mini/plugins/panels_storage/panels_mini.inc b/sites/all/modules/contrib/panels/panels/panels_mini/plugins/panels_storage/panels_mini.inc
index c9ba35d7..2ba46be6 100644
--- a/sites/all/modules/contrib/panels/panels/panels_mini/plugins/panels_storage/panels_mini.inc
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/panels_node/panels_node.info b/sites/all/modules/contrib/panels/panels/panels_node/panels_node.info
index 98bf72db..04543e42 100644
--- a/sites/all/modules/contrib/panels/panels/panels_node/panels_node.info
+++ b/sites/all/modules/contrib/panels/panels/panels_node/panels_node.info
@@ -6,9 +6,9 @@ configure = admin/structure/panels
core = 7.x
files[] = panels_node.module
-; Information added by Drupal.org packaging script on 2016-10-16
-version = "7.x-3.8"
+; Information added by Drupal.org packaging script on 2017-02-06
+version = "7.x-3.9"
core = "7.x"
project = "panels"
-datestamp = "1476582295"
+datestamp = "1486394388"
diff --git a/sites/all/modules/contrib/panels/panels/panels_node/panels_node.install b/sites/all/modules/contrib/panels/panels/panels_node/panels_node.install
index 1af682fc..baaebd71 100644
--- a/sites/all/modules/contrib/panels/panels/panels_node/panels_node.install
+++ b/sites/all/modules/contrib/panels/panels/panels_node/panels_node.install
@@ -1,5 +1,9 @@
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/sites/all/modules/contrib/panels/panels/panels_node/panels_node.module b/sites/all/modules/contrib/panels/panels/panels_node/panels_node.module
index bc9d56f9..e93fe264 100644
--- a/sites/all/modules/contrib/panels/panels/panels_node/panels_node.module
+++ b/sites/all/modules/contrib/panels/panels/panels_node/panels_node.module
@@ -1,6 +1,4 @@
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/sites/all/modules/contrib/panels/panels/panels_node/plugins/panels_storage/panels_node.inc b/sites/all/modules/contrib/panels/panels/panels_node/plugins/panels_storage/panels_node.inc
index a7a7a3b2..1696fc04 100644
--- a/sites/all/modules/contrib/panels/panels/panels_node/plugins/panels_storage/panels_node.inc
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/plugins/cache/simple.inc b/sites/all/modules/contrib/panels/panels/plugins/cache/simple.inc
index 6b76678c..26682c66 100644
--- a/sites/all/modules/contrib/panels/panels/plugins/cache/simple.inc
+++ b/sites/all/modules/contrib/panels/panels/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/sites/all/modules/contrib/panels/panels/plugins/display_renderers/editor.inc b/sites/all/modules/contrib/panels/panels/plugins/display_renderers/editor.inc
index 6bfdf845..c570e2ad 100644
--- a/sites/all/modules/contrib/panels/panels/plugins/display_renderers/editor.inc
+++ b/sites/all/modules/contrib/panels/panels/plugins/display_renderers/editor.inc
@@ -1,5 +1,9 @@
'panels_renderer_editor',
);
diff --git a/sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_editor.class.php b/sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_editor.class.php
index 0d3dfa6b..897f983e 100644
--- a/sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_editor.class.php
+++ b/sites/all/modules/contrib/panels/panels/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 = '
' . t('Missing content type') . '';
@@ -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 .= '
' . $buttons . '';
}
$output .= '
' . $title . '';
- $output .= '