Browse Source

updated panels to last dev, added panels_extra_styles

Bachir Soussi Chiadmi 7 years ago
parent
commit
e2b8a1ae80
100 changed files with 1513 additions and 969 deletions
  1. 1 1
      sites/all/modules/contrib/panels/panels/KNOWN_ISSUES.txt
  2. 1 1
      sites/all/modules/contrib/panels/panels/README.txt
  3. 0 1
      sites/all/modules/contrib/panels/panels/css/panels-dashboard.css
  4. 0 1
      sites/all/modules/contrib/panels/panels/css/panels.css
  5. 2 3
      sites/all/modules/contrib/panels/panels/css/panels_admin.css
  6. 14 17
      sites/all/modules/contrib/panels/panels/css/panels_dnd.css
  7. 0 1
      sites/all/modules/contrib/panels/panels/css/panels_page.css
  8. 1 1
      sites/all/modules/contrib/panels/panels/i18n_panels/i18n_panels.i18n.inc
  9. 3 3
      sites/all/modules/contrib/panels/panels/i18n_panels/i18n_panels.info
  10. 4 3
      sites/all/modules/contrib/panels/panels/i18n_panels/i18n_panels.module
  11. BIN
      sites/all/modules/contrib/panels/panels/images/icon-css.png
  12. 5 6
      sites/all/modules/contrib/panels/panels/includes/callbacks.inc
  13. 44 53
      sites/all/modules/contrib/panels/panels/includes/common.inc
  14. 19 21
      sites/all/modules/contrib/panels/panels/includes/display-edit.inc
  15. 2 4
      sites/all/modules/contrib/panels/panels/includes/display-layout.inc
  16. 13 4
      sites/all/modules/contrib/panels/panels/includes/legacy.inc
  17. 3 5
      sites/all/modules/contrib/panels/panels/includes/page-wizard.inc
  18. 1 1
      sites/all/modules/contrib/panels/panels/includes/panels.pipelines.inc
  19. 11 11
      sites/all/modules/contrib/panels/panels/includes/plugins.inc
  20. 12 12
      sites/all/modules/contrib/panels/panels/panels.api.php
  21. 3 3
      sites/all/modules/contrib/panels/panels/panels.info
  22. 16 27
      sites/all/modules/contrib/panels/panels/panels.install
  23. 342 227
      sites/all/modules/contrib/panels/panels/panels.module
  24. 0 1
      sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe-rtl.css
  25. 150 153
      sites/all/modules/contrib/panels/panels/panels_ipe/css/panels_ipe.css
  26. 1 1
      sites/all/modules/contrib/panels/panels/panels_ipe/includes/panels_ipe.pipelines.inc
  27. 3 1
      sites/all/modules/contrib/panels/panels/panels_ipe/js/panels_ipe.js
  28. 3 3
      sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.info
  29. 27 10
      sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.module
  30. 4 0
      sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/ipe.inc
  31. 23 13
      sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
  32. 4 3
      sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.info
  33. 12 8
      sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.install
  34. 8 10
      sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.module
  35. 1 2
      sites/all/modules/contrib/panels/panels/panels_mini/plugins/content_types/panels_mini.inc
  36. 4 1
      sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini.inc
  37. 11 2
      sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini_ui.class.php
  38. 1 1
      sites/all/modules/contrib/panels/panels/panels_mini/plugins/panels_storage/panels_mini.inc
  39. 3 3
      sites/all/modules/contrib/panels/panels/panels_node/panels_node.info
  40. 12 8
      sites/all/modules/contrib/panels/panels/panels_node/panels_node.install
  41. 10 17
      sites/all/modules/contrib/panels/panels/panels_node/panels_node.module
  42. 1 1
      sites/all/modules/contrib/panels/panels/panels_node/plugins/panels_storage/panels_node.inc
  43. 2 3
      sites/all/modules/contrib/panels/panels/plugins/cache/simple.inc
  44. 4 0
      sites/all/modules/contrib/panels/panels/plugins/display_renderers/editor.inc
  45. 45 46
      sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_editor.class.php
  46. 2 1
      sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_simple.class.php
  47. 28 15
      sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_standard.class.php
  48. 1 0
      sites/all/modules/contrib/panels/panels/plugins/display_renderers/simple.inc
  49. 4 0
      sites/all/modules/contrib/panels/panels/plugins/display_renderers/standard.inc
  50. 4 1
      sites/all/modules/contrib/panels/panels/plugins/export_ui/panels_layouts.inc
  51. 0 1
      sites/all/modules/contrib/panels/panels/plugins/export_ui/panels_layouts_ui.class.php
  52. 2 4
      sites/all/modules/contrib/panels/panels/plugins/layouts/flexible/flexible-admin.css
  53. 0 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/flexible/flexible.css
  54. 77 64
      sites/all/modules/contrib/panels/panels/plugins/layouts/flexible/flexible.inc
  55. 0 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/onecol/onecol.css
  56. 3 2
      sites/all/modules/contrib/panels/panels/plugins/layouts/onecol/onecol.inc
  57. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/onecol/panels-onecol.tpl.php
  58. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php
  59. 13 14
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25/threecol_25_50_25.css
  60. 4 4
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc
  61. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php
  62. 15 16
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css
  63. 4 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc
  64. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php
  65. 13 14
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33/threecol_33_34_33.css
  66. 6 3
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc
  67. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php
  68. 15 16
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css
  69. 5 2
      sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc
  70. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol/panels-twocol.tpl.php
  71. 9 10
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol/twocol.css
  72. 5 2
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol/twocol.inc
  73. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php
  74. 11 12
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_bricks/twocol_bricks.css
  75. 2 3
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_bricks/twocol_bricks.inc
  76. 1 1
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php
  77. 11 12
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_stacked/twocol_stacked.css
  78. 5 2
      sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_stacked/twocol_stacked.inc
  79. 5 5
      sites/all/modules/contrib/panels/panels/plugins/page_wizards/landing_page.inc
  80. 1 1
      sites/all/modules/contrib/panels/panels/plugins/panels_storage/page_manager.inc
  81. 18 0
      sites/all/modules/contrib/panels/panels/plugins/panels_storage/panels_layouts_ui.inc
  82. 0 1
      sites/all/modules/contrib/panels/panels/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css
  83. 8 3
      sites/all/modules/contrib/panels/panels/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css
  84. 0 1
      sites/all/modules/contrib/panels/panels/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc
  85. 6 2
      sites/all/modules/contrib/panels/panels/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css
  86. 0 1
      sites/all/modules/contrib/panels/panels/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc
  87. 1 2
      sites/all/modules/contrib/panels/panels/plugins/styles/block.inc
  88. 1 1
      sites/all/modules/contrib/panels/panels/plugins/styles/corners/rounded_corners.inc
  89. 1 2
      sites/all/modules/contrib/panels/panels/plugins/styles/default.inc
  90. 1 2
      sites/all/modules/contrib/panels/panels/plugins/styles/list.inc
  91. 1 2
      sites/all/modules/contrib/panels/panels/plugins/styles/naked.inc
  92. 8 8
      sites/all/modules/contrib/panels/panels/plugins/styles/stylizer.inc
  93. 26 30
      sites/all/modules/contrib/panels/panels/plugins/task_handlers/panel_context.inc
  94. 5 1
      sites/all/modules/contrib/panels/panels/plugins/views/panels.views.inc
  95. 5 3
      sites/all/modules/contrib/panels/panels/plugins/views/panels_views_plugin_row_fields.inc
  96. 4 0
      sites/all/modules/contrib/panels/panels/templates/panels-dashboard-block.tpl.php
  97. 4 0
      sites/all/modules/contrib/panels/panels/templates/panels-dashboard-link.tpl.php
  98. 4 0
      sites/all/modules/contrib/panels/panels/templates/panels-dashboard.tpl.php
  99. 2 2
      sites/all/modules/contrib/panels/panels/templates/panels-pane.tpl.php
  100. 339 0
      sites/all/modules/contrib/panels/panels_extra_styles/LICENSE.txt

+ 1 - 1
sites/all/modules/contrib/panels/panels/KNOWN_ISSUES.txt

@@ -88,4 +88,4 @@ Known Issue http://drupal.org/node/207859
     secure pages doesn't know about. When trying to make non-secure ajax calls
     from a secure page, the browser denies the call.
   Solution:
-    The solution is to simply add panels/* to your Secure Pages configuration.
+    The solution is to simply add panels/* to your Secure Pages configuration.

+ 1 - 1
sites/all/modules/contrib/panels/panels/README.txt

@@ -1,3 +1,3 @@
 Welcome to Panels 3
 
-Documentation is available at https://www.drupal.org/node/496278
+Documentation is available at https://www.drupal.org/node/496278

+ 0 - 1
sites/all/modules/contrib/panels/panels/css/panels-dashboard.css

@@ -1,4 +1,3 @@
-
 .dashboard-entry .dashboard-link {
   font-size: 120%;
   font-weight: bold;

+ 0 - 1
sites/all/modules/contrib/panels/panels/css/panels.css

@@ -1,4 +1,3 @@
-
 div.panel-pane div.admin-links {
   font-size: xx-small;
   margin-right: 1em;

+ 2 - 3
sites/all/modules/contrib/panels/panels/css/panels_admin.css

@@ -1,4 +1,3 @@
-
 .layout-link {
   float: left;
   padding: 1em;
@@ -141,12 +140,12 @@ table .argument-operation input {
 }
 
 tr.changed td {
-  background-color: #FFFFDD !important;
+  background-color: #ffffdd !important;
 }
 
 tr.changed td span.star {
   font-weight: bold;
-  color: #E09010;
+  color: #e09010;
 }
 
 td select {

+ 14 - 17
sites/all/modules/contrib/panels/panels/css/panels_dnd.css

@@ -1,4 +1,3 @@
-
 #panels-dnd-main {
   margin: 0.5em 0;
 }
@@ -42,7 +41,7 @@ div.panels-set-title-hide .panels-set-title {
 }
 
 /* Add Icon */
-#panels-dnd-main div.panel-region .pane-add-link  {
+#panels-dnd-main div.panel-region .pane-add-link {
 }
 #panels-dnd-main div.panel-region .pane-add-link img {
   display: none;
@@ -127,24 +126,24 @@ div.panels-set-title-hide .panel-pane-is-title {
 }
 
 .panel-portlet .changed div.grab-title {
-  background-color: #FFFFDD !important;
-  border-bottom: 1px solid #3D9CD7 !important;
+  background-color: #ffffdd !important;
+  border-bottom: 1px solid #3d9cd7 !important;
   color: black !important;
 }
 
 .panel-portlet .changed.hidden-pane div.grab-title {
-  background-color: #B4B488 !important;
-  border-bottom: 1px solid #3D9CD7 !important;
+  background-color: #b4b488 !important;
+  border-bottom: 1px solid #3d9cd7 !important;
 }
 
 .panel-portlet .changed div.grab-title span.star {
   font-weight: bold;
-  color: #E09010;
+  color: #e09010;
 }
 
 .panel-portlet .grabber:hover {
   color: #fff;
-  background-color: #2F78A5;
+  background-color: #2f78a5;
 }
 
 .panel-portlet.hidden-pane .grab-title:hover {
@@ -175,7 +174,8 @@ div.panels-set-title-hide .panel-pane-is-title {
   margin: 0;
 }
 
-.panel-portlet .buttons input, .panel-portlet .buttons button {
+.panel-portlet .buttons input,
+.panel-portlet .buttons button {
   margin: 0;
   padding: 0;
   display: inline;
@@ -186,7 +186,7 @@ div.panels-set-title-hide .panel-pane-is-title {
 }
 
 .panel-portlet .pane-title {
-  font-size:110%;
+  font-size: 110%;
   cursor: pointer;
 }
 
@@ -315,7 +315,7 @@ a.close img {
   padding-left: 1em;
   padding-bottom: 1em;
   margin-bottom: 1em;
-  background-color: #EEEEEE;
+  background-color: #eeeeee;
 }
 
 .panels-section-columns {
@@ -354,7 +354,7 @@ a.close img {
 
 .panels-section-column-categories .inside {
   padding: 0;
- }
+}
 
 .panels-section-column-categories .content-type-button {
   padding-left: 10px;
@@ -431,7 +431,7 @@ a.close img {
   float: none;
 }
 
-.panels-modal-content .modal-form .no-float label  {
+.panels-modal-content .modal-form .no-float label {
   width: auto;
 }
 
@@ -502,7 +502,6 @@ html.js div.panels-display-links div.ctools-dropdown-container ul li a {
 /* @group CTools Dropdown */
 #panels-dnd-main .ctools-dropdown a.ctools-dropdown-text-link,
 html.js div.panels-display-links a.ctools-dropdown-text-link {
-
   background: url('../images/arrow-down-light.png') 0 3px no-repeat!important;
   padding-left: 12px;
 }
@@ -522,7 +521,6 @@ html.js div.panels-display-links div.ctools-dropdown-container {
 
 html.js #panels-dnd-main div.ctools-dropdown div.ctools-dropdown-container ul li,
 html.js div.panels-display-links div.ctools-dropdown-container ul li {
-
   text-decoration: none;
   padding: 0;
   margin: 0;
@@ -565,7 +563,7 @@ html.js #panels-dnd-main div.ctools-dropdown div.ctools-dropdown-container ul li
 html.js div.panels-display-links div.ctools-dropdown-container ul li .panels-sub-menu ul li a,
 html.js #panels-dnd-main div.ctools-dropdown div.ctools-dropdown-container ul li .panels-sub-menu span.panels-text,
 html.js div.panels-display-links div.ctools-dropdown-container ul li .panels-sub-menu span.panels-text {
-  width:auto;
+  width: auto;
   padding: 0 20px;
 }
 
@@ -682,4 +680,3 @@ div.ctools-modal-content {
   top: -2em;
   margin-bottom: -2em;
 }
-

+ 0 - 1
sites/all/modules/contrib/panels/panels/css/panels_page.css

@@ -1,4 +1,3 @@
-
 div.panels-page-type-container {
   clear: left;
 }

+ 1 - 1
sites/all/modules/contrib/panels/panels/i18n_panels/i18n_panels.i18n.inc

@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Internationalization (i18n) hooks
+ * Internationalization (i18n) hooks.
  */
 
 /**

+ 3 - 3
sites/all/modules/contrib/panels/panels/i18n_panels/i18n_panels.info

@@ -7,9 +7,9 @@ dependencies[] = i18n_translation
 package = Multilingual - Internationalization
 core = 7.x
 
-; 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"
 

+ 4 - 3
sites/all/modules/contrib/panels/panels/i18n_panels/i18n_panels.module

@@ -206,6 +206,7 @@ function i18n_panels_panels_delete_display($did) {
  *
  * This function must not rely on the passed $renderer parameter. The parameter
  * could be empty because this function is reused in i18n_ctools_render_alter().
+ *
  * @todo Check if a drupal_alter() in panels_display::get_title() is applicable.
  *
  * @see i18n_ctools_render_alter()
@@ -234,6 +235,7 @@ function i18n_panels_panels_pre_render(&$display, $renderer) {
  *
  * Under some circumstances the title of the panel page is set before
  * hook_panels_pre_render() is fired. Such cases can be handled with this hook.
+ *
  * @todo Check if a drupal_alter() in panels_display::get_title() is applicable.
  */
 function i18n_ctools_render_alter(&$info, $page, $context) {
@@ -250,7 +252,6 @@ function i18n_ctools_render_alter(&$info, $page, $context) {
  * Implements hook_ctools_plugin_post_alter().
  *
  * Register some translatable configuration settings for plugins.
- *
  */
 function i18n_panels_ctools_plugin_post_alter(&$plugin, $plugin_type_info) {
   if ($plugin_type_info['type'] == 'content_types') {
@@ -322,7 +323,7 @@ function i18n_panels_i18n_string_list($group) {
         if (empty($pane->uuid)) {
           // Fetch exported uuid and validate it.
           $uuid = str_replace('new-', '', $pane->pid);
-          if (!panels_uuid_is_valid($uuid)) {
+          if (!ctools_uuid_is_valid($uuid)) {
             drupal_set_message(t('The pane %pane has no uuid, please resave or re-export it.', array('%pane' => $pane->pid)), 'warning');
             continue;
           }
@@ -366,7 +367,7 @@ function _18n_panels_is_exported_panels_display($display) {
  *
  * @todo I bet there are better ways to solve this mess.
  *
- * @param boolean $reset
+ * @param bool $reset
  *   Reset the static cache.
  *
  * @return array

BIN
sites/all/modules/contrib/panels/panels/images/icon-css.png


+ 5 - 6
sites/all/modules/contrib/panels/panels/includes/callbacks.inc

@@ -1,6 +1,6 @@
 <?php
 /**
- * @file callbacks.inc
+ * @file Callbacks.inc
  * Minor menu callbacks for Panels helpers.
  */
 
@@ -46,7 +46,7 @@ function panels_panels_dashboard_blocks(&$vars) {
     'description' => t('Custom layouts can add more, site-specific layouts that you can use in your panels.'),
   );
 
-   // Load all mini panels and their displays.
+  // Load all mini panels and their displays.
   ctools_include('export');
   $items = ctools_export_crud_load_all('panels_layout');
   $count = 0;
@@ -97,7 +97,7 @@ function template_preprocess_panels_dashboard(&$vars) {
     $function($vars);
   }
 
-  // Add in any default links for modules that are not active
+  // Add in any default links for modules that are not active.
   panels_dashboard_final_blocks($vars);
 
   // If page manager module is enabled, add a very low eight block to
@@ -138,7 +138,7 @@ function template_preprocess_panels_dashboard(&$vars) {
     'class' => 'dashboard-create',
   );
 
-  // Turn the links into a block
+  // Turn the links into a block.
   foreach ($vars['links'] as $link) {
     $vars['blocks']['links']['content'] .= theme('panels_dashboard_link', array('link' => $link));
   }
@@ -148,7 +148,7 @@ function template_preprocess_panels_dashboard(&$vars) {
   $vars['left'] = '';
   $vars['right'] = '';
 
-  // Render all the blocks
+  // Render all the blocks.
   foreach ($vars['blocks'] as $block) {
     $section = !empty($block['section']) ? $block['section'] : 'left';
     $vars[$section] .= theme('panels_dashboard_block', array('block' => $block));
@@ -202,4 +202,3 @@ function panels_admin_panel_context_page() {
   ctools_include('common', 'panels');
   return drupal_get_form('panels_common_settings', 'panels_page');
 }
-

+ 44 - 53
sites/all/modules/contrib/panels/panels/includes/common.inc

@@ -39,12 +39,11 @@
  *
  * @see panels_edit_layout()
  * @see _panels_edit_layout()
- *
  */
 class panels_allowed_layouts {
 
   /**
-   *  Specifies whether newly-added layouts (as in, new .inc files) should be automatically
+   * Specifies whether newly-added layouts (as in, new .inc files) should be automatically
    *  allowed (TRUE) or disallowed (FALSE) for $this. Defaults to TRUE, which is more
    *  permissive but less of an administrative hassle if/when you add new layouts. Note
    *  that this parameter will be derived from $allowed_layouts if a value is passed in.
@@ -52,19 +51,20 @@ class panels_allowed_layouts {
   var $allow_new = TRUE;
 
   /**
-   *  Optional member. If provided, the Panels API will generate a drupal variable using
+   * Optional member. If provided, the Panels API will generate a drupal variable using
    *  variable_set($module_name . 'allowed_layouts', serialize($this)), thereby handling the
    *  storage of this object entirely within the Panels API. This object will be
    *  called and rebuilt by panels_edit_layout() if the same $module_name string is passed in
    *  for the $allowed_types parameter. \n
    *  This is primarily intended for convenience - client modules doing heavy-duty implementations
    *  of the Panels API will probably want to create their own storage method.
+   *
    * @see panels_edit_layout()
    */
   var $module_name = NULL;
 
   /**
-   *  An associative array of all available layouts, keyed by layout name (as defined
+   * An associative array of all available layouts, keyed by layout name (as defined
    *  in the corresponding layout plugin definition), with value = 1 if the layout is
    *  allowed, and value = 0 if the layout is not allowed.
    *  Calling array_filter(panels_allowed_layouts::$allowed_layout_settings) will return an associative array
@@ -82,15 +82,14 @@ class panels_allowed_layouts {
 
   /**
    * Constructor function; loads the $allowed_layout_settings array with initial values according
-   * to $start_allowed
+   * to $start_allowed.
    *
    * @param bool $start_allowed
-   *  $start_allowed determines whether all available layouts will be marked
-   *  as allowed or not allowed on the initial call to panels_allowed_layouts::set_allowed()
-   *
+   *   $start_allowed determines whether all available layouts will be marked
+   *   as allowed or not allowed on the initial call to panels_allowed_layouts::set_allowed()
    */
   function __construct($start_allowed = TRUE) {
-    // TODO would be nice if there was a way to just fetch the names easily
+    // TODO would be nice if there was a way to just fetch the names easily.
     foreach ($this->list_layouts() as $layout_name) {
       $this->allowed_layout_settings[$layout_name] = $start_allowed ? 1 : 0;
     }
@@ -121,6 +120,7 @@ class panels_allowed_layouts {
    *      drupal_goto('</path/to/desired/redirect>');
    *    }
    *  }
+   *
    * @endcode \n
    *
    * If $allowed_layouts->form_state == 'failed-validate' || 'render', then you'll need to return
@@ -135,8 +135,8 @@ class panels_allowed_layouts {
    * you to control where the user ends up next.
    *
    * @param string $title
-   *  Used to set the title of the allowed layouts form. If no value is given, defaults to
-   *  'Panels: Allowed Layouts'.
+   *   Used to set the title of the allowed layouts form. If no value is given, defaults to
+   *   'Panels: Allowed Layouts'.
    *
    * @return mixed $result
    *  - On the first passthrough when the form is being rendered, $result is the form's structured
@@ -147,11 +147,11 @@ class panels_allowed_layouts {
   function set_allowed($title = 'Panels: Allowed Layouts') {
     $this->sync_with_available();
     $form_id = 'panels_common_set_allowed_layouts';
-    // TODO switch to drupal_build_form(); need to pass by ref
+    // TODO switch to drupal_build_form(); need to pass by ref.
     $form = drupal_retrieve_form($form_id, $this, $title);
 
     if ($result = drupal_process_form($form_id, $form)) {
-      // successful submit
+      // Successful submit.
       $this->form_state = 'submit';
       return $result;
     }
@@ -192,11 +192,10 @@ class panels_allowed_layouts {
    * If you don't serialize the second parameter of variable_get() and the variable name you provide
    * can't be found, an E_STRICT warning will be generated for trying to unserialize an entity
    * that has not been serialized.
-   *
    */
   function save() {
     if (!is_null($this->module_name)) {
-      variable_set($this->module_name . '_allowed_layouts', serialize($this));
+      variable_set($this->module_name . "_allowed_layouts", serialize($this));
     }
   }
 
@@ -217,6 +216,7 @@ class panels_allowed_layouts {
     }
     return $layouts;
   }
+
 }
 
 /**
@@ -272,11 +272,7 @@ function panels_common_settings($form, &$form_state, $module_name = 'panels_comm
     // each type its own checkboxes set unless it's 'single' in which
     // case it can go into our fake other set.
     $available_content_types = ctools_content_get_all_types();
-    $allowed_content_types = db_select('panels_allowed_types', 'pat')
-      ->fields('pat', array('type', 'allowed'))
-      ->condition('module', $module_name)
-      ->execute()
-      ->fetchAllKeyed();
+    $allowed_content_types = variable_get($module_name . '_allowed_types', array());
 
     foreach ($available_content_types as $id => $types) {
       foreach ($types as $type => $info) {
@@ -296,7 +292,7 @@ function panels_common_settings($form, &$form_state, $module_name = 'panels_comm
       '#tree' => TRUE,
     );
 
-    // cheat a bit
+    // Cheat a bit.
     $content_types['other'] = array('title' => t('Other'), 'weight' => 10);
     foreach ($content_types as $id => $info) {
       if (isset($allowed[$id])) {
@@ -342,14 +338,14 @@ function panels_common_settings($form, &$form_state, $module_name = 'panels_comm
 }
 
 /**
- * Submit hook for panels_common_settings
+ * Submit hook for panels_common_settings.
  */
 function panels_common_settings_validate($form, &$form_state) {
   panels_common_allowed_layouts_form_validate($form, $form_state);
 }
 
 /**
- * Submit hook for panels_common_settings
+ * Submit hook for panels_common_settings.
  */
 function panels_common_settings_submit($form, &$form_state) {
   panels_common_allowed_layouts_form_submit($form, $form_state);
@@ -358,21 +354,21 @@ function panels_common_settings_submit($form, &$form_state) {
   if (!$form_state['skip']) {
     // Merge the broken apart array neatly back together.
     $allowed_content_types = array();
-    $content_types = $form_state['values']['allowed'];
-    foreach ($content_types as $content_type) {
-      $allowed_content_types = array_merge($allowed_content_types, $form_state['values']['content_types'][$content_type]['options']);
-      foreach ($allowed_content_types as $type => $allowed) {
-        $allowed = empty($allowed) ? 0 : 1;
-        db_merge('panels_allowed_types')
-          ->key(array('module' => $module_name, 'type' => $type))
-          ->fields(array(
-            'module' => $module_name,
-            'type' => $type,
-            'allowed' => $allowed,
-          ))
-          ->execute();
+    foreach ($form_state['values']['allowed'] as $allowed) {
+      $values = $form_state['values']['content_types'][$allowed]['options'];
+      // If new content of the type is not added, storing a lisy of disabled
+      // content is not needed.
+      if (!$form_state['values']['panels_common_default'][$allowed]) {
+        $values = array_filter($values);
       }
+      $allowed_content_types = array_merge($allowed_content_types, $values);
     }
+    // Values from checkboxes are the same string as they key, but we only need
+    // to store the boolean value.
+    foreach ($allowed_content_types as &$value) {
+      $value = (bool) $value;
+    }
+    variable_set($module_name . '_allowed_types', $allowed_content_types);
   }
   drupal_set_message(t('Your changes have been saved.'));
 }
@@ -381,14 +377,9 @@ function panels_common_settings_submit($form, &$form_state) {
  * Based upon the settings, get the allowed types for this node.
  */
 function panels_common_get_allowed_types($module, $contexts = array(), $has_content = FALSE, $default_defaults = array(), $default_allowed_types = array()) {
-  // Get a list of all types that are available
+  // Get a list of all types that are available.
   $default_types = variable_get($module . '_default', $default_defaults);
-  $allowed_types = db_select('panels_allowed_types', 'pat')
-    ->fields('pat', array('type', 'allowed'))
-    ->condition('module', $module)
-    ->execute()
-    ->fetchAllKeyed();
-  $allowed_types = !empty($allowed_types) ? $allowed_types : $default_allowed_types;
+  $allowed_types = variable_get($module . '_allowed_types', $default_allowed_types);
 
   // By default, if they haven't gone and done the initial setup here,
   // let all 'other' types (which will be all types) be available.
@@ -420,8 +411,8 @@ function panels_common_get_allowed_types($module, $contexts = array(), $has_cont
  * @ingroup forms
  *
  * @param array $allowed_layouts
- *  The set of allowed layouts that should be used as the default values
- *  for this form. If none is provided, then by default no layouts will be restricted.
+ *   The set of allowed layouts that should be used as the default values
+ *   for this form. If none is provided, then by default no layouts will be restricted.
  */
 function panels_common_allowed_layouts_form(&$form, &$form_state, $module_name) {
   // Fetch our allowed layouts from variables.
@@ -434,6 +425,7 @@ function panels_common_allowed_layouts_form(&$form, &$form_state, $module_name)
 
   $form_state['allowed_layouts'] = &$allowed_layouts;
 
+  ctools_add_js('panels-base', 'panels');
   ctools_add_js('layout', 'panels');
 
   $form['layout_selection'] = array(
@@ -473,19 +465,19 @@ function panels_common_allowed_layouts_form_submit($form, &$form_state) {
  * Get the allowed layout object for the given module.
  */
 function panels_common_get_allowed_layout_object($module_name) {
-  $allowed_layouts = unserialize(variable_get($module_name . '_allowed_layouts', serialize('')));
+  $allowed_layouts = unserialize(variable_get($module_name . "_allowed_layouts", serialize('')));
 
-  // if no parameter was provided, or the variable_get failed
+  // If no parameter was provided, or the variable_get failed.
   if (!$allowed_layouts) {
-    // still no dice. simply creates a dummy version where all layouts
+    // Still no dice. simply creates a dummy version where all layouts
     // are allowed.
     $allowed_layouts = new panels_allowed_layouts();
     $allowed_layouts->allow_new = TRUE;
     $allowed_layouts->module_name = $module_name;
   }
 
-  // sanitize allowed layout listing; this is redundant if the
-  // $allowed_layouts param was null, but the data is cached anyway
+  // Sanitize allowed layout listing; this is redundant if the
+  // $allowed_layouts param was null, but the data is cached anyway.
   $allowed_layouts->sync_with_available();
 
   return $allowed_layouts;
@@ -500,7 +492,7 @@ function panels_common_get_allowed_layouts($module_name) {
   if (empty($module_name)) {
     return $available_layouts;
   }
-  else if (is_object($module_name)) {
+  elseif (is_object($module_name)) {
     $allowed_layouts = $module_name;
   }
   else {
@@ -515,7 +507,7 @@ function panels_common_get_allowed_layouts($module_name) {
     }
   }
 
-  // Sort
+  // Sort.
   $layouts = array();
 
   asort($order);
@@ -603,7 +595,6 @@ function panels_common_print_layout_links($layouts, $base_path, $link_options =
   // We're doing these dependencies completely manualy, which is unusual, but
   // the process code only supports doing them in a form.
   // @todo modify dependent.inc to make this easier.
-
   $dependencies = array();
   foreach ($options as $category => $links) {
     $dependencies['panels-layout-category-' . $category] = array(

+ 19 - 21
sites/all/modules/contrib/panels/panels/includes/display-edit.inc

@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * @file
  * Core Panels API include file containing various display-editing functions.
  * This includes all the basic editing forms (content, layout, layout settings)
@@ -40,7 +40,7 @@ function _panels_edit($display, $destination, $content_types, $title = FALSE) {
 }
 
 /**
- * Form definition for the panels display editor
+ * Form definition for the panels display editor.
  *
  * No validation function is necessary, as all 'validation' is handled
  * either in the lead-up to form rendering (through the selection of
@@ -48,6 +48,7 @@ function _panels_edit($display, $destination, $content_types, $title = FALSE) {
  * the ajax modals & content types.
  *
  * @ingroup forms
+ *
  * @see panels_edit_display_submit()
  */
 function panels_edit_display_form($form, &$form_state) {
@@ -157,7 +158,7 @@ function panels_edit_display_form_submit($form, &$form_state) {
       $display->panels[$region_id] = array();
       if ($panes) {
         $pids = explode(',', $panes);
-        // need to filter the array, b/c passing it in a hidden field can generate trash
+        // Need to filter the array, b/c passing it in a hidden field can generate trash.
         foreach (array_filter($pids) as $pid) {
           if ($old_content[$pid]) {
             $display->panels[$region_id][] = $pid;
@@ -221,7 +222,7 @@ function panels_edit_display_settings_form($form, &$form_state) {
   ctools_include('dependent');
 
   if ($form_state['display_title']) {
-    $form['display_title'] = array (
+    $form['display_title'] = array(
       '#tree' => TRUE,
     );
 
@@ -252,16 +253,15 @@ function panels_edit_display_settings_form($form, &$form_state) {
       // We have to create a manual fieldset because fieldsets do not support IDs.
       // Use 'hidden' instead of 'markup' so that the process will run.
       // Add js for collapsible fieldsets manually
-//      drupal_add_js('misc/form.js');
-//      drupal_add_js('misc/collapse.js');
-//      $form['display_title']['contexts_prefix'] = array(
-//        '#type' => 'hidden',
-//        '#id' => 'edit-display-substitutions',
-//        '#prefix' => '<div><fieldset id="edit-display-substitutions" class="collapsed collapsible"><legend>' . t('Substitutions') . '</legend><div class="fieldset-wrapper">',
-//        '#process' => array('ctools_dependent_process'),
-//        '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
-//      );
-
+      //      drupal_add_js('misc/form.js');
+      //      drupal_add_js('misc/collapse.js');
+      //      $form['display_title']['contexts_prefix'] = array(
+      //        '#type' => 'hidden',
+      //        '#id' => 'edit-display-substitutions',
+      //        '#prefix' => '<div><fieldset id="edit-display-substitutions" class="collapsed collapsible"><legend>' . t('Substitutions') . '</legend><div class="fieldset-wrapper">',
+      //        '#process' => array('ctools_dependent_process'),
+      //        '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
+      //      );
       $rows = array();
       foreach ($display->context as $context) {
         foreach (ctools_context_get_converters('%' . check_plain($context->keyword) . ':', $context) as $keyword => $title) {
@@ -279,17 +279,15 @@ function panels_edit_display_settings_form($form, &$form_state) {
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
         '#value' => theme('table', array('header' => $header, 'rows' => $rows)),
-//        '#process' => array('form_process_fieldset', 'ctools_dependent_process'),
-//        '#id' => 'edit-display-title-context',
-//        '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
+      // '#process' => array('form_process_fieldset', 'ctools_dependent_process'),      //        '#id' => 'edit-display-title-context',
+      //        '#dependency' => array('edit-display-title-hide-title' => array(PANELS_TITLE_FIXED)),
       );
-//      $form['display_title']['contexts_suffix'] = array(
-//        '#value' => '</div></fieldset></div>',
-//      );
+      // $form['display_title']['contexts_suffix'] = array(      //        '#value' => '</div></fieldset></div>',
+      //      );.
     }
   }
 
-  // TODO doc the ability to do this as part of the API
+  // TODO doc the ability to do this as part of the API.
   if (!empty($layout['settings form']) && function_exists($layout['settings form'])) {
     $form['layout_settings'] = $layout['settings form']($display, $layout, $display->layout_settings);
   }

+ 2 - 4
sites/all/modules/contrib/panels/panels/includes/display-layout.inc

@@ -2,7 +2,6 @@
 
 /**
  * @file
- *
  * Handle the forms for changing a display's layout.
  */
 
@@ -33,7 +32,7 @@ function _panels_edit_layout($display, $finish, $destination, $allowed_layouts)
   if (empty($_POST) || empty($_POST['form_id']) || $_POST['form_id'] != 'panels_change_layout') {
     $output = drupal_build_form('panels_choose_layout', $form_state);
     if (!empty($form_state['executed'])) {
-      // upon submission go to next form.
+      // Upon submission go to next form.
       $change_form_state['layout'] = $_SESSION['layout'][$display->did] = $form_state['layout'];
       $change_form = TRUE;
     }
@@ -147,7 +146,6 @@ function panels_choose_layout($form, &$form_state) {
   $js['CTools']['dependent'] = $dependencies;
   drupal_add_js($js, 'setting');
 
-
   if (empty($form_state['no buttons'])) {
     $form['submit'] = array(
       '#type' => 'submit',
@@ -293,7 +291,7 @@ function panels_change_layout_submit($form, &$form_state) {
     foreach ($form_state['values']['panel']['pane'] as $region_id => $panes) {
       if ($panes) {
         $pids = explode(',', $panes);
-        // need to filter the array, b/c passing it in a hidden field can generate trash
+        // Need to filter the array, b/c passing it in a hidden field can generate trash.
         foreach (array_filter($pids) as $pid) {
           $switch[$pid] = $region_id;
         }

+ 13 - 4
sites/all/modules/contrib/panels/panels/includes/legacy.inc

@@ -1,22 +1,32 @@
 <?php
 
+/**
+ * @file
+ * Legacy state manager for Panels.
+ */
+
 /**
  * Legacy state manager for Panels.
  *
  * Checks all possible ways (using discovery of patterned method names) in which
  * Panels may need to operate in legacy mode,
- * sets variables as appropriate, and returns an informational
- *
+ * sets variables as appropriate, and returns an informational.
  */
 class PanelsLegacyState {
   var $legacy = NULL;
 
+  /**
+   * Translation wrapper.
+   */
   function t() {
     $func = get_t();
     $args = func_get_args();
     return call_user_func_array($func, $args);
   }
 
+  /**
+   * Get Status.
+   */
   function getStatus() {
     if (!isset($this->legacy)) {
       $this->determineStatus();
@@ -29,7 +39,7 @@ class PanelsLegacyState {
    */
   function determineStatus() {
     $this->legacy = array();
-    foreach(get_class_methods($this) as $method) {
+    foreach (get_class_methods($this) as $method) {
       if (strtolower(substr($method, 0, 5)) == 'check') {
         $this->legacy[$method] = $this->$method();
       }
@@ -37,5 +47,4 @@ class PanelsLegacyState {
     $this->legacy = array_filter($this->legacy);
   }
 
-  // At this time there are no legacy checks.
 }

+ 3 - 5
sites/all/modules/contrib/panels/panels/includes/page-wizard.inc

@@ -35,7 +35,7 @@ function panels_page_wizard_add_layout(&$form, &$form_state) {
     '#value' => '</fieldset>',
   );
 
-//  $form_state['cache'] = FALSE;
+  // $form_state['cache'] = FALSE;.
 }
 
 /**
@@ -52,7 +52,6 @@ function panels_page_wizard_add_content(&$form, &$form_state) {
 
   // Panels provides this caching mechanism to make it easy to use the
   // wizard to cache the display.
-
   $cache = panels_edit_cache_get('panels_page_wizard:' . $form_state['plugin']['name']);
 
   $form_state['renderer'] = panels_get_renderer_handler('editor', $cache->display);
@@ -68,14 +67,14 @@ function panels_page_wizard_add_content(&$form, &$form_state) {
 }
 
 /**
- * Add content form submit handler
+ * Add content form submit handler.
  *
  * This is not a proper submit handler, it is meant to be called by a form's
  * submit handler to handle submission.
  */
 function panels_page_wizard_add_content_submit(&$form, &$form_state) {
   // Call the normal panels edit form submit to make sure values are stored
-  // on the display
+  // on the display.
   panels_edit_display_form_submit($form, $form_state);
   $cache = &$form_state['wizard cache'];
 
@@ -83,4 +82,3 @@ function panels_page_wizard_add_content_submit(&$form, &$form_state) {
   $cache->display = &$form_state['display'];
   unset($cache->display_cache);
 }
-

+ 1 - 1
sites/all/modules/contrib/panels/panels/includes/panels.pipelines.inc

@@ -11,7 +11,7 @@
 function panels_default_panels_renderer_pipeline() {
   $pipelines = array();
 
-  $pipeline = new stdClass;
+  $pipeline = new stdClass();
   $pipeline->disabled = FALSE; /* Edit this to true to make a default pipeline disabled initially */
   $pipeline->api_version = 1;
   $pipeline->name = 'standard';

+ 11 - 11
sites/all/modules/contrib/panels/panels/includes/plugins.inc

@@ -2,7 +2,6 @@
 
 /**
  * @file
- *
  * Contains helper code for plugins and contexts.
  */
 
@@ -41,7 +40,7 @@ function panels_get_regions($layout, $display) {
  *   The cached content, or FALSE to indicate no cached content exists.
  */
 function panels_get_cached_content($display, $args, $context, $pane = NULL) {
-  // Never use cache on a POST
+  // Never use cache on a POST.
   if (!empty($_POST)) {
     return FALSE;
   }
@@ -59,7 +58,7 @@ function panels_get_cached_content($display, $args, $context, $pane = NULL) {
     return FALSE;
   }
 
-  // restore it.
+  // Restore it.
   $cache->restore();
   return $cache;
 }
@@ -68,7 +67,7 @@ function panels_get_cached_content($display, $args, $context, $pane = NULL) {
  * Store cached content for a given display and possibly pane.
  */
 function panels_set_cached_content($cache, $display, $args, $context, $pane = NULL) {
-  // Never use cache on a POST
+  // Never use cache on a POST.
   if (!empty($_POST)) {
     return FALSE;
   }
@@ -82,7 +81,7 @@ function panels_set_cached_content($cache, $display, $args, $context, $pane = NU
 
   $conf = $pane ? $pane->cache['settings'] : $display->cache['settings'];
 
-  // snapshot it.
+  // Snapshot it.
   $cache->cache();
   return $function($conf, $cache, $display, $args, $context, $pane);
 }
@@ -154,7 +153,7 @@ class panels_cache_object {
 
     $this->ready = TRUE;
 
-    // Simple replacement for head
+    // Simple replacement for head.
     $this->head = str_replace($this->head, '', drupal_add_html_head());
 
     // Slightly less simple for CSS:
@@ -248,6 +247,7 @@ class panels_cache_object {
       }
     }
   }
+
 }
 
 /**
@@ -412,7 +412,7 @@ function panels_get_renderer_handler($plugin, &$display) {
  * Choose a renderer for a display based on a render pipeline setting.
  */
 function panels_get_renderer($pipeline_name, &$display) {
-  // Load the pipeline
+  // Load the pipeline.
   ctools_include('export');
   $pipeline = ctools_export_crud_load('panels_renderer_pipeline', $pipeline_name);
 
@@ -443,7 +443,7 @@ function panels_get_renderer($pipeline_name, &$display) {
     return $renderer;
   }
 
-  // Fall through. If no renderer is selected, use the standard renderer
+  // Fall through. If no renderer is selected, use the standard renderer.
   return panels_get_renderer_handler('standard', $display);
 }
 
@@ -454,9 +454,9 @@ function panels_get_renderer($pipeline_name, &$display) {
  */
 function _panels_renderer_pipeline_sort($a, $b) {
   if ($a->weight == $b->weight) {
-      if ($a->admin_title == $b->admin_title) {
-        return 0;
-      }
+    if ($a->admin_title == $b->admin_title) {
+      return 0;
+    }
     return ($a->admin_title < $b->admin_title) ? -1 : 1;
   }
   return ($a->weight < $b->weight) ? -1 : 1;

+ 12 - 12
sites/all/modules/contrib/panels/panels/panels.api.php

@@ -11,7 +11,7 @@
  * @param string $argument
  *   The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
  *   passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
  *   The display to cache.
  */
 function hook_panels_cache_set($argument, $cache) {
@@ -56,7 +56,7 @@ function hook_panels_cache_get($argument) {
  * @param string $argument
  *   The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
  *   passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
  *   The display to cache.
  *
  * @return stdClass
@@ -78,7 +78,7 @@ function hook_panels_cache_save($argument, $cache) {
  * @param string $argument
  *   The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
  *   passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
  *   The cached display.
  */
 function hook_panels_cache_clear($argument, $cache) {
@@ -105,9 +105,9 @@ function hook_panels_dashboard_blocks(&$vars) {
  *
  * This happens after the keyword substitution.
  *
- * @param stdClass $content
+ * @param object $content
  *   The content block to render.
- * @param stdClass $pane
+ * @param object $pane
  *   The pane object.
  * @param array $args
  *   The display arguments.
@@ -125,7 +125,7 @@ function hook_panels_pane_content_alter($content, $pane, $args, $contexts) {
  * @param string $argument
  *   The second half of the cache key. Full key module:TASK_NAME:HANDLER_NAME
  *   passed part: TASK_NAME:HANDLER_NAME
- * @param stdClass $cache
+ * @param object $cache
  *   The cached display.
  */
 function hook_panels_edit_cache_break_lock($argument, $cache) {
@@ -140,7 +140,7 @@ function hook_panels_edit_cache_break_lock($argument, $cache) {
  *
  * @param panels_display $panels_display
  *   The panels display that will be rendered.
- * @param stdClass $renderer
+ * @param object $renderer
  *   The renderer object that will be used to render.
  *
  * @return string
@@ -158,7 +158,7 @@ function hook_panels_pre_render($panels_display, $renderer) {
  *
  * @param panels_display $panels_display
  *   The rendered panels display.
- * @param stdClass $renderer
+ * @param object $renderer
  *   The used renderer object.
  *
  * @return string
@@ -171,7 +171,7 @@ function hook_panels_post_render($panels_display, $renderer) {
 /**
  * Fired before a new pane is inserted in the storage.
  *
- * @param stdClass $pane
+ * @param object $pane
  *   Pane that will be rendered.
  */
 function hook_panels_pane_insert($pane) {
@@ -188,7 +188,7 @@ function hook_panels_pane_insert($pane) {
 /**
  * Fired before a changed pane is updated in the storage.
  *
- * @param stdClass $pane
+ * @param object $pane
  *   Pane that will be rendered.
  */
 function hook_panels_pane_update($pane) {
@@ -208,7 +208,7 @@ function hook_panels_pane_update($pane) {
  * Last chance to modify the pane before the keyword substitution runs and the
  * pane is rendered.
  *
- * @param stdClass $pane
+ * @param object $pane
  *   Pane that will be rendered.
  */
 function hook_panels_pane_prerender($pane) {
@@ -250,7 +250,7 @@ function hook_panels_display_save($display) {
 /**
  * Fired before a display is deleted.
  *
- * @param integer $did
+ * @param int $did
  *   Id of the display to delete.
  */
 function hook_panels_delete_display($did) {

+ 3 - 3
sites/all/modules/contrib/panels/panels/panels.info

@@ -18,9 +18,9 @@ files[] = tests/PanelsNodeViewWebTestCase.test
 files[] = tests/PanelsTermViewWebTestCase.test
 files[] = tests/PanelsUserViewWebTestCase.test
 
-; 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"
 

+ 16 - 27
sites/all/modules/contrib/panels/panels/panels.install

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Test requirements for installation and running.
  */
@@ -81,7 +85,7 @@ function panels_schema_9() {
   );
 
   return $schema;
- }
+}
 
 function panels_schema_8() {
   $schema = panels_schema_7();
@@ -308,7 +312,7 @@ function panels_schema_3() {
     ),
     'primary key' => array('pid'),
     'indexes' => array(
-      'did_idx' => array('did')
+      'did_idx' => array('did'),
     ),
   );
 
@@ -445,9 +449,7 @@ function panels_update_7300() {
  */
 function panels_update_7301() {
   // Load the schema.
-
   // Due to a previous failure, the field may already exist:
-
   $schema = panels_schema_4();
   $table = 'panels_pane';
   $field = 'locks';
@@ -627,7 +629,7 @@ function panels_update_7306() {
   }
 
   if (!empty($page_manager_panels)) {
-    // Check panels displays that only have empty storage types
+    // Check panels displays that only have empty storage types.
     $result = db_query("SELECT pd.did FROM {panels_display} pd WHERE pd.did IN (:dids) AND storage_type = ''", array(':dids' => array_keys($page_manager_panels)));
     foreach ($result as $row) {
       db_update('panels_display')
@@ -652,28 +654,15 @@ function panels_update_7307() {
     db_create_table($table_name, $schema[$table_name]);
   }
 
-  // Read existing allowed settings and store them in a new table.
-  $variables = db_select('variable', 'v')
-    ->fields('v', array('name'))
-    ->condition('name', '%' . db_like('_allowed_types'), 'LIKE')
-    ->execute()
-    ->fetchCol();
-  foreach ($variables as $name) {
-    $module = str_replace('_allowed_types', '', $name);
-    $variable = variable_get($name);
-    foreach ($variable as $type => $allowed) {
-      $allowed = empty($allowed) ? 0 : 1;
-      db_merge('panels_allowed_types')
-        ->key(array('module' => $module, 'type' => $type))
-        ->fields(array(
-          'module' => $module,
-          'type' => $type,
-          'allowed' => $allowed,
-        ))
-        ->execute();
-    }
-    variable_del($name);
-  }
+  /*
+  The version of this update hook in release 3.8 included code that
+  converted storage of allowed_types configuration from variables to the new
+  table, and also deleted existing allowed_types configuration variables.
+  See https://www.drupal.org/node/2479879.
+
+  In order to prevent data loss on sites that had not yet updated to 3.8, the
+  conversion and variable-deletion code has been removed from this update hook.
+   */
 }
 
 /**

File diff suppressed because it is too large
+ 342 - 227
sites/all/modules/contrib/panels/panels/panels.module


+ 0 - 1
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;

+ 150 - 153
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;
 }

+ 1 - 1
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';

+ 3 - 1
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();

+ 3 - 3
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"
 

+ 27 - 10
sites/all/modules/contrib/panels/panels/panels_ipe/panels_ipe.module

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
@@ -90,12 +94,12 @@ function template_preprocess_panels_ipe_pane_wrapper(&$vars) {
       'attributes' => array(
         'class' => array('ctools-use-modal', 'panels-ipe-hide-bar'),
         'title' => isset($content_type['edit text']) ? $content_type['edit text'] : t('Settings'),
-        // 'id' => "pane-edit-panel-pane-$pane->pid",
+        // 'id' => "pane-edit-panel-pane-$pane->pid",.
       ),
     );
   }
 
-  // Add option to configure style in IPE
+  // Add option to configure style in IPE.
   if (user_access('administer panels pane styles')) {
     $vars['links']['style'] = array(
       'title' => '<span>' . t('Style') . '</span>',
@@ -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' => '<span>' . t('CSS') . '</span>',
+      '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' => '<span>' . t('Delete') . '</span>',
     '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 ='<span class = "panels-ipe-dragbar-admin-title">' . ctools_content_admin_title($type, $pane->subtype, $pane->configuration, $display->context) . '</span>';
+  $title = '<span class = "panels-ipe-dragbar-admin-title">' . ctools_content_admin_title($type, $pane->subtype, $pane->configuration, $display->context) . '</span>';
 
   $links = theme('links', array('links' => $vars['links'], 'attributes' => $attributes));
 
   if (!empty($pane->locks['type']) && $pane->locks['type'] == 'immovable') {
-    $links = '<div class="panels-ipe-dragbar panels-ipe-nodraghandle clearfix">' . $links .$title .'</div>';
+    $links = '<div class="panels-ipe-dragbar panels-ipe-nodraghandle clearfix">' . $links . $title . '</div>';
   }
   else {
     $links = '<div class="panels-ipe-dragbar panels-ipe-draghandle clearfix">' . $links . $title . '<span class="panels-ipe-draghandle-icon"><span class="panels-ipe-draghandle-icon-inner"></span></span></div>';
@@ -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' => '<span>' . t('Region style') . '</span>',
@@ -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' => '<span>' . t('Add new pane') . '</span>',
     '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.
  *

+ 4 - 0
sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/ipe.inc

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 $plugin = array(
   'renderer' => 'panels_renderer_ipe',
 );

+ 23 - 13
sites/all/modules/contrib/panels/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Renderer class for all In-Place Editor (IPE) behavior.
  */
@@ -54,7 +58,6 @@ class panels_renderer_ipe extends panels_renderer_editor {
     // @todo we may need an else to load the cache, but I am not sure we
     // actually need to load it if we already have our cache key, and doing
     // so is a waste of resources.
-
     ctools_include('cleanstring');
     $this->clean_key = ctools_cleanstring($this->display->cache_key);
     $button = array(
@@ -91,8 +94,8 @@ class panels_renderer_ipe extends panels_renderer_editor {
           'ipe_cache_key' => $this->clean_key,
         ),
 
-      '#prefix' => '<div class="panels-ipe-pseudobutton-container">',
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="panels-ipe-pseudobutton-container">',
+        '#suffix' => '</div>',
       );
 
       panels_ipe_toolbar_add_button($this->display->cache_key, 'panels-ipe-change-layout', $button);
@@ -156,13 +159,13 @@ class panels_renderer_ipe extends panels_renderer_editor {
 
     if (empty($pane->IPE_empty)) {
       // Add an inner layer wrapper to the pane content before placing it into
-      // draggable portlet
+      // draggable portlet.
       $output = "<div class=\"panels-ipe-portlet-content\">$output</div>";
     }
     else {
       $output = "<div class=\"panels-ipe-portlet-content panels-ipe-empty-pane\">$output</div>";
     }
-    // Hand it off to the plugin/theme for placing draggers/buttons
+    // Hand it off to the plugin/theme for placing draggers/buttons.
     $output = theme('panels_ipe_pane_wrapper', array('output' => $output, 'pane' => $pane, 'display' => $this->display, 'renderer' => $this));
 
     if (!empty($pane->locks['type']) && $pane->locks['type'] == 'immovable') {
@@ -259,13 +262,17 @@ class panels_renderer_ipe extends panels_renderer_editor {
       // Break the lock.
       panels_edit_cache_break_lock($this->cache);
     }
-  } 
+  }
 
+  /**
+   *
+   */
   function get_panels_storage_op_for_ajax($method) {
     switch ($method) {
       case 'ajax_unlock_ipe':
       case 'ajax_save_form':
         return 'update';
+
       case 'ajax_change_layout':
       case 'ajax_set_layout':
         return 'change layout';
@@ -299,7 +306,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
 
     // Reset the $_POST['ajax_html_ids'] values to preserve
     // proper IDs on form elements when they are rebuilt
-    // by the Panels IPE without refreshing the page
+    // by the Panels IPE without refreshing the page.
     $_POST['ajax_html_ids'] = array();
 
     $form_state = array(
@@ -308,7 +315,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
       'content_types' => $this->cache->content_types,
       'rerender' => FALSE,
       'no_redirect' => TRUE,
-      // Panels needs this to make sure that the layout gets callbacks
+      // Panels needs this to make sure that the layout gets callbacks.
       'layout' => $this->plugins['layout'],
     );
 
@@ -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;
 

+ 4 - 3
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"
 

+ 12 - 8
sites/all/modules/contrib/panels/panels/panels_mini/panels_mini.install

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Implementation of hook_schema().
  */
@@ -105,7 +109,7 @@ function panels_mini_uninstall() {
   foreach ($result as $panel_mini) {
     // Delete all associated displays.
     if (!function_exists('panels_delete_display')) {
-      require_once drupal_get_path('module', 'panels') .'/panels.module';
+      require_once drupal_get_path('module', 'panels') . '/panels.module';
     }
     if ($panels_exists) {
       panels_delete_display($panel_mini->did);
@@ -127,7 +131,7 @@ function panels_mini_uninstall() {
  * Implements hook_update_dependencies().
  */
 function panels_mini_update_dependencies() {
-  // Update 7301 requires panels storage support
+  // Update 7301 requires panels storage support.
   $dependencies['panels_mini'][7301] = array(
     'panels' => 7305,
   );
@@ -140,19 +144,19 @@ function panels_mini_update_dependencies() {
  */
 function panels_mini_update_7301() {
   if (!isset($sandbox['progress'])) {
-     // Initialize batch update information.
-     $sandbox['progress'] = (float)0;
-     $sandbox['current_did'] = -1;
-     $sandbox['max'] = db_query("SELECT COUNT(pd.did)
+    // Initialize batch update information.
+    $sandbox['progress'] = (float) 0;
+    $sandbox['current_did'] = -1;
+    $sandbox['max'] = db_query("SELECT COUNT(pd.did)
          FROM {panels_display} pd
            JOIN {panels_mini} pm ON pm.did = pd.did
          WHERE pd.storage_type = ''")->fetchField();
-   }
+  }
 
   // Set a limit of how many rows to process per batch.
   $limit = 1000;
 
-  // Run the query
+  // Run the query.
   $result = db_query_range("SELECT pd.did, pm.name
       FROM {panels_display} pd
         JOIN {panels_mini} pm ON pm.did = pd.did

+ 8 - 10
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;

+ 1 - 2
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();

+ 4 - 1
sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini.inc

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 $plugin = array(
   'schema' => 'panels_mini',
   'access' => 'administer mini panels',
@@ -38,4 +42,3 @@ $plugin = array(
   ),
 
 );
-

+ 11 - 2
sites/all/modules/contrib/panels/panels/panels_mini/plugins/export_ui/panels_mini_ui.class.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @file
+ */
 class panels_mini_ui extends ctools_export_ui {
   function init($plugin) {
     parent::init($plugin);
@@ -62,23 +65,28 @@ class panels_mini_ui extends ctools_export_ui {
   }
 
   function list_build_row($item, &$form_state, $operations) {
-    // Set up sorting
+    // Set up sorting.
     switch ($form_state['values']['order']) {
       case 'disabled':
         $this->sorts[$item->name] = empty($item->disabled) . $item->admin_title;
         break;
+
       case 'title':
         $this->sorts[$item->name] = $item->admin_title;
         break;
+
       case 'name':
         $this->sorts[$item->name] = $item->name;
         break;
+
       case 'category':
         $this->sorts[$item->name] = ($item->category ? $item->category : t('Mini panels')) . $item->admin_title;
         break;
+
       case 'layout':
         $this->sorts[$item->name] = $item->display->layout . $item->admin_title;
         break;
+
       case 'storage':
         $this->sorts[$item->name] = $item->type . $item->admin_title;
         break;
@@ -115,7 +123,7 @@ class panels_mini_ui extends ctools_export_ui {
   }
 
   function edit_form(&$form, &$form_state) {
-    // Get the basic edit form
+    // Get the basic edit form.
     parent::edit_form($form, $form_state);
 
     // Set the admin title machine name length.
@@ -295,4 +303,5 @@ class panels_mini_ui extends ctools_export_ui {
     panels_edit_display_form_submit($form, $form_state);
     $form_state['item']->display = $form_state['display'];
   }
+
 }

+ 1 - 1
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',
 );

+ 3 - 3
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"
 

+ 12 - 8
sites/all/modules/contrib/panels/panels/panels_node/panels_node.install

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Implementation of hook_schema().
  */
@@ -60,7 +64,7 @@ function panels_node_uninstall() {
  * Implements hook_update_dependencies().
  */
 function panels_node_update_dependencies() {
-  // Update 7301 requires panels storage support
+  // Update 7301 requires panels storage support.
   $dependencies['panels_node'][7301] = array(
     'panels' => 7305,
   );
@@ -69,7 +73,7 @@ function panels_node_update_dependencies() {
 }
 
 /**
- * Implementation of hook_update to handle adding a pipeline
+ * Implementation of hook_update to handle adding a pipeline.
  */
 function panels_node_update_6001() {
   $ret = array();
@@ -125,19 +129,19 @@ function panels_node_update_7301() {
  */
 function panels_node_update_7302() {
   if (!isset($sandbox['progress'])) {
-     // Initialize batch update information.
-     $sandbox['progress'] = (float)0;
-     $sandbox['current_did'] = -1;
-     $sandbox['max'] = db_query("SELECT COUNT(pd.did)
+    // Initialize batch update information.
+    $sandbox['progress'] = (float) 0;
+    $sandbox['current_did'] = -1;
+    $sandbox['max'] = db_query("SELECT COUNT(pd.did)
          FROM {panels_display} pd
            JOIN {panels_node} pn ON pn.did = pd.did
          WHERE pd.storage_type = ''")->fetchField();
-   }
+  }
 
   // Set a limit of how many rows to process per batch.
   $limit = 1000;
 
-  // Run the query
+  // Run the query.
   $result = db_query_range("SELECT pd.did, pn.nid
       FROM {panels_display} pd
         JOIN {panels_node} pn ON pn.did = pd.did

+ 10 - 17
sites/all/modules/contrib/panels/panels/panels_node/panels_node.module

@@ -1,6 +1,4 @@
 <?php
-
-
 /**
  * @file panels_node.module
  *
@@ -10,8 +8,7 @@
  */
 
 // ---------------------------------------------------------------------------
-// General Drupal hooks
-
+// General Drupal hooks.
 /**
  * Implementation of hook_permission().
  */
@@ -81,7 +78,7 @@ function panels_node_menu() {
 }
 
 /**
- * Access callback to determine if a user has edit access
+ * Access callback to determine if a user has edit access.
  */
 function panels_node_edit_node($node) {
   if (!isset($node->panels_node)) {
@@ -113,8 +110,7 @@ function panels_node_add() {
 }
 
 // ---------------------------------------------------------------------------
-// Node hooks
-
+// Node hooks.
 /**
  * Implementation of hook_node_info().
  */
@@ -202,7 +198,7 @@ function panels_node_hook_form(&$node, &$form_state) {
   );
 
   // Support for different rendering pipelines
-  // Mostly borrowed from panel_context.inc
+  // Mostly borrowed from panel_context.inc.
   $pipelines = panels_get_renderer_pipelines();
 
   $options = array();
@@ -257,7 +253,7 @@ function panels_node_hook_insert(&$node) {
 
   // Special handling for nodes being imported from an export.module data dump.
   if (!empty($node->export_display)) {
-    // This works by overriding the $display set above
+    // This works by overriding the $display set above.
     eval($node->export_display);
     unset($node->export_display);
   }
@@ -336,8 +332,7 @@ function panels_node_hook_view($node, $view_mode) {
 }
 
 // ---------------------------------------------------------------------------
-// Administrative pages
-
+// Administrative pages.
 /**
  * Settings for panel nodes.
  */
@@ -347,8 +342,7 @@ function panels_node_settings() {
 }
 
 // ---------------------------------------------------------------------------
-// Meat of the Panels API; almost completely passing through to panels.module
-
+// Meat of the Panels API; almost completely passing through to panels.module.
 /**
  * Pass through to the panels layout editor.
  */
@@ -385,7 +379,7 @@ function panels_node_get_context(&$node) {
 }
 
 /**
- * Implementation of hook_export_node_alter()
+ * Implementation of hook_export_node_alter().
  *
  * Integrate with export.module for saving panel_nodes into code.
  */
@@ -423,13 +417,12 @@ function panels_node_panels_ipe_access($display) {
     // Only allow access to use the IPE if the user has 'update' access to
     // the underlying node.
     $node = $display->context['panel-node']->data;
-    return node_access('update', $node); 
+    return node_access('update', $node);
   }
 }
 
 // ---------------------------------------------------------------------------
 // Callbacks for panel caching.
-
 /**
  * Get display edit cache for a panel node being edited.
  *
@@ -451,7 +444,7 @@ function panels_node_panels_cache_get($nid) {
     $cache->display->css_id = $node->panels_node['css_id'];
     $cache->display->context = panels_node_get_context($node);
     $cache->display->cache_key = 'panels_node:' . $node->nid;
-    $cache->content_types =   panels_common_get_allowed_types('panels_node', $cache->display->context);
+    $cache->content_types = panels_common_get_allowed_types('panels_node', $cache->display->context);
     $cache->allwed_layouts = panels_common_get_allowed_layouts('panels_node');
   }
 

+ 1 - 1
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',
 );

+ 2 - 3
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;
 }
-

+ 4 - 0
sites/all/modules/contrib/panels/panels/plugins/display_renderers/editor.inc

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 $plugin = array(
   'renderer' => 'panels_renderer_editor',
 );

+ 45 - 46
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 = '<em>' . t('Missing content type') . '</em>';
@@ -136,7 +136,7 @@ class panels_renderer_editor extends panels_renderer_standard {
         $settings['Panels']['RegionLock'][$pane->pid] = $pane->locks['regions'];
         drupal_add_js($settings, 'setting');
       }
-      else if ($pane->locks['type'] == 'immovable') {
+      elseif ($pane->locks['type'] == 'immovable') {
         $grabber_class = 'grab-title not-grabber';
       }
     }
@@ -163,15 +163,15 @@ class panels_renderer_editor extends panels_renderer_standard {
       $output .= '<span class="buttons">' . $buttons . '</span>';
     }
     $output .= '<span class="text" title="' . check_plain($title) . '">' . $title . '</span>';
-    $output .= '</div>'; // grabber
-
+    $output .= '</div>';
+    // Grabber.
     $output .= '<div class="panel-pane-collapsible">';
     $output .= '<div class="pane-title">' . $block->title . '</div>';
     $output .= '<div class="pane-content">' . filter_xss_admin(render($block->content)) . '</div>';
-    $output .= '</div>'; // panel-pane-collapsible
-
-    $output .= '</div>'; // panel-pane
-
+    $output .= '</div>';
+    // panel-pane-collapsible.
+    $output .= '</div>';
+    // panel-pane.
     return $output;
   }
 
@@ -360,7 +360,7 @@ class panels_renderer_editor extends panels_renderer_standard {
 
     if (user_access('administer pane access')) {
       $contexts = $this->display->context;
-      // Make sure we have the logged in user context
+      // Make sure we have the logged in user context.
       if (!isset($contexts['logged-in-user'])) {
         $contexts['logged-in-user'] = ctools_access_get_loggedin_context();
       }
@@ -408,9 +408,11 @@ class panels_renderer_editor extends panels_renderer_standard {
         case 'immovable':
           $lock_method = t('Immovable');
           break;
+
         case 'regions':
           $lock_method = t('Regions');
           break;
+
         case 'none':
         default:
           $lock_method = t('No lock');
@@ -464,7 +466,7 @@ class panels_renderer_editor extends panels_renderer_standard {
     );
 
     // Allow others to add/remove links from pane context menu.
-    // Grouped by 'top', 'style', 'visibility', 'lock', 'cache' and 'bottom'
+    // Grouped by 'top', 'style', 'visibility', 'lock', 'cache' and 'bottom'.
     drupal_alter('get_pane_links', $links, $pane, $content_type);
 
     $dropdown_links = $links['top'];
@@ -499,7 +501,6 @@ class panels_renderer_editor extends panels_renderer_standard {
 
   // -----------------------------------------------------------------------
   // Display edit AJAX callbacks and helpers.
-
   /**
    * Generate a URL path for the AJAX editor.
    */
@@ -612,7 +613,7 @@ class panels_renderer_editor extends panels_renderer_standard {
     if (!empty($content_type['top level'])) {
       $category = 'root';
     }
-    else if (isset($content_type['category'])) {
+    elseif (isset($content_type['category'])) {
       if (is_array($content_type['category'])) {
         list($category, $weight) = $content_type['category'];
       }
@@ -668,7 +669,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       }
     }
 
-    // Now sort
+    // Now sort.
     natcasesort($category_names);
     foreach ($category_names as $category => $name) {
       $output[$category] = $categories[$category];
@@ -733,17 +734,17 @@ class panels_renderer_editor extends panels_renderer_standard {
       $pane = $form_state['pane'];
       unset($this->cache->new_pane);
 
-      // Add the pane to the display
+      // Add the pane to the display.
       $this->display->add_pane($pane, $region);
       panels_edit_cache_set($this->cache);
 
-      // Tell the client to draw the pane
+      // Tell the client to draw the pane.
       $this->command_add_pane($pane);
 
       // Dismiss the modal.
       $this->commands[] = ctools_modal_command_dismiss();
     }
-    else if (!empty($form_state['cancel'])) {
+    elseif (!empty($form_state['cancel'])) {
       // If cancelling, return to the activity.
       list($category_key, $category) = $this->get_category($subtype);
       $this->ajax_select_content($region, $category_key);
@@ -786,14 +787,14 @@ class panels_renderer_editor extends panels_renderer_standard {
       'cancel callback' => 'panels_ajax_edit_pane_cancel',
     );
 
-    $output = ctools_content_form('edit', $form_info, $form_state, $content_type, $pane->subtype,  $subtype, $pane->configuration, $step);
+    $output = ctools_content_form('edit', $form_info, $form_state, $content_type, $pane->subtype, $subtype, $pane->configuration, $step);
 
     // If $rc is FALSE, there was no actual form.
     if ($output === FALSE || !empty($form_state['cancel'])) {
       // Dismiss the modal.
       $this->commands[] = ctools_modal_command_dismiss();
     }
-    else if (!empty($form_state['complete'])) {
+    elseif (!empty($form_state['complete'])) {
       // References get blown away with AJAX caching. This will fix that.
       $this->cache->display->content[$pid] = $form_state['pane'];
 
@@ -852,7 +853,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       $conf = &$this->display->cache;
       $title = t('Cache method for this display');
     }
-    else if (!empty($this->display->content[$pid])) {
+    elseif (!empty($this->display->content[$pid])) {
       $pane = &$this->display->content[$pid];
       $subtype = ctools_content_get_subtype($pane->type, $pane->subtype);
       $conf = &$pane->cache;
@@ -896,7 +897,7 @@ class panels_renderer_editor extends panels_renderer_standard {
     else {
       $this->cache->method = $form_state['method'];
       panels_edit_cache_set($this->cache);
-      // send them to next form.
+      // Send them to next form.
       return $this->ajax_cache_settings($pid);
     }
   }
@@ -917,7 +918,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       $conf = &$this->display->cache;
       $title = t('Cache settings for this display');
     }
-    else if (!empty($this->display->content[$pid])) {
+    elseif (!empty($this->display->content[$pid])) {
       $pane = &$this->display->content[$pid];
       $subtype = ctools_content_get_subtype($pane->type, $pane->subtype);
 
@@ -979,7 +980,8 @@ class panels_renderer_editor extends panels_renderer_standard {
         break;
 
       case 'region':
-        $style = isset($this->display->panel_settings[$pid]['style']) ? $this->display->panel_settings[$pid]['style'] : '-1'; // -1 signifies to use the default setting.
+        $style = isset($this->display->panel_settings[$pid]['style']) ? $this->display->panel_settings[$pid]['style'] : '-1';
+        // -1 signifies to use the default setting.
         $title = t('Panel style for region "!region"', array('!region' => $this->plugins['layout']['regions'][$pid]));
         break;
 
@@ -1032,7 +1034,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       }
 
       // If there's no settings form, just change the style and exit.
-      switch($type) {
+      switch ($type) {
         case 'display':
           $this->display->panel_settings['style'] = $form_state['style'];
           if (isset($this->display->panel_settings['style_settings']['default'])) {
@@ -1062,7 +1064,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       if ($type == 'pane') {
         $this->command_update_pane($pane);
       }
-      else if ($type == 'region') {
+      elseif ($type == 'region') {
         $this->command_update_region_links($pid);
       }
       else {
@@ -1075,7 +1077,7 @@ class panels_renderer_editor extends panels_renderer_standard {
         panels_edit_cache_set($this->cache);
       }
 
-      // send them to next form.
+      // Send them to next form.
       return $this->ajax_style_settings($type, $pid);
     }
   }
@@ -1214,11 +1216,11 @@ class panels_renderer_editor extends panels_renderer_standard {
     }
 
     // Copy settings from form state back into the cache.
-    if(!empty($form_state['values']['settings'])) {
+    if (!empty($form_state['values']['settings'])) {
       if ($type == 'pane') {
         $this->cache->display->content[$pid]->style['settings'] = $form_state['values']['settings'];
       }
-      else if($type == 'region') {
+      elseif ($type == 'region') {
         $this->cache->display->panel_settings['style_settings'][$pid] = $form_state['values']['settings'];
       }
     }
@@ -1230,7 +1232,7 @@ class panels_renderer_editor extends panels_renderer_standard {
     if ($type == 'pane') {
       $this->command_update_pane($pane);
     }
-    else if ($type == 'region') {
+    elseif ($type == 'region') {
       $this->command_update_region_links($pid);
     }
     else {
@@ -1354,12 +1356,12 @@ class panels_renderer_editor extends panels_renderer_standard {
 
     $output = ctools_modal_form_wrapper('panels_edit_add_access_test_form', $form_state);
     if (!empty($form_state['executed'])) {
-      // Set up the plugin in cache
+      // Set up the plugin in cache.
       $plugin = ctools_get_access_plugin($form_state['values']['type']);
       $this->cache->new_plugin = ctools_access_new_test($plugin);
       panels_edit_cache_set($this->cache);
 
-      // go to the next step.
+      // Go to the next step.
       return $this->ajax_access_configure_test($pid, 'add');
     }
 
@@ -1387,7 +1389,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       $pane->access['plugins'][] = $this->cache->new_plugin;
       $id = max(array_keys($pane->access['plugins']));
     }
-    else if (empty($pane->access['plugins'][$id])) {
+    elseif (empty($pane->access['plugins'][$id])) {
       ctools_modal_render(t('Error'), t('Invalid test id.'));
     }
 
@@ -1407,7 +1409,7 @@ class panels_renderer_editor extends panels_renderer_standard {
       return;
     }
 
-    // Unset the new plugin
+    // Unset the new plugin.
     if (isset($this->cache->new_plugin)) {
       unset($this->cache->new_plugin);
     }
@@ -1483,7 +1485,6 @@ class panels_renderer_editor extends panels_renderer_standard {
   //
   // These are used to make sure that child implementations can control their
   // own AJAX commands as needed.
-
   /**
    * Create a command array to redraw a pane.
    */
@@ -1527,6 +1528,7 @@ class panels_renderer_editor extends panels_renderer_standard {
   function command_update_region_links($id) {
     $this->commands[] = ajax_command_replace('.panels-region-links-' . $id, $this->get_region_links($id));
   }
+
 }
 
 /**
@@ -1559,10 +1561,9 @@ function panels_ajax_edit_pane_cancel(&$form_state) {
 }
 
 // --------------------------------------------------------------------------
-// Forms for the editor object
-
+// Forms for the editor object.
 /**
- * Choose cache method form
+ * Choose cache method form.
  */
 function panels_edit_cache_method_form($form, &$form_state) {
   ctools_form_include($form_state, 'plugins', 'panels');
@@ -1612,7 +1613,7 @@ function panels_edit_cache_method_form_submit($form, &$form_state) {
 }
 
 /**
- * Cache settings form
+ * Cache settings form.
  */
 function panels_edit_cache_settings_form($form, &$form_state) {
   ctools_form_include($form_state, 'plugins', 'panels');
@@ -1674,7 +1675,7 @@ function panels_edit_cache_settings_form_submit($form, &$form_state) {
 }
 
 /**
- * Choose style form
+ * Choose style form.
  */
 function panels_edit_style_type_form($form, &$form_state) {
   ctools_form_include($form_state, 'plugins', 'panels');
@@ -1726,7 +1727,7 @@ function panels_edit_style_type_form_submit($form, &$form_state) {
 }
 
 /**
- * Style settings form
+ * Style settings form.
  */
 function panels_edit_style_settings_form($form, &$form_state) {
   ctools_form_include($form_state, 'plugins', 'panels');
@@ -1755,7 +1756,6 @@ function panels_edit_style_settings_form($form, &$form_state) {
     '#value' => t('Save'),
   );
 
-
   // Need a cancel button since the style cache can persist and impact the wrong
   // pane (or region, or display).
   $form['cancel_style'] = array(
@@ -2038,7 +2038,7 @@ function panels_edit_configure_access_test_form($form, &$form_state) {
 }
 
 /**
- * Validate handler for visibility rule settings
+ * Validate handler for visibility rule settings.
  */
 function panels_edit_configure_access_test_form_validate(&$form, &$form_state) {
   if (!empty($form_state['clicked_button']['#remove'])) {
@@ -2051,7 +2051,7 @@ function panels_edit_configure_access_test_form_validate(&$form, &$form_state) {
 }
 
 /**
- * Submit handler for visibility rule settings
+ * Submit handler for visibility rule settings.
  */
 function panels_edit_configure_access_test_form_submit(&$form, &$form_state) {
   if (!empty($form_state['clicked_button']['#remove'])) {
@@ -2069,4 +2069,3 @@ function panels_edit_configure_access_test_form_submit(&$form, &$form_state) {
   }
   $form_state['test']['not'] = !empty($form_state['values']['not']);
 }
-

+ 2 - 1
sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_simple.class.php

@@ -23,10 +23,11 @@ class panels_renderer_simple extends panels_renderer_standard {
   }
 
   function render_panes() {
-    // NOP
+    // NOP.
   }
 
   function prepare($external_settings = NULL) {
     $this->prep_run = TRUE;
   }
+
 }

+ 28 - 15
sites/all/modules/contrib/panels/panels/plugins/display_renderers/panels_renderer_standard.class.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * The standard render pipeline for a Panels display object.
  *
@@ -48,6 +52,9 @@
  * with some exceptions (@see panels_renderer_legacy for details). The approach
  * here differs primarily in its friendliness to tweaking in subclasses.
  */
+/**
+ *
+ */
 class panels_renderer_standard {
   /**
    * The fully-loaded Panels display object that is to be rendered. "Fully
@@ -209,9 +216,9 @@ class panels_renderer_standard {
    * method via parent::prepare(), or manually set $this->prep_run = TRUE.
    *
    * @param mixed $external_settings
-   *  An optional parameter allowing external code to pass in additional
-   *  settings for use in the preparation process. Not used in the default
-   *  renderer, but included for interface consistency.
+   *   An optional parameter allowing external code to pass in additional
+   *   settings for use in the preparation process. Not used in the default
+   *   renderer, but included for interface consistency.
    */
   function prepare($external_settings = NULL) {
     $this->prepare_panes($this->display->content);
@@ -232,22 +239,24 @@ class panels_renderer_standard {
    * regularly make additions to the set of panes that will be rendered.
    *
    * @param array $panes
-   *  An associative array of pane data (stdClass objects), keyed on pane id.
+   *   An associative array of pane data (stdClass objects), keyed on pane id.
+   *
    * @return array
    *  An associative array of panes to be rendered, keyed on pane id and sorted
    *  into proper rendering order.
    */
   function prepare_panes($panes) {
     ctools_include('content');
-    // Use local variables as writing to them is very slightly faster
+    // Use local variables as writing to them is very slightly faster.
     $first = $normal = $last = array();
 
-    // Prepare the list of panes to be rendered
+    // Prepare the list of panes to be rendered.
     foreach ($panes as $pid => $pane) {
       if (empty($this->admin)) {
-        // TODO remove in 7.x and ensure the upgrade path weeds out any stragglers; it's been long enough
-        $pane->shown = !empty($pane->shown); // guarantee this field exists.
-        // If this pane is not visible to the user, skip out and do the next one
+        // TODO remove in 7.x and ensure the upgrade path weeds out any stragglers; it's been long enough.
+        $pane->shown = !empty($pane->shown);
+        // Guarantee this field exists.
+        // If this pane is not visible to the user, skip out and do the next one.
         if (!$pane->shown || !panels_pane_access($pane, $this->display)) {
           continue;
         }
@@ -272,7 +281,7 @@ class panels_renderer_standard {
       // If it wants to render first, add it to the $first array. This is used
       // by panes that need to do some processing before other panes are
       // rendered.
-      else if (!empty($content_type['render first'])) {
+      elseif (!empty($content_type['render first'])) {
         $first[$pid] = $pane;
       }
       // Otherwise, render it in the normal order.
@@ -318,6 +327,7 @@ class panels_renderer_standard {
    * @param array $settings
    *   All known region style settings, including both the top-level display's
    *   settings (if any) and all region-specific settings (if any).
+   *
    * @return array
    *   An array of regions prepared for rendering.
    */
@@ -497,9 +507,10 @@ class panels_renderer_standard {
       case 'standard':
         drupal_add_css($filename);
         break;
+
       case 'inline':
         $url = base_path() . $filename;
-        $this->prefix .= '<link type="text/css" rel="stylesheet" href="' . file_create_url($url) . '" />'."\n";
+        $this->prefix .= '<link type="text/css" rel="stylesheet" href="' . file_create_url($url) . '" />' . "\n";
         break;
     }
   }
@@ -533,8 +544,8 @@ class panels_renderer_standard {
    * an individual pane can be bubbled up to take over the title for the entire
    * display.
    *
-   * @param stdClass $pane
-   *  A Panels pane object, as loaded from the database.
+   * @param object $pane
+   *   A Panels pane object, as loaded from the database.
    */
   function render_pane(&$pane) {
     module_invoke_all('panels_pane_prerender', $pane);
@@ -567,7 +578,7 @@ class panels_renderer_standard {
         }
       }
 
-      // fallback
+      // Fallback.
       return theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $this->display));
     }
   }
@@ -578,8 +589,9 @@ class panels_renderer_standard {
    * This method retrieves pane content and produces a ready-to-render content
    * object. It also manages pane-specific caching.
    *
-   * @param stdClass $pane
+   * @param object $pane
    *   A Panels pane object, as loaded from the database.
+   *
    * @return stdClass $content
    *   A renderable object, containing a subject, content, etc. Based on the
    *   renderable objects used by the block system.
@@ -693,4 +705,5 @@ class panels_renderer_standard {
     $output = theme($style['render region'], array('display' => $this->display, 'owner_id' => $owner_id, 'panes' => $panes, 'settings' => $style_settings, 'region_id' => $region_id, 'style' => $style));
     return $output;
   }
+
 }

+ 1 - 0
sites/all/modules/contrib/panels/panels/plugins/display_renderers/simple.inc

@@ -1,5 +1,6 @@
 <?php
 /**
+ * @file
  * Create a simple renderer plugin that renders a layout but the content is
  * already rendered, not in panes.
  */

+ 4 - 0
sites/all/modules/contrib/panels/panels/plugins/display_renderers/standard.inc

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 $plugin = array(
   'renderer' => 'panels_renderer_standard',
 );

+ 4 - 1
sites/all/modules/contrib/panels/panels/plugins/export_ui/panels_layouts.inc

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 $plugin = array(
   'schema' => 'panels_layout',
   'access' => 'administer panels layouts',
@@ -20,4 +24,3 @@ $plugin = array(
     'class' => 'panels_layouts_ui',
   ),
 );
-

File diff suppressed because it is too large
+ 0 - 1
sites/all/modules/contrib/panels/panels/plugins/export_ui/panels_layouts_ui.class.php


+ 2 - 4
sites/all/modules/contrib/panels/panels/plugins/layouts/flexible/flexible-admin.css

@@ -1,4 +1,3 @@
-
 #panels-dnd-main .panel-flexible-edit-layout div.panels-display .pane-add-link,
 .panel-flexible-edit-layout .panel-pane {
   display: none;
@@ -54,8 +53,8 @@
   float: left;
   margin-left: -7px;
   margin-right: -6px;
-	cursor: e-resize;	/* in case col-resize isn't supported */
-	cursor: col-resize;
+  cursor: e-resize;    /* in case col-resize isn't supported */
+  cursor: col-resize;
   height: 30px;
   position: relative;
   z-index: 1;
@@ -84,4 +83,3 @@
 #panels-edit-display .helperclass {
   margin: .5em;
 }
-

+ 0 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/flexible/flexible.css

@@ -1,4 +1,3 @@
-
 .panel-flexible .panel-separator {
   margin: 0 0 1em 0;
 }

+ 77 - 64
sites/all/modules/contrib/panels/panels/plugins/layouts/flexible/flexible.inc

@@ -1,9 +1,14 @@
 <?php
 
 /**
- * Implementation of hook_panels_layouts()
+ * @file
+ * Flexible layout plugin.
  */
-// Plugin definition
+
+/**
+ * Implementation of hook_panels_layouts().
+ */
+// Plugin definition.
 $plugin = array(
   'title' => t('Flexible'),
   'category' => t('Builders'),
@@ -18,14 +23,13 @@ $plugin = array(
   'regions function' => 'panels_flexible_panels',
   'hook menu' => 'panels_flexible_menu',
 
-  // Reuisable layout Builder specific directives
+  // Reusable layout Builder specific directives.
   'builder' => TRUE,
-  'builder tab title' => 'Add flexible layout', // menu so translated elsewhere
-
+  'builder tab title' => 'Add flexible layout',
   'get child' => 'panels_flexible_get_sublayout',
   'get children' => 'panels_flexible_get_sublayouts',
 
-  // Define ajax callbacks
+  // Define ajax callbacks.
   'ajax' => array(
     'settings' => 'panels_ajax_flexible_edit_settings',
     'add' => 'panels_ajax_flexible_edit_add',
@@ -79,9 +83,16 @@ function panels_flexible_get_sublayouts($plugin, $layout_name) {
 }
 
 /**
+ * Flexible panel settings converter.
+ *
  * Convert settings from old style to new, or provide defaults for
  * empty settings.
- * @param <type> $settings
+ *
+ * @param array $settings
+ *   Drupal settings for the layout.
+ *
+ * @return null
+ *   Nothing to return.
  */
 function panels_flexible_convert_settings(&$settings, &$layout) {
   // This indicates that this is a layout that they used the checkbox
@@ -99,7 +110,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
   }
 
   if (empty($settings)) {
-    // set up a default
+    // Set up a default.
     $settings = array(
       'items' => array(
         // The 'canvas' is a special row that does not get rendered
@@ -133,7 +144,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
       ),
     );
   }
-  else if (!isset($settings['items'])) {
+  elseif (!isset($settings['items'])) {
     // Convert an old style flexible to a new style flexible.
     $old = $settings;
     $settings = array();
@@ -143,7 +154,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
       'children' => array(),
       'parent' => NULL,
     );
-    // add the left sidebar column, row and region if it exists.
+    // Add the left sidebar column, row and region if it exists.
     if (!empty($old['sidebars']['left'])) {
       $settings['items']['canvas']['children'][] = 'sidebar-left';
       $settings['items']['sidebar-left'] = array(
@@ -205,28 +216,28 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
 
     // Add rows and regions.
     for ($row = 1; $row <= intval($old['rows']); $row++) {
-      // Create entry for the row
+      // Create entry for the row:
       $settings['items']["row_$row"] = array(
         'type' => 'row',
         'contains' => 'region',
         'children' => array(),
         'parent' => 'main',
       );
-      // Add the row to the parent's children
+      // Add the row to the parent's children:
       $settings['items']['main']['children'][] = "row_$row";
 
       for ($col = 1; $col <= intval($old["row_$row"]['columns']); $col++) {
-        // Create entry for the region
+        // Create entry for the region:
         $settings['items']["row_${row}_$col"] = array(
           'type' => 'region',
           'width' => $old["row_$row"]["width_$col"],
           'width_type' => '%',
           'parent' => "row_$row",
         );
-        // Add entry for the region to the row's children
+        // Add entry for the region to the row's children:
         $settings['items']["row_$row"]['children'][] = "row_${row}_$col";
 
-        // Apply the proper title to the region
+        // Apply the proper title to the region:
         if (!empty($old["row_$row"]['names'][$col - 1])) {
           $settings['items']["row_${row}_$col"]['title'] = $old["row_$row"]['names'][$col - 1];
         }
@@ -236,7 +247,7 @@ function panels_flexible_convert_settings(&$settings, &$layout) {
       }
     }
   }
-  else if (isset($settings['canvas'])) {
+  elseif (isset($settings['canvas'])) {
     // Convert the old 'canvas' to the new canvas row.
     $settings['items']['canvas'] = array(
       'type' => 'row',
@@ -259,7 +270,7 @@ function panels_flexible_panels($display, $settings, $layout) {
     if (!isset($item['type'])) {
       unset($items[$id]);
     }
-    else if ($item['type'] == 'region') {
+    elseif ($item['type'] == 'region') {
       $items[$id] = $item['title'];
     }
   }
@@ -276,13 +287,13 @@ function panels_flexible_panels($display, $settings, $layout) {
  * @todo Convert the functions to methods and make this properly OO.
  */
 function panels_flexible_create_renderer($admin, $css_id, $content, $settings, &$display, $layout, $handler) {
-  $renderer = new stdClass;
+  $renderer = new stdClass();
   $renderer->settings = $settings;
   $renderer->content = $content;
   $renderer->css_id = $css_id;
   $renderer->did = &$display->did;
   if ($admin) {
-    // always scale in admin mode.
+    // Always scale in admin mode.
     $renderer->scale_base = 99.0;
   }
   else {
@@ -325,7 +336,6 @@ function panels_flexible_create_renderer($admin, $css_id, $content, $settings, &
   $renderer->row_separation = !empty($settings['items']['canvas']['row_separation']) ? $settings['items']['canvas']['row_separation'] : '0.5em';
 
   // Make some appended classes so it's easier to reference them.
-
   $renderer->base['column'] = $renderer->item_class['column'] . '-' . $renderer->base_class;
   $renderer->base['row']    = $renderer->item_class['row'] . '-' . $renderer->base_class;
   $renderer->base['region'] = $renderer->item_class['region'] . '-' . $renderer->base_class;
@@ -386,7 +396,7 @@ function theme_panels_flexible($vars) {
   }
 
   // Also store the CSS on the display in case the live preview or something
-  // needs it
+  // needs it.
   $display->add_css = $css;
 
   $output = "<div class=\"panel-flexible " . $renderer->base['canvas'] . " clearfix\" $renderer->id_str>\n";
@@ -394,7 +404,7 @@ function theme_panels_flexible($vars) {
 
   $output .= panels_flexible_render_items($renderer, $settings['items']['canvas']['children'], $renderer->base['canvas']);
 
-  // Wrap the whole thing up nice and snug
+  // Wrap the whole thing up nice and snug.
   $output .= "</div>\n</div>\n";
 
   return $output;
@@ -443,7 +453,7 @@ function theme_panels_flexible_admin($vars) {
   $content = panels_flexible_render_items($renderer, $settings['items']['canvas']['children'], $renderer->base['row'] . '-canvas');
   $output .= panels_flexible_render_item($renderer, $settings['items']['canvas'], $content, 'canvas', 0, 0, TRUE);
 
-  // Wrap the whole thing up nice and snug
+  // Wrap the whole thing up nice and snug.
   $output .= "</div>\n</div>\n";
 
   drupal_add_js($layout['path'] . '/flexible-admin.js');
@@ -464,7 +474,7 @@ function panels_flexible_render_items($renderer, $list, $owner_id) {
     $item = $renderer->settings['items'][$id];
     $location = isset($renderer->positions[$id]) ? $renderer->positions[$id] : 'middle';
 
-    if ($renderer->admin && $item['type'] != 'row' && $prev ) {
+    if ($renderer->admin && $item['type'] != 'row' && $prev) {
       $groups[$location] .= panels_flexible_render_splitter($renderer, $prev, $id);
     }
 
@@ -475,12 +485,14 @@ function panels_flexible_render_items($renderer, $list, $owner_id) {
           $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max);
         }
         break;
+
       case 'row':
         $content = panels_flexible_render_items($renderer, $item['children'], $renderer->base['row'] . '-' . $id);
         if (empty($renderer->settings['items'][$id]['hide_empty']) || trim($content)) {
           $groups[$location] .= panels_flexible_render_item($renderer, $item, $content, $id, $position, $max, TRUE);
         }
         break;
+
       case 'region':
         if (empty($renderer->settings['items'][$id]['hide_empty'])) {
           $content = isset($renderer->content[$id]) ? $renderer->content[$id] : "&nbsp;";
@@ -611,7 +623,7 @@ function panels_flexible_render_splitter($renderer, $left_id, $right_id) {
   $output = '<div tabindex="0"
     class="panels-flexible-splitter flexible-splitter-for-' . $left_class . '">';
 
-  // Name the left object
+  // Name the left object:
   $output .= '<span class="panels-flexible-splitter-left">';
   $output .= '.' . $left_class;
   $output .= '</span>';
@@ -632,7 +644,7 @@ function panels_flexible_render_splitter($renderer, $left_id, $right_id) {
   $output .= $left['width_type'];
   $output .= '</span>';
 
-  // Name the right object
+  // Name the right object:
   $output .= '<span class="panels-flexible-splitter-right">';
   $output .= '.' . $right_class;
   $output .= '</span>';
@@ -677,7 +689,7 @@ function panels_flexible_render_item_links($renderer, $id, $item) {
       $add2 = t('Add row to bottom');
     }
   }
-  else if ($item['type'] == 'row') {
+  elseif ($item['type'] == 'row') {
     if ($id == 'canvas') {
       $title = t('Canvas');
       $settings = t('Canvas settings');
@@ -697,7 +709,7 @@ function panels_flexible_render_item_links($renderer, $id, $item) {
       $add2 = $item['contains'] == 'region' ? t('Add region to right') : t('Add column to right');
     }
   }
-  else if ($item['type'] == 'region') {
+  elseif ($item['type'] == 'region') {
     $title = t('Region');
     $settings = t('Region settings');
     $remove = t('Remove region');
@@ -757,7 +769,7 @@ function panels_flexible_render_css($renderer) {
 function panels_flexible_render_css_group($renderer, $list, $owner_id, $type, $id) {
   $css = array();
 
-  // Start off with some generic CSS to properly pad regions
+  // Start off with some generic CSS to properly pad regions.
   $css[$owner_id . ' .' . $renderer->item_class['region']] = array(
     'padding' => '0',
   );
@@ -792,7 +804,7 @@ function panels_flexible_render_css_group($renderer, $list, $owner_id, $type, $i
     'padding-right' => '0',
   );
 
-  // And properly pad rows too
+  // And properly pad rows too:
   $css[$owner_id . ' .' . $renderer->item_class['row']] = array(
     'padding' => '0 0 ' . $renderer->row_separation . ' 0',
     'margin' => '0',
@@ -818,7 +830,6 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
   if ($type != 'row') {
     // Go through our items and break up into right/center/right groups so we
     // can figure out our offsets.
-
     // right == any items on the right that are 'fixed'.
     // middle == all fluid items.
     // right == any items on the right that are 'fixed'.
@@ -827,7 +838,7 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
     $current = 'left';
     foreach ($list as $id) {
       if ($renderer->settings['items'][$id]['width_type'] == 'px') {
-        // fixed
+        // Fixed:
         if ($current == 'left') {
           $left[] = $id;
           $renderer->positions[$id] = 'left';
@@ -841,14 +852,14 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
         }
       }
       else {
-        // fluid
+        // Fluid:
         if ($current != 'right') {
           $current = 'middle';
           $middle[] = $id;
           $renderer->positions[$id] = 'middle';
           $middle_total += $renderer->settings['items'][$id]['width'];
         }
-        // fall through: if current is 'right' and we ran into a 'fluid' then
+        // Fall through: if current is 'right' and we ran into a 'fluid' then
         // it gets *dropped* because that is invalid.
       }
     }
@@ -903,7 +914,7 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
       $css["$owner_id-inside"]['padding-left'] = '0px';
       if ($renderer->admin || count($middle)) {
         $css["$owner_id-middle"]['margin-left'] = $left_total . 'px';
-        // IE hack
+        // IE hack!
         $css["* html $owner_id-left"]['left'] = $left_total . "px";
         // Make this one very specific to the admin CSS so that preview
         // does not stomp it.
@@ -912,7 +923,7 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
       else {
         $css["$owner_id-inside"]['margin-left'] = '-' . $left_total . 'px';
         $css["$owner_id-inside"]['padding-left'] = $left_total . 'px';
-        // IE hack
+        // IE hack!
         $css["* html $owner_id-inside"]['left'] = $left_total . "px";
       }
     }
@@ -958,8 +969,10 @@ function panels_flexible_get_css_group(&$css, $renderer, $list, $owner_id, $type
 /**
  * AJAX responder to edit flexible settings for an item.
  *
- * $handler object
+ * @param object $handler
  *   The display renderer handler object.
+ * @param mixed $id
+ *   Id for the panel.
  */
 function panels_ajax_flexible_edit_settings($handler, $id) {
   $settings = &$handler->display->layout_settings;
@@ -976,11 +989,11 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
     $siblings = $settings['items'][$item['parent']]['children'];
   }
 
-
   switch ($item['type']) {
     case 'column':
       $title = t('Configure column');
       break;
+
     case 'row':
       if ($id == 'canvas') {
         $title = t('Configure canvas');
@@ -989,6 +1002,7 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
         $title = t('Configure row');
       }
       break;
+
     case 'region':
       $title = t('Configure region');
       break;
@@ -1026,9 +1040,9 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
     $output[] = ajax_command_replace('.flexible-links-' . $id,
       panels_flexible_render_item_links($renderer, $id, $item));
 
-    // If editing the canvas, reset the CSS width
+    // If editing the canvas, reset the CSS width.
     if ($id == 'canvas') {
-      // update canvas CSS.
+      // Update canvas CSS.
       $css = array(
         '.' . $renderer->item_class['column'] . '-inside' => array(
           'padding-left' => $renderer->column_separation,
@@ -1061,9 +1075,6 @@ function panels_ajax_flexible_edit_settings($handler, $id) {
 
 /**
  * Configure a row, column or region on the flexible page.
- *
- * @param <type> $form_state
- * @return <type>
  */
 function panels_flexible_config_item_form($form, &$form_state) {
   $display = &$form_state['display'];
@@ -1162,8 +1173,9 @@ function panels_flexible_config_item_form($form, &$form_state) {
         if ($sibling == $id) {
           $current = 'right';
         }
-        else if ($settings['items'][$sibling]['width_type'] == '%') {
-          $$current = TRUE; // Indirection.
+        elseif ($settings['items'][$sibling]['width_type'] == '%') {
+          // Indirection.
+          $$current = TRUE;
         }
       }
 
@@ -1234,7 +1246,7 @@ function panels_flexible_config_item_form_submit(&$form, &$form_state) {
     $item['region_separation'] = $form_state['values']['region_separation'];
     $item['row_separation'] = $form_state['values']['row_separation'];
   }
-  else if ($item['type'] != 'row') {
+  elseif ($item['type'] != 'row') {
     $item['width_type'] = $form_state['values']['width_type'];
   }
   else {
@@ -1270,6 +1282,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
         'parent' => $id,
       );
       break;
+
     case 'row':
       switch ($parent['contains']) {
         case 'region':
@@ -1282,6 +1295,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
             'parent' => $id,
           );
           break;
+
         case 'column':
           $title = $location == 'left' ? t('Add column to left') : t('Add column to right');
           $item = array(
@@ -1295,6 +1309,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
       }
       // Create the new item with defaults.
       break;
+
     case 'region':
       // Cannot add items to regions.
       break;
@@ -1344,8 +1359,8 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
 
     }
 
-    // render the item
-    $parent_class =  $renderer->base[$parent['type']] . '-' . $id;
+    // Render the item.
+    $parent_class = $renderer->base[$parent['type']] . '-' . $id;
     $item_output = panels_flexible_render_item($renderer, $item, $content, $form_state['key'], 0, 0, $item['type'] == 'row');
 
     // Get all the CSS necessary for the entire row (as width adjustments may
@@ -1364,22 +1379,24 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
           $item_output .= panels_flexible_render_splitter($renderer, $form_state['key'], $form_state['sibling']);
           $output[] = ajax_command_prepend('#panels-dnd-main .' . $parent_class . '-left', $item_output);
         }
-        else if ($location == 'right') {
+        elseif ($location == 'right') {
           // If we are adding to the right side of the left box, there is
           // a splitter that we have to remove; then we add our box normally,
           // and then add a new splitter for just our guy.
           $output[] = ajax_command_remove('panels-flexible-splitter-for-' . $renderer->base[$item['type']] . '-' . $form_state['key']);
-          $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) .  $item_output;
+          $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
           $item_output .= panels_flexible_render_splitter($renderer, $form_state['key'], NULL);
           $output[] = ajax_command_append('#panels-dnd-main .' . $parent_class . '-left', $item_output);
         }
         break;
+
       case 'right':
         if (!empty($form_state['sibling'])) {
-          $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) .  $item_output;
+          $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
         }
         $output[] = ajax_command_append('#panels-dnd-main .' . $parent_class . '-right', $item_output);
         break;
+
       case 'middle':
         if ($location == 'left') {
           if (!empty($form_state['sibling'])) {
@@ -1389,7 +1406,7 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
         }
         else {
           if (!empty($form_state['sibling'])) {
-            $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) .  $item_output;
+            $item_output = panels_flexible_render_splitter($renderer, $form_state['sibling'], $form_state['key']) . $item_output;
           }
           $output[] = ajax_command_append('#panels-dnd-main .' . $parent_class . '-middle', $item_output);
         }
@@ -1429,8 +1446,6 @@ function panels_ajax_flexible_edit_add($handler, $id, $location = 'left') {
 }
 /**
  * Form to add a row, column or region to a flexible layout.
- * @param <type> $form_state
- * @return <type>
  */
 function panels_flexible_add_item_form($form, &$form_state) {
   $display = &$form_state['display'];
@@ -1543,7 +1558,7 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
   $item['hide_empty'] = $form_state['values']['hide_empty'];
 
   if ($item['type'] == 'region') {
-    // derive the region key from the title
+    // Derive the region key from the title.
     $key = preg_replace("/[^a-z0-9]/", '_', drupal_strtolower($item['title']));
     while (isset($settings['items'][$key])) {
       $key .= '_';
@@ -1569,7 +1584,7 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
     // If there is no sibling, or the sibling is of a different type,
     // the default 100 will work for either fixed or fluid.
     if ($form_state['sibling'] && $settings['items'][$form_state['sibling']]['width_type'] == $item['width_type']) {
-      // steal half of the sibling's space.
+      // Steal half of the sibling's space.
       $width = $settings['items'][$form_state['sibling']]['width'] / 2;
       $settings['items'][$form_state['sibling']]['width'] = $width;
       $item['width'] = $width;
@@ -1587,8 +1602,9 @@ function panels_flexible_add_item_form_submit(&$form, &$form_state) {
 }
 
 /**
- * AJAX responder to remove an existing row, column or region from a flexible
- * layout.
+ * Panels remove AJAX responder.
+ *
+ * Removes an existing row, column or region from a flexible layout.
  */
 function panels_ajax_flexible_edit_remove($handler, $id) {
   $settings = &$handler->display->layout_settings;
@@ -1602,10 +1618,8 @@ function panels_ajax_flexible_edit_remove($handler, $id) {
   $css_id = isset($handler->display->css_id) ? $handler->display->css_id : '';
   // Create a renderer object so we can render our new stuff.
   $renderer = panels_flexible_create_renderer(TRUE, $css_id, array(), $settings, $handler->display, $handler->plugins['layout'], $handler);
-
-
   $siblings = &$settings['items'][$item['parent']]['children'];
-  $parent_class = '.'  . $renderer->base[$settings['items'][$item['parent']]['type']] . '-' . $item['parent'];
+  $parent_class = '.' . $renderer->base[$settings['items'][$item['parent']]['type']] . '-' . $item['parent'];
 
   // Find the offset of our array. This will also be the key because
   // this is a simple array.
@@ -1627,7 +1641,7 @@ function panels_ajax_flexible_edit_remove($handler, $id) {
         $settings['items'][$next]['width'] += $item['width'];
       }
       // If that failed, try the previous one.
-      else if (isset($prev) && $settings['items'][$prev]['width_type'] == '%') {
+      elseif (isset($prev) && $settings['items'][$prev]['width_type'] == '%') {
         $settings['items'][$prev]['width'] += $item['width'];
       }
     }
@@ -1687,8 +1701,7 @@ function panels_ajax_flexible_edit_remove($handler, $id) {
 }
 
 /**
- * AJAX responder to store resize information when the user adjusts the
- * splitter.
+ * AJAX responder to store resize information when the user adjusts splitter.
  */
 function panels_ajax_flexible_edit_resize($handler) {
   ctools_include('ajax');

+ 0 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/onecol/onecol.css

@@ -1,4 +1,3 @@
-
 .panel-1col {
 /*  overflow: hidden;  */
 }

+ 3 - 2
sites/all/modules/contrib/panels/panels/plugins/layouts/onecol/onecol.inc

@@ -1,9 +1,10 @@
 <?php
 
 /**
- * implementation of hook_panels_layouts()
+ * @file
+ * Implementation of hook_panels_layouts().
  */
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('Single column'),
   'category' => t('Columns: 1'),

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/onecol/panels-onecol.tpl.php

@@ -12,7 +12,7 @@
  *   $content['middle']: The only panel in the layout.
  */
 ?>
-<div class="panel-display panel-1col clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-1col clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <div class="panel-panel panel-col">
     <div><?php print $content['middle']; ?></div>
   </div>

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php

@@ -14,7 +14,7 @@
  *   - $content['right']: Content in the right column.
  */
 ?>
-<div class="panel-display panel-3col clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <div class="panel-panel panel-col-first">
     <div class="inside"><?php print $content['left']; ?></div>
   </div>

+ 13 - 14
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25/threecol_25_50_25.css

@@ -1,32 +1,31 @@
-
-.panel-3col { 
+.panel-3col {
 /*  overflow: hidden;  */
 }
 
-.panel-3col .panel-col-first { 
-  float: left; 
-  width: 25%; 
+.panel-3col .panel-col-first {
+  float: left;
+  width: 25%;
 }
 
-.panel-3col .panel-col-first .inside { 
+.panel-3col .panel-col-first .inside {
   margin: 0 .5em 1em 0;
 }
 
-.panel-3col .panel-col { 
-  float: left; 
-  width: 50%; 
+.panel-3col .panel-col {
+  float: left;
+  width: 50%;
 }
 
-.panel-3col .panel-col .inside { 
+.panel-3col .panel-col .inside {
   margin: 0 .5em 1em .5em;
 }
 
-.panel-3col .panel-col-last { 
-  float: left; 
-  width: 25%; 
+.panel-3col .panel-col-last {
+  float: left;
+  width: 25%;
 }
 
-.panel-3col .panel-col-last .inside { 
+.panel-3col .panel-col-last .inside {
   margin: 0 0 1em .5em;
 }
 

+ 4 - 4
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc

@@ -1,9 +1,10 @@
 <?php
 
 /**
- * implementation of hook_panels_layouts
+ * @file
+ * Implementation of hook_panels_layouts.
  */
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('Three column 25/50/25'),
   'category' => t('Columns: 3'),
@@ -14,7 +15,6 @@ $plugin = array(
   'regions' => array(
     'left' => t('Left side'),
     'middle' => t('Middle column'),
-    'right' => t('Right side')
+    'right' => t('Right side'),
   ),
 );
-

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php

@@ -17,7 +17,7 @@
  *   - $content['bottom']: Content in the bottom row.
  */
 ?>
-<div class="panel-display panel-3col-stacked clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col-stacked clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <?php if ($content['top']): ?>
     <div class="panel-panel panel-col-top">
       <div class="inside"><?php print $content['top']; ?></div>

+ 15 - 16
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css

@@ -1,11 +1,10 @@
-
-.panel-3col-stacked { 
+.panel-3col-stacked {
 /*  overflow: hidden;  */
 }
 
 .panel-3col-stacked .panel-col-top,
-.panel-3col-stacked .panel-col-bottom { 
-  width: 100%; 
+.panel-3col-stacked .panel-col-bottom {
+  width: 100%;
   clear: both;
 }
 
@@ -13,30 +12,30 @@
   margin-bottom: .5em;
 }
 
-.panel-3col-stacked .panel-col-first { 
-  float: left; 
-  width: 25%; 
+.panel-3col-stacked .panel-col-first {
+  float: left;
+  width: 25%;
 }
 
-.panel-3col-stacked .panel-col-first .inside { 
+.panel-3col-stacked .panel-col-first .inside {
   margin: 0 .5em 1em .5em;
 }
 
-.panel-3col-stacked .panel-col { 
-  float: left; 
-  width: 50%; 
+.panel-3col-stacked .panel-col {
+  float: left;
+  width: 50%;
 }
 
-.panel-3col-stacked .panel-col .inside { 
+.panel-3col-stacked .panel-col .inside {
   margin: 0 .5em 1em .5em;
 }
 
-.panel-3col-stacked .panel-col-last { 
-  float: left; 
-  width: 25%; 
+.panel-3col-stacked .panel-col-last {
+  float: left;
+  width: 25%;
 }
 
-.panel-3col-stacked .panel-col-last .inside { 
+.panel-3col-stacked .panel-col-last .inside {
   margin: 0 0 1em .5em;
 }
 

+ 4 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc

@@ -1,6 +1,9 @@
 <?php
 
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
 $plugin = array(
   'title' => t('Three column 25/50/25 stacked'),
   'category' => t('Columns: 3'),

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php

@@ -16,7 +16,7 @@
  */
 ?>
 
-<div class="panel-display panel-3col-33 clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col-33 clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <div class="panel-panel panel-col-first">
     <div class="inside"><?php print $content['left']; ?></div>
   </div>

+ 13 - 14
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33/threecol_33_34_33.css

@@ -1,32 +1,31 @@
-
-.panel-3col-33 { 
+.panel-3col-33 {
 /*  overflow: hidden;  */
 }
 
-.panel-3col-33 .panel-col-first { 
-  float: left; 
-  width: 33%; 
+.panel-3col-33 .panel-col-first {
+  float: left;
+  width: 33%;
 }
 
-.panel-3col-33 .panel-col-first .inside { 
+.panel-3col-33 .panel-col-first .inside {
   margin: 0 .5em 1em 0;
 }
 
-.panel-3col-33 .panel-col { 
-  float: left; 
-  width: 33%; 
+.panel-3col-33 .panel-col {
+  float: left;
+  width: 33%;
 }
 
-.panel-3col-33 .panel-col .inside { 
+.panel-3col-33 .panel-col .inside {
   margin: 0 .5em 1em .5em;
 }
 
-.panel-3col-33 .panel-col-last { 
-  float: left; 
-  width: 33%; 
+.panel-3col-33 .panel-col-last {
+  float: left;
+  width: 33%;
 }
 
-.panel-3col-33 .panel-col-last .inside { 
+.panel-3col-33 .panel-col-last .inside {
   margin: 0 0 1em .5em;
 }
 

+ 6 - 3
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc

@@ -1,6 +1,9 @@
 <?php
 
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
 $plugin = array(
   'title' => t('Three column 33/34/33'),
   'category' => t('Columns: 3'),
@@ -10,6 +13,6 @@ $plugin = array(
   'regions' => array(
     'left' => t('Left side'),
     'middle' => t('Middle column'),
-    'right' => t('Right side')
-   ),
+    'right' => t('Right side'),
+  ),
 );

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php

@@ -17,7 +17,7 @@
  *   - $content['bottom']: Content in the bottom row.
  */
 ?>
-<div class="panel-display panel-3col-33-stacked  clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-3col-33-stacked  clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <?php if ($content['top']): ?>
     <div class="panel-panel panel-col-top">
       <div class="inside"><?php print $content['top']; ?></div>

+ 15 - 16
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css

@@ -1,11 +1,10 @@
-
-.panel-3col-33-stacked { 
+.panel-3col-33-stacked {
 /*  overflow: hidden;  */
 }
 
 .panel-3col-33-stacked .panel-col-top,
-.panel-3col-33-stacked .panel-col-bottom { 
-  width: 100%; 
+.panel-3col-33-stacked .panel-col-bottom {
+  width: 100%;
   clear: both;
 }
 
@@ -13,30 +12,30 @@
   margin-bottom: 1em;
 }
 
-.panel-3col-33-stacked .panel-col-first { 
-  float: left; 
-  width: 33%; 
+.panel-3col-33-stacked .panel-col-first {
+  float: left;
+  width: 33%;
 }
 
-.panel-3col-33-stacked .panel-col-first .inside { 
+.panel-3col-33-stacked .panel-col-first .inside {
   margin: 0 .5em 1em 0;
 }
 
-.panel-3col-33-stacked .panel-col { 
-  float: left; 
-  width: 33%; 
+.panel-3col-33-stacked .panel-col {
+  float: left;
+  width: 33%;
 }
 
-.panel-3col-33-stacked .panel-col .inside { 
+.panel-3col-33-stacked .panel-col .inside {
   margin: 0 .5em 1em .5em;
 }
 
-.panel-3col-33-stacked .panel-col-last { 
-  float: left; 
-  width: 33%; 
+.panel-3col-33-stacked .panel-col-last {
+  float: left;
+  width: 33%;
 }
 
-.panel-3col-33-stacked .panel-col-last .inside { 
+.panel-3col-33-stacked .panel-col-last .inside {
   margin: 0 0 1em .5em;
 }
 

+ 5 - 2
sites/all/modules/contrib/panels/panels/plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc

@@ -1,6 +1,9 @@
 <?php
 
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
 $plugin = array(
   'title' => t('Three column 33/34/33 stacked'),
   'category' => t('Columns: 3'),
@@ -12,6 +15,6 @@ $plugin = array(
     'left' => t('Left side'),
     'middle' => t('Middle column'),
     'right' => t('Right side'),
-    'bottom' => t('Bottom')
+    'bottom' => t('Bottom'),
   ),
 );

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol/panels-twocol.tpl.php

@@ -14,7 +14,7 @@
  *   - $content['right']: Content in the right column.
  */
 ?>
-<div class="panel-display panel-2col clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-2col clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <div class="panel-panel panel-col-first">
     <div class="inside"><?php print $content['left']; ?></div>
   </div>

+ 9 - 10
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol/twocol.css

@@ -1,29 +1,28 @@
-
-.panel-2col { 
+.panel-2col {
 /*  overflow: hidden;  */
 }
 
-.panel-2col .panel-col-first { 
-  float: left; 
-  width: 50%; 
+.panel-2col .panel-col-first {
+  float: left;
+  width: 50%;
 }
 * html .panel-2col .panel-col-first {
   width: 49.9%;
 }
 
-.panel-2col .panel-col-first .inside { 
+.panel-2col .panel-col-first .inside {
   margin: 0 .5em 1em 0;
 }
 
-.panel-2col .panel-col-last { 
-  float: left; 
-  width: 50%; 
+.panel-2col .panel-col-last {
+  float: left;
+  width: 50%;
 }
 * html .panel-2col .panel-col-last {
   width: 49.9%;
 }
 
-.panel-2col .panel-col-last .inside { 
+.panel-2col .panel-col-last .inside {
   margin: 0 0 1em .5em;
 }
 

+ 5 - 2
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol/twocol.inc

@@ -1,6 +1,9 @@
 <?php
 
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
 $plugin = array(
   'title' => t('Two column'),
   'category' => t('Columns: 2'),
@@ -9,6 +12,6 @@ $plugin = array(
   'css' => 'twocol.css',
   'regions' => array(
     'left' => t('Left side'),
-    'right' => t('Right side')
+    'right' => t('Right side'),
   ),
 );

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php

@@ -22,7 +22,7 @@
  *   - $content['bottom']: Content in the bottom row.
  */
 ?>
-<div class="panel-display panel-2col-bricks clearfix" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-display panel-2col-bricks clearfix" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <div class="panel-panel panel-col-top">
     <div class="inside"><?php print $content['top']; ?></div>
   </div>

+ 11 - 12
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_bricks/twocol_bricks.css

@@ -1,5 +1,4 @@
-
-.panel-2col-bricks { 
+.panel-2col-bricks {
 /*  overflow: hidden;  */
   margin-top: 0;
   padding-top: 0;
@@ -7,8 +6,8 @@
 
 .panel-2col-bricks .panel-col-top,
 .panel-2col-bricks .panel-col-middle,
-.panel-2col-bricks .panel-col-bottom { 
-  width: 99.9%; 
+.panel-2col-bricks .panel-col-bottom {
+  width: 99.9%;
   clear: both;
 }
 
@@ -17,27 +16,27 @@
   margin-bottom: .5em;
 }
 
-.panel-2col-bricks .panel-col-first { 
-  float: left; 
-  width: 50%; 
+.panel-2col-bricks .panel-col-first {
+  float: left;
+  width: 50%;
 }
 * html .panel-2col-bricks .panel-col-first {
   width: 49.9%;
 }
 
-.panel-2col-bricks .panel-col-first .inside { 
+.panel-2col-bricks .panel-col-first .inside {
   margin: 0 .5em .5em 0;
 }
 
-.panel-2col-bricks .panel-col-last { 
-  float: left; 
-  width: 50%; 
+.panel-2col-bricks .panel-col-last {
+  float: left;
+  width: 50%;
 }
 * html .panel-2col-bricks .panel-col-last {
   width: 49.9%;
 }
 
-.panel-2col-bricks .panel-col-last .inside { 
+.panel-2col-bricks .panel-col-last .inside {
   margin: 0 0 .5em .5em;
 }
 

+ 2 - 3
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_bricks/twocol_bricks.inc

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Implementation for the two column bricked layout
+ * Implementation for the two column bricked layout.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('Two column bricks'),
   'category' => t('Columns: 2'),
@@ -22,4 +22,3 @@ $plugin = array(
     'bottom' => t('Bottom'),
   ),
 );
-

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php

@@ -16,7 +16,7 @@
  *   - $content['bottom']: Content in the bottom row.
  */
 ?>
-<div class="panel-2col-stacked clearfix panel-display" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+<div class="panel-2col-stacked clearfix panel-display" <?php if (!empty($css_id)) {print "id=\"$css_id\"";} ?>>
   <?php if ($content['top']): ?>
     <div class="panel-col-top panel-panel">
       <div class="inside"><?php print $content['top']; ?></div>

+ 11 - 12
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_stacked/twocol_stacked.css

@@ -1,13 +1,12 @@
-
-.panel-2col-stacked { 
+.panel-2col-stacked {
 /*  overflow: hidden;  */
   margin-top: 0;
   padding-top: 0;
 }
 
 .panel-2col-stacked .panel-col-top,
-.panel-2col-stacked .panel-col-bottom { 
-  width: 99.9%; 
+.panel-2col-stacked .panel-col-bottom {
+  width: 99.9%;
   clear: both;
 }
 
@@ -15,24 +14,24 @@
   margin-bottom: .5em;
 }
 
-.panel-2col-stacked .panel-col-first { 
-  float: left; 
-  width: 50%; 
+.panel-2col-stacked .panel-col-first {
+  float: left;
+  width: 50%;
 }
 * html .panel-2col-stacked .panel-col-first {
   width: 49.9%;
 }
 
-.panel-2col-stacked .panel-col-first .inside { 
+.panel-2col-stacked .panel-col-first .inside {
   margin: 0 .5em 1em 0;
 }
 
-.panel-2col-stacked .panel-col-last { 
-  float: left; 
-  width: 49.9%; 
+.panel-2col-stacked .panel-col-last {
+  float: left;
+  width: 49.9%;
 }
 
-.panel-2col-stacked .panel-col-last .inside { 
+.panel-2col-stacked .panel-col-last .inside {
   margin: 0 0 1em .5em;
 }
 

+ 5 - 2
sites/all/modules/contrib/panels/panels/plugins/layouts/twocol_stacked/twocol_stacked.inc

@@ -1,6 +1,9 @@
 <?php
 
-// Plugin definition
+/**
+ * @file
+ * Plugin definition.
+ */
 $plugin = array(
   'title' => t('Two column stacked'),
   'category' => t('Columns: 2'),
@@ -11,6 +14,6 @@ $plugin = array(
     'top' => t('Top'),
     'left' => t('Left side'),
     'right' => t('Right side'),
-    'bottom' => t('Bottom')
+    'bottom' => t('Bottom'),
   ),
 );

+ 5 - 5
sites/all/modules/contrib/panels/panels/plugins/page_wizards/landing_page.inc

@@ -103,7 +103,7 @@ function panels_landing_page_basic($form, &$form_state) {
     '#default_value' => $cache->admin_description,
   );
 
-  // path
+  // Path.
   $form['path'] = array(
     '#type' => 'textfield',
     '#title' => t('Path'),
@@ -136,7 +136,7 @@ function panels_landing_page_basic($form, &$form_state) {
       '#options' => menu_get_menus(),
       '#default_value' => $cache->menu['name'],
       '#process' => array('ctools_dependent_process'),
-    '#dependency' => array('edit-menu-entry' => array(1)),
+      '#dependency' => array('edit-menu-entry' => array(1)),
     );
   }
   else {
@@ -185,7 +185,7 @@ function panels_landing_page_basic_validate(&$form, &$form_state) {
     form_error($form['path'], t('%, !, ?, #, or & cannot appear in the path.'));
   }
 
-  // Check to see if something is already using the path
+  // Check to see if something is already using the path.
   $result = db_query("SELECT * FROM {menu_router} WHERE path = :path", array(':path' => $form_state['values']['path']))->fetch();
   if ($result) {
     form_error($form['path'], t('That path is already in use. This system cannot override existing paths.'));
@@ -256,7 +256,7 @@ function panels_landing_page_finish(&$form_state) {
   $subtask->path = $cache->path;
   $subtask->menu = $cache->menu;
 
-  // Create the the panel context variant configured with our display
+  // Create the the panel context variant configured with our display.
   $plugin = page_manager_get_task_handler('panel_context');
 
   // Set the storage id.
@@ -274,7 +274,7 @@ function panels_landing_page_finish(&$form_state) {
   page_manager_page_new_page_cache($subtask, $page);
   page_manager_handler_add_to_page($page, $handler);
 
-  // Save it
+  // Save it.
   page_manager_save_page_cache($page);
 
   // Send us to the new page immediately.

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/panels_storage/page_manager.inc

@@ -5,7 +5,7 @@
  * Provides a panels_storage plugin for page_manager.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'access callback' => 'page_manager_panels_storage_access',
 );

+ 18 - 0
sites/all/modules/contrib/panels/panels/plugins/panels_storage/panels_layouts_ui.inc

@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Provides a panels_storage plugin for the reusable flexible layouts UI.
+ */
+
+// Plugin definition.
+$plugin = array(
+  'access callback' => 'panels_layouts_ui_panels_storage_access',
+);
+
+/**
+ * Access callback for panels storage.
+ */
+function panels_layouts_ui_panels_storage_access($storage_type, $storage_id, $op, $account) {
+  return user_access('administer panels layouts', $account);
+}

+ 0 - 1
sites/all/modules/contrib/panels/panels/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css

@@ -8,4 +8,3 @@
   color: %header-text;
   background-color: %header-background;
 }
-

+ 8 - 3
sites/all/modules/contrib/panels/panels/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css

@@ -1,12 +1,16 @@
 /* Show only to IE7 */
 *:first-child+html .rounded-shadow-background,
 /* Show only to IE6 */
-* html .rounded-shadow-background  {
+* html .rounded-shadow-background {
   margin: 0 -10px 0 0 !important;
   padding: 10px 0 5px 0 !important;
 }
 
-.rounded-shadow-top-edge, .rounded-shadow-bottom-edge, .rounded-shadow-left-edge, .rounded-shadow-right-edge, .rounded-shadow-wrap-corner {
+.rounded-shadow-top-edge,
+.rounded-shadow-bottom-edge,
+.rounded-shadow-left-edge,
+.rounded-shadow-right-edge,
+.rounded-shadow-wrap-corner {
   position: relative;
   /* hasLayout -1 ? For IE only */
   zoom: 1;
@@ -88,7 +92,8 @@
 }
 
 %style .panel-pane {
-  position: relative; top: -6px;
+  position: relative;
+  top: -6px;
 }
 
 /*

+ 0 - 1
sites/all/modules/contrib/panels/panels/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc

@@ -96,4 +96,3 @@ function panels_pane_rounded_shadow_style_base_build($plugin, $settings, &$css,
   ctools_stylizer_font_apply_style($css, '%style .pane-content', $settings['text_font']);
   ctools_stylizer_padding_apply_style($css, '%style', $settings['padding']);
 }
-

+ 6 - 2
sites/all/modules/contrib/panels/panels/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css

@@ -1,12 +1,16 @@
 /* Show only to IE7 */
 *:first-child+html .rounded-shadow-background,
 /* Show only to IE6 */
-* html .rounded-shadow-background  {
+* html .rounded-shadow-background {
   margin: 0 -10px 0 0 !important;
   padding: 10px 0 5px 0 !important;
 }
 
-.rounded-shadow-top-edge, .rounded-shadow-bottom-edge, .rounded-shadow-left-edge, .rounded-shadow-right-edge, .rounded-shadow-wrap-corner {
+.rounded-shadow-top-edge,
+.rounded-shadow-bottom-edge,
+.rounded-shadow-left-edge,
+.rounded-shadow-right-edge,
+.rounded-shadow-wrap-corner {
   position: relative;
   /* hasLayout -1 ? For IE only */
   zoom: 1;

+ 0 - 1
sites/all/modules/contrib/panels/panels/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc

@@ -68,4 +68,3 @@ function panels_region_rounded_shadow_style_base_build($plugin, $settings, &$css
   ctools_stylizer_font_apply_style($css, '%style', $settings['font']);
   ctools_stylizer_padding_apply_style($css, '%style', $settings['padding']);
 }
-

+ 1 - 2
sites/all/modules/contrib/panels/panels/plugins/styles/block.inc

@@ -5,7 +5,7 @@
  * Definition of the 'block' panel style.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('System block'),
   'description' => t('Display the pane as a system block; this is more restrictive than the default.'),
@@ -56,4 +56,3 @@ function theme_panels_block_style_render_pane($vars) {
   // might want to utilize.
   return drupal_render($build);
 }
-

+ 1 - 1
sites/all/modules/contrib/panels/panels/plugins/styles/corners/rounded_corners.inc

@@ -5,7 +5,7 @@
  * Definition of the 'rounded_corners' panel style.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('Rounded corners'),
   'description' => t('Presents the panes or panels with a rounded corner box around them'),

+ 1 - 2
sites/all/modules/contrib/panels/panels/plugins/styles/default.inc

@@ -5,7 +5,7 @@
  * Definition of the 'default' panel style.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('No style'),
   'description' => t('The default panel rendering style; displays each pane with a separator.'),
@@ -24,4 +24,3 @@ function theme_panels_default_style_render_region($vars) {
 //  $output .= '</div>';
   return $output;
 }
-

+ 1 - 2
sites/all/modules/contrib/panels/panels/plugins/styles/list.inc

@@ -6,7 +6,7 @@
  * Definition of the 'list' panel style.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('List'),
   'description' => t('Presents the panes in the form of an HTML list.'),
@@ -55,4 +55,3 @@ function panels_list_style_settings_form($style_settings) {
 
   return $form;
 }
-

+ 1 - 2
sites/all/modules/contrib/panels/panels/plugins/styles/naked.inc

@@ -5,7 +5,7 @@
  * Definition of the 'naked' panel style.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
   'title' => t('No markup at all'),
   'description' => t('Display the pane or region with no markup, not even a title.'),
@@ -31,4 +31,3 @@ function theme_panels_naked_style_render_region($vars) {
 function theme_panels_naked_style_render_pane($vars) {
   return render($vars['content']->content);
 }
-

+ 8 - 8
sites/all/modules/contrib/panels/panels/plugins/styles/stylizer.inc

@@ -6,7 +6,7 @@
  */
 
 if (module_exists('stylizer')) {
-  // Plugin definition
+  // Plugin definition.
   $plugin = array(
     'title' => t('Custom style'),
     'weight' => -10,
@@ -22,7 +22,7 @@ if (module_exists('stylizer')) {
     'get child' => 'panels_stylizer_get_substyle',
     'get children' => 'panels_stylizer_get_substyles',
 
-    // Set up an AJAX callback for the style
+    // Set up an AJAX callback for the style.
     'ajax' => array(
       'custom' => 'panels_stylizer_pane_add_style',
     ),
@@ -140,13 +140,13 @@ function theme_panels_stylizer_stylizer_style_render_region($vars) {
     return theme($plugin['theme'], array('settings' => $settings, 'class' => ctools_stylizer_get_css_class($plugin, $settings), 'content' => $output));
   }
   else {
-    // if the style is gone, just display the output.
+    // If the style is gone, just display the output.
     return $output;
   }
 }
 
 /**
- * Pane render theme
+ * Pane render theme.
  */
 function theme_panels_stylizer_stylizer_style_render_pane($vars) {
   $content = $vars['content'];
@@ -174,7 +174,7 @@ function theme_panels_stylizer_stylizer_style_render_pane($vars) {
     }
   }
 
-  // if the style is gone or has no theme of its own, just display the output.
+  // If the style is gone or has no theme of its own, just display the output.
   return theme('panels_pane', array('content' => $content, 'pane' => $pane, 'display' => $display));
 }
 
@@ -257,7 +257,7 @@ function panels_stylizer_pane_add_style(&$renderer, $plugin, &$conf, $type, $pid
     if ($type == 'pane') {
       $renderer->command_update_pane($pid);
     }
-    else if ($type == 'region') {
+    elseif ($type == 'region') {
       $renderer->command_update_region_links($pid);
     }
     else {
@@ -308,7 +308,7 @@ function panels_stylizer_edit_pane_style_form(&$form, &$form_state) {
     '#dependency' => array('edit-preconfigured' => array(1)),
   );
 
-  // Add the checkbox, set the weight early
+  // Add the checkbox, set the weight early.
   $form['panels']['preconfigured'] = array(
     '#type' => 'checkbox',
     '#title' => t('Make this style available to other regions or panes'),
@@ -365,7 +365,7 @@ function panels_stylizer_edit_pane_style_form_submit(&$form, &$form_state) {
     $form_state['owner info']['owner settings']['admin_title'] = $form_state['values']['admin_title'];
     $form_state['owner info']['owner settings']['admin_description'] = $form_state['values']['admin_description'];
 
-    // Clean up preview files before we set the name
+    // Clean up preview files before we set the name.
     ctools_stylizer_cleanup_style($form_state['plugin'], $form_state['settings']);
 
     $form_state['settings']['name'] = $form_state['values']['name'];

+ 26 - 30
sites/all/modules/contrib/panels/panels/plugins/task_handlers/panel_context.inc

@@ -2,22 +2,21 @@
 
 /**
  * @file
- *
  * This is the task handler plugin to handle attaching a panel to any
  * task that advertises itself as a 'context' type, which all of the
  * basic page tasks provided by page_manager.module do by default.
  */
 
-// Plugin definition
+// Plugin definition.
 $plugin = array(
-  // is a 'context' handler type, meaning it supports the API of the
+  // Is a 'context' handler type, meaning it supports the API of the
   // context handlers provided by ctools context plugins.
   'handler type' => 'context',
   'visible' => TRUE, // may be added up front.
 
   // Administrative fields.
   'title' => t('Panel'),
-  'admin summary' =>'panels_panel_context_admin_summary',
+  'admin summary' => 'panels_panel_context_admin_summary',
   'admin title' => 'panels_panel_context_title',
   'operations' => array(
     'settings' => array(
@@ -115,7 +114,7 @@ $plugin = array(
 
   // Callback to render the data.
   'render' => 'panels_panel_context_render',
-  // Callback to return addressable data
+  // Callback to return addressable data.
   'addressable callback' => 'panels_panel_context_get_addressable',
 
   // Various callbacks for operations performed on the handler to ensure
@@ -216,7 +215,7 @@ function panels_panel_context_tab_operation($handler, $contexts, $args) {
  *   simply means that the display has been modified and is awaiting
  *   save. The modified one should always be used for editing purposes.
  * - If none of the above is true, then a new display needs to be created
- *   for the handler and pla
+ *   for the handler and pla.
  */
 function &panels_panel_context_get_display(&$handler) {
   if (!isset($handler->conf['display'])) {
@@ -269,7 +268,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
   ctools_include('context-task-handler');
   ctools_include('plugins', 'panels');
 
-  // Add my contexts
+  // Add my contexts.
   $contexts = ctools_context_handler_get_handler_contexts($base_contexts, $handler);
 
   // Test.
@@ -281,7 +280,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
     ctools_context_handler_pre_render($handler, $contexts, $args);
   }
 
-  // Load the display
+  // Load the display.
   $display = panels_panel_context_get_display($handler);
 
   $display->context = $contexts;
@@ -298,7 +297,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
     $css_id = 'panel_context:' . $handler->name;
     $filename = ctools_css_retrieve($css_id);
     if (!$filename) {
-      // Add keywords from context
+      // Add keywords from context.
       $css = ctools_context_keyword_substitute($handler->conf['css'], array(), $contexts, array('css safe' => TRUE));
       $filename = ctools_css_store($css_id, $css);
     }
@@ -311,13 +310,12 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
   $renderer = panels_get_renderer($handler->conf['pipeline'], $display);
   // If the IPE is enabled, but the user does not have access to edit
   // load the standard renderer instead.
-
   $parents = class_parents($renderer);
   if (!empty($parents['panels_renderer_editor']) && !user_access('user page manager') && !user_access('use ipe with page manager')) {
     $renderer = panels_get_renderer_handler('standard', $display);
   }
 
-  // Remove and add body element classes
+  // Remove and add body element classes.
   $panel_body_css = &drupal_static('panel_body_css');
 
   if (isset($handler->conf['body_classes_to_remove'])) {
@@ -325,17 +323,17 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
     if (!isset($panel_body_css['body_classes_to_remove'])) {
       $panel_body_css['body_classes_to_remove'] = check_plain($classes);
     }
-    else{
+    else {
       $panel_body_css['body_classes_to_remove'] .= ' ' . check_plain($classes);
     }
   }
   if (isset($handler->conf['body_classes_to_add'])) {
     $classes = ctools_context_keyword_substitute($handler->conf['body_classes_to_add'], array(), $contexts, array('css safe' => TRUE));
     if (!isset($panel_body_css['body_classes_to_add'])) {
-    $panel_body_css['body_classes_to_add'] = check_plain($classes);
+      $panel_body_css['body_classes_to_add'] = check_plain($classes);
     }
     else {
-      $panel_body_css['body_classes_to_add'] .= ' '. check_plain($classes);
+      $panel_body_css['body_classes_to_add'] .= ' ' . check_plain($classes);
     }
   }
 
@@ -399,7 +397,7 @@ function panels_panel_context_export(&$handler, $indent) {
 /**
  * When a handler is cloned, we have to clone the display.
  */
-  function panels_panel_context_clone(&$handler) {
+function panels_panel_context_clone(&$handler) {
   $old_display = panels_panel_context_get_display($handler);
   $code = panels_export_display($old_display);
   eval($code);
@@ -454,7 +452,7 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
   ctools_include('context');
   ctools_include('context-task-handler');
 
-  // Get the operations
+  // Get the operations.
   $operations = page_manager_get_operations($page);
 
   // Get operations for just this handler.
@@ -529,7 +527,7 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
 
   $output .= '<div class="clearfix">';
   if ($show_title) {
-  $output .= '<div class="handler-title clearfix">';
+    $output .= '<div class="handler-title clearfix">';
     $output .= '<div class="actions handler-actions">' . $rendered_operations['actions'] . '</div>';
     $output .= '<span class="title-label">' . $title . '</span>';
   }
@@ -537,24 +535,23 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
   $output .= '</div>';
   $output .= $info;
   $output .= '</div>';
-/*
+  /*
   $output .= '<div class="right-container">';
   $output .= '<h3 class="context-title">' . t('Contexts') . $context_link . '</h3>';
   $output .= $contexts;
   $output .= '</div>';
 
   $output .= '<div class="left-container">';
-//  $output .= $icon;
+  //  $output .= $icon;
   $output .= '<h3 class="handler-title">' . t('Content') . $content_link . '</h3>';
   $output .= $content;
   $output .= '</div>';
-*/
+   */
   return $output;
 }
 
 // --------------------------------------------------------------------------
-// Forms
-
+// Forms.
 /**
  * General notes about forms: The handler is automatically cached by the form
  * wizard, so anything we store on $form_state['handler'] anywhere will get
@@ -689,10 +686,9 @@ function panels_panel_context_edit_move($form, &$form_state) {
   $form = panels_change_layout($form, $form_state);
 
   // Change the 'back' button to just go directly to the previous form
-//  $task_id = $form_state['task']['name'];
-//  $handler_id = $form_state['handler']->handler;
-//  $name = $form_state['handler']->name;
-
+  //  $task_id = $form_state['task']['name'];
+  //  $handler_id = $form_state['handler']->handler;
+  //  $name = $form_state['handler']->name;
   // This form is outside the normal wizard list, so we need to specify the
   // previous/next forms.
   $form['buttons']['previous']['#next'] = 'layout';
@@ -750,7 +746,7 @@ function panels_panel_context_edit_content_submit(&$form, &$form_state) {
   panels_edit_display_form_submit($form, $form_state);
   $handler = &$form_state['handler'];
 
-  // update the cached display:
+  // Update the cached display:
   $display = $form_state['page']->display_cache[$form_state['handler_id']]->display;
   $handler->conf['display'] = $display;
   unset($form_state['page']->display_cache[$form_state['handler_id']]);
@@ -761,7 +757,7 @@ function panels_panel_context_edit_content_submit(&$form, &$form_state) {
 }
 
 /**
- * General settings for the panel
+ * General settings for the panel.
  */
 function panels_panel_context_edit_settings($form, &$form_state) {
   $conf = $form_state['handler']->conf;
@@ -874,7 +870,7 @@ function panels_panel_context_edit_preview($form, &$form_state) {
   $form['preview'] = array();
   ctools_context_replace_form($form['preview'], $contexts);
 
-  // automatically preview if there are no argument placeholders.
+  // Automatically preview if there are no argument placeholders.
   if (empty($form['preview'])) {
     $display = panels_panel_context_get_display($form_state['handler']);
     $display->context = $contexts;
@@ -913,7 +909,7 @@ function panels_panel_context_edit_preview_submit(&$form, &$form_state) {
 }
 
 function panels_panel_context_get_addressable($task, $subtask_name, $handler, $address, $contexts, $arguments, $type) {
-  // Load the display
+  // Load the display.
   $display = panels_panel_context_get_display($handler);
 
   $display->context = $contexts;

+ 5 - 1
sites/all/modules/contrib/panels/panels/plugins/views/panels.views.inc

@@ -1,7 +1,11 @@
 <?php
 
 /**
- * Implementation of hook_views_plugins
+ * @file
+ */
+
+/**
+ * Implementation of hook_views_plugins.
  */
 function panels_views_plugins() {
   $plugins = array(

+ 5 - 3
sites/all/modules/contrib/panels/panels/plugins/views/panels_views_plugin_row_fields.inc

@@ -5,7 +5,7 @@
  */
 
 /**
- * The basic 'fields' row plugin
+ * The basic 'fields' row plugin.
  *
  * This displays fields one after another, giving options for inline
  * or not.
@@ -89,7 +89,8 @@ class panels_views_plugin_row_fields extends views_plugin_row_fields {
     if (!$layout) {
       // Fall back to normal behavior if the layout is somehow invalid. This
       // can happen if the layout was removed, for example.
-      return theme($this->theme_functions(), array('view' => view, 'options' => $this->options, 'row' => $row, 'field_alias' => $this->field_alias));
+      return theme($this->theme_functions(), array('view' => $this->view, 'options' => $this->options, 'row' => $row));
+
     }
 
     // Store a backup copy of the array because we're going to be screwing
@@ -148,10 +149,11 @@ class panels_views_plugin_row_fields extends views_plugin_row_fields {
     // Now that we have a rendered content array, render it.
     return panels_print_layout($layout, $content, $meta);
   }
+
 }
 
 /**
- * Override handler for views_ui_edit_display_form
+ * Override handler for views_ui_edit_display_form.
  */
 function panels_change_layout_button($form, &$form_state) {
   $display = &$form_state['view']->display[$form_state['display_id']];

+ 4 - 0
sites/all/modules/contrib/panels/panels/templates/panels-dashboard-block.tpl.php

@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @file
+ */
 ?>
 <div class="dashboard-block">
   <h3 class="dashboard-title"><?php print $block['title']; ?></h3>

+ 4 - 0
sites/all/modules/contrib/panels/panels/templates/panels-dashboard-link.tpl.php

@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @file
+ */
 ?>
 <div class="dashboard-entry clearfix">
   <div class="dashboard-text">

+ 4 - 0
sites/all/modules/contrib/panels/panels/templates/panels-dashboard.tpl.php

@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @file
+ */
 ?>
 <div class="panels-dashboard clearfix">
   <div class="dashboard-left clearfix">

+ 2 - 2
sites/all/modules/contrib/panels/panels/templates/panels-pane.tpl.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * @file panels-pane.tpl.php
- * Main panel pane template
+ * @file Panels-pane.tpl.php
+ * Main panel pane template.
  *
  * Variables available:
  * - $pane->type: the content type inside this pane

+ 339 - 0
sites/all/modules/contrib/panels/panels_extra_styles/LICENSE.txt

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Some files were not shown because too many files changed in this diff