commit b433176dc7052b113e187ea5e006682c97142629
Author: Assos Assos <assos+forge@centrale-marseille.fr>
Date:   Wed Apr 15 23:11:58 2020 +0200

    Weekly update of contrib modules

diff --git a/drupal7/sites/all/modules/colorbox/README.txt b/drupal7/sites/all/modules/colorbox/README.txt
index 31cb8901..78bdcefc 100644
--- a/drupal7/sites/all/modules/colorbox/README.txt
+++ b/drupal7/sites/all/modules/colorbox/README.txt
@@ -1,13 +1,24 @@
-Drupal colorbox module:
-------------------------
-Maintainers:
-  Fredrik Jonsson (http://drupal.org/user/5546)
-Requires - Drupal 7
-License - GPL (see LICENSE)
-
+CONTENTS OF THIS FILE
+---------------------
+   
+ * Introduction
+ * Features
+ * Requirements
+ * Installation
+ * Configuration
+ * Use the Views Colorbox Trigger field
+ * Add a custom Colorbox style to your theme
+ * Load images from custom links in a Colorbox
+ * Load content in a Colorbox
+ * Load inline content in a Colorbox
+ * Drush
+ * Image in Colorbox not displayed in Internet Explorer 8
+ * Maintainers
+
+
+INTRODUCTION
+------------
 
-Overview:
---------
 Colorbox is a light-weight, customizable lightbox plugin for jQuery 1.4.3+.
 This module allows for integration of Colorbox into Drupal.
 The jQuery library is a part of Drupal since version 5+.
@@ -19,10 +30,10 @@ overlay above the current page.
 * Colorbox - http://www.jacklmoore.com/colorbox/
 
 
-Features:
+FEATURES:
 ---------
 
-The Colorbox module:
+The Colorbox:
 
 * Excellent integration with Image field and Image styles
 * Choose between a default style and 5 example styles that are included.
@@ -42,39 +53,61 @@ The Colorbox plugin:
 * Released under the MIT License.
 
 
-Installation:
+REQUIREMENTS
+------------
+
+This module requires the following modules:
+
+ * Libraries API (https://www.drupal.org/project/libraries)
+
+
+INSTALLATION
 ------------
-1. Download and unpack the Libraries module directory in your modules folder
-   (this will usually be "sites/all/modules/").
-   Link: http://drupal.org/project/libraries
-2. Download and unpack the Colorbox module directory in your modules folder
-   (this will usually be "sites/all/modules/").
-3. Download and unpack the Colorbox plugin in "sites/all/libraries".
+
+ 1. Download and unpack the Libraries module directory in your modules folder
+    (this will usually be "sites/all/modules/").
+    Link: http://drupal.org/project/libraries
+
+ 2. Download and unpack the Colorbox module directory in your modules folder
+    (this will usually be "sites/all/modules/").
+
+ 3. Download and unpack the Colorbox plugin in "sites/all/libraries".
     Make sure the path to the plugin file becomes:
     "sites/all/libraries/colorbox/jquery.colorbox-min.js"
-   Link: https://github.com/jackmoore/colorbox/archive/1.x.zip
-   Drush users can use the command "drush colorbox-plugin".
-4. Go to "Administer" -> "Modules" and enable the Colorbox module.
+    Link: https://github.com/jackmoore/colorbox/archive/1.x.zip
+    Drush users can use the command "drush colorbox-plugin".
+
+ 4. Go to "Administer" -> "Modules" and enable the Colorbox.
+
+    Install as you would normally install a contributed Drupal module. See:
+    https://drupal.org/documentation/install/modules-themes/modules-7 for
+    further information.
 
+    Note:
+    If you download the Colorbox plugin using the makefile included you should 
+    assurance that unzip command is available on your host.
 
-Configuration:
+
+CONFIGURATION
 -------------
-Go to "Configuration" -> "Media" -> "Colorbox" to find
-all the configuration options.
+
+ * Go to "Configuration" » "Media" » "Colorbox" to find all the configuration
+   options.
 
 
-Use the Views Colorbox Trigger field:
+USE THE VIEWS COLORBOX TRIGGER FIELD
 ------------------------------------
 TODO
 
 
-Add a custom Colorbox style to your theme:
+ADD A CUSTOM COLORBOX STYLE TO YOUR THEME
 ----------------------------------------
 The easiest way is to start with either the default style or one of the
-example styles included in the Colorbox JS library download. Simply copy the entire
-style folder to your theme and rename it to something logical like "mycolorbox".
-Inside that folder are both a .css and .js file, rename both of those as well to match
-your folder name: i.e. "colorbox_mycolorbox.css" and "colorbox_mycolorbox.js"
+example styles included in the Colorbox JS library download. Simply copy the
+entire style folder to your theme and rename it to something logical like
+"mycolorbox". Inside that folder are both a .css and .js file, rename both of
+those as well to  match your folder name: i.e. "colorbox_mycolorbox.css" and
+"colorbox_mycolorbox.js"
 
 Add entries in your theme's .info file for the Colorbox CSS/JS files:
 
@@ -86,14 +119,14 @@ Go to "Configuration" -> "Media" -> "Colorbox" and select "None" under
 Make any CSS adjustments to your "colorbox_mycolorbox.css" file.
 
 
-Load images from custom links in a Colorbox:
+LOAD IMAGES FROM CUSTOM LINKS IN A COLORBOX
 --------------------------------------------
 
 Add the class "colorbox" to the link and point its href attribute to the image
 you want to display in the Colorbox.
 
 
-Load content in a Colorbox:
+LOAD CONTENT IN A COLORBOX
 ---------------------------
 Check the "Enable Colorbox load" option in Colorbox settings.
 
@@ -105,7 +138,7 @@ or "[path]?width=500&height=500" if you don't want an iframe.
 Other modules may activate this for easy Colorbox integration.
 
 
-Load inline content in a Colorbox:
+LOAD INLINE CONTENT IN A COLORBOX
 ----------------------------------
 Check the "Enable Colorbox inline"  option in Colorbox settings.
 
@@ -118,16 +151,20 @@ this "?width=500&height=500&inline=true#id-of-content".
 
 It could e.g. look like this.
 
-<a class="colorbox-inline" href="?width=500&height=500&inline=true#id-of-content">Link to click</a>
+<a class="colorbox-inline" href="?width=500&height=500&inline=true#id-of-content">
+  Link to click
+</a>
 
 <div style="display: none;">
-<div id="id-of-content">What ever content you want to display in a Colorbox.</div>
+  <div id="id-of-content">
+    What ever content you want to display in a Colorbox.
+  </div>
 </div>
 
 Other modules may activate this for easy Colorbox integration.
 
 
-Drush:
+DRUSH
 ------
 A Drush command is provides for easy installation of the Colorbox
 plugin itself.
@@ -139,7 +176,7 @@ It is possible to add another path as an option to the command, but not
 recommended unless you know what you are doing.
 
 
-Image in Colorbox not displayed in Internet Explorer 8:
+IMAGE IN COLORBOX NOT DISPLAYED IN INTERNET EXPLORER 8
 -------------------------------------------------------
 
 If your theme has CSS like this (popular in responsive design):
@@ -155,3 +192,14 @@ The fix is to add this to the theme CSS:
   max-width: none;
 }
 
+
+MAINTAINERS
+-----------
+
+Current maintainers:
+ * Fredrik Jonsson (frjo) - https://www.drupal.org/user/5546
+ * Joe Wheaton (jdwfly) - https://www.drupal.org/user/298179
+ * Renato Gonçalves (RenatoG) - https://www.drupal.org/user/3326031
+ * Sam Becker (Sam152) - https://www.drupal.org/user/1485048
+ * rsmylski - https://www.drupal.org/user/1324348
+ * lsolesen - https://www.drupal.org/user/527206
diff --git a/drupal7/sites/all/modules/colorbox/colorbox-insert-image.tpl.php b/drupal7/sites/all/modules/colorbox/colorbox-insert-image.tpl.php
index 6144fc30..48dc4901 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox-insert-image.tpl.php
+++ b/drupal7/sites/all/modules/colorbox/colorbox-insert-image.tpl.php
@@ -28,5 +28,6 @@
  */
 ?>
 <a href="<?php print $path; ?>" title="__title__" class="colorbox colorbox-insert-image" data-colorbox-gallery="<?php print $gallery_id; ?>">
-  <img src="<?php print $url; ?>" <?php if ($width && $height): ?>width="<?php print $width; ?>" height="<?php print $height; ?>" <?php endif; ?>alt="__alt__" title="__title__" class="<?php print $class; ?>" />
+  <img src="<?php print $url; ?>" <?php if ($width && $height): ?>width="<?php print $width; ?>" height="<?php print $height; ?>" <?php
+ endif; ?>alt="__alt__" title="__title__" class="<?php print $class; ?>" />
 </a>
diff --git a/drupal7/sites/all/modules/colorbox/colorbox.admin.inc b/drupal7/sites/all/modules/colorbox/colorbox.admin.inc
index 2122650f..f9f2c53e 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox.admin.inc
+++ b/drupal7/sites/all/modules/colorbox/colorbox.admin.inc
@@ -50,7 +50,7 @@ function colorbox_admin_settings() {
     '#type' => 'checkbox',
     '#title' => t('Enable Colorbox inline'),
     '#default_value' => variable_get('colorbox_inline', 0),
-    '#description' => t('This enables custom links that can open inline content in a Colorbox. Add the class "colorbox-inline" to the link and build the url like this "?width=500&height=500&inline=true#id-of-content". Other modules may activate this for easy Colorbox integration.'),
+    '#description' => t('<a href="https://www.drupal.org/files/druplicon-small.png" class="colorbox">This</a> enables custom links that can open inline content in a Colorbox. Add the class "colorbox-inline" to the link and build the url like this "?width=500&height=500&inline=true#id-of-content". Other modules may activate this for easy Colorbox integration.'),
   );
 
   $form['colorbox_custom_settings'] = array(
@@ -73,7 +73,7 @@ function colorbox_admin_settings() {
     '#title' => t('Style'),
     '#options' => $colorbox_styles,
     '#default_value' => variable_get('colorbox_style', 'default'),
-    '#description' => t('Select the style to use for the Colorbox. The example styles are the ones that come with the Colorbox plugin. Select "None" if you have added Colorbox styles to your theme.'),
+    '#description' => t('Select the style to use for the Colorbox. The example styles are the ones that come with the Colorbox plugin. Select "None" if you have added Colorbox styles to your theme. <br> <strong>Examples</strong>: <ul><li><a href="/sites/all/modules/colorbox/images/admin/example_default.png" target="blank">Default</a></li><li><a href="/sites/all/modules/colorbox/images/admin/example_plain.png" target="blank">Plain</a></li><li><a href="/sites/all/modules/colorbox/images/admin/example_stockholm_syndrome.png" target="blank">Stockholm Syndrome</a></li><li><a href="/sites/all/modules/colorbox/images/admin/colorbox_example_1.png" target="blank">Example 1</a></li><li><a href="/sites/all/modules/colorbox/images/admin/colorbox_example_2.png" target="blank">Example 2</a></li><li><a href="/sites/all/modules/colorbox/images/admin/colorbox_example_3.png" target="blank">Example 3</a></li><li><a href="/sites/all/modules/colorbox/images/admin/colorbox_example_4.png" target="blank">Example 4</a></li><li><a href="/sites/all/modules/colorbox/images/admin/colorbox_example_5.png" target="blank">Example 5</a></li><li><a href="/sites/all/modules/colorbox/images/admin/example_none.png" target="blank">None</a></li></ul>'),
   );
   $form['colorbox_custom_settings']['colorbox_custom_settings_activate'] = array(
     '#type' => 'radios',
@@ -93,21 +93,58 @@ function colorbox_admin_settings() {
   $form['colorbox_custom_settings']['colorbox_transition_type'] = array(
     '#type' => 'radios',
     '#title' => t('Transition type'),
-    '#options' => array('elastic' => t('Elastic'), 'fade' => t('Fade'), 'none' => t('None')),
+    '#options' => array(
+      'elastic' => t('Elastic'),
+      'fade' => t('Fade'),
+      'none' => t('None'),
+    ),
     '#default_value' => variable_get('colorbox_transition_type', 'elastic'),
     '#description' => t('The transition type.'),
   );
   $form['colorbox_custom_settings']['colorbox_transition_speed'] = array(
     '#type' => 'select',
     '#title' => t('Transition speed'),
-    '#options' => drupal_map_assoc(array(100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600)),
+    '#options' => drupal_map_assoc(array(
+      100,
+      150,
+      200,
+      250,
+      300,
+      350,
+      400,
+      450,
+      500,
+      550,
+      600,
+    )),
     '#default_value' => variable_get('colorbox_transition_speed', 350),
     '#description' => t('Sets the speed of the fade and elastic transitions, in milliseconds.'),
   );
   $form['colorbox_custom_settings']['colorbox_opacity'] = array(
     '#type' => 'select',
     '#title' => t('Opacity'),
-    '#options' => drupal_map_assoc(array('0', '0.10', '0.15', '0.20', '0.25', '0.30', '0.35', '0.40', '0.45', '0.50', '0.55', '0.60', '0.65', '0.70', '0.75', '0.80', '0.85', '0.90', '0.95', '1')),
+    '#options' => drupal_map_assoc(array(
+      '0',
+      '0.10',
+      '0.15',
+      '0.20',
+      '0.25',
+      '0.30',
+      '0.35',
+      '0.40',
+      '0.45',
+      '0.50',
+      '0.55',
+      '0.60',
+      '0.65',
+      '0.70',
+      '0.75',
+      '0.80',
+      '0.85',
+      '0.90',
+      '0.95',
+      '1',
+    )),
     '#default_value' => variable_get('colorbox_opacity', '0.85'),
     '#description' => t('The overlay opacity level. Range: 0 to 1.'),
   );
@@ -183,7 +220,7 @@ function colorbox_admin_settings() {
     '#type' => 'checkbox',
     '#title' => t('Fixed'),
     '#default_value' => variable_get('colorbox_fixed', 1),
-    '#description' => t('If the Colorbox should be displayed in a fixed position within the visitor\'s viewport or relative to the document.'),
+    '#description' => t("If the Colorbox should be displayed in a fixed position within the visitor's viewport or relative to the document."),
   );
 
   $form['colorbox_custom_settings']['colorbox_slideshow_settings'] = array(
@@ -223,7 +260,19 @@ function colorbox_admin_settings() {
   $form['colorbox_custom_settings']['colorbox_slideshow_settings']['colorbox_slideshowspeed'] = array(
     '#type' => 'select',
     '#title' => t('Slideshow speed'),
-    '#options' => drupal_map_assoc(array(1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000, 5500, 6000)),
+    '#options' => drupal_map_assoc(array(
+      1000,
+      1500,
+      2000,
+      2500,
+      3000,
+      3500,
+      4000,
+      4500,
+      5000,
+      5500,
+      6000,
+    )),
     '#default_value' => variable_get('colorbox_slideshowspeed', 2500),
     '#description' => t('Sets the speed of the slideshow, in milliseconds.'),
   );
@@ -292,7 +341,24 @@ function colorbox_admin_settings() {
   $form['colorbox_advanced_settings']['colorbox_caption_trim_length'] = array(
     '#type' => 'select',
     '#title' => t('Caption max length'),
-    '#options' => drupal_map_assoc(array(40, 45, 50, 55, 60, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, 120)),
+    '#options' => drupal_map_assoc(array(
+      40,
+      45,
+      50,
+      55,
+      60,
+      70,
+      75,
+      80,
+      85,
+      90,
+      95,
+      100,
+      105,
+      110,
+      115,
+      120,
+    )),
     '#default_value' => variable_get('colorbox_caption_trim_length', 75),
     '#states' => array(
       'visible' => array(
@@ -310,7 +376,11 @@ function colorbox_admin_settings() {
     '#type' => 'textarea',
     '#title' => '<span class="element-invisible">' . t('Pages') . '</span>',
     '#default_value' => variable_get('colorbox_pages', "admin*\nimagebrowser*\nimg_assist*\nimce*\nnode/add/*\nnode/*/edit\nprint/*\nprintpdf/*\nsystem/ajax\nsystem/ajax/*"),
-    '#description' => t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>')),
+    '#description' => t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page. <p><a href=\"#\" class=\"colorbox-reset-specific-pages-default\">Reset to default</a></p>", array(
+      '%blog' => 'blog',
+      '%blog-wildcard' => 'blog/*',
+      '%front' => '<front>',
+    )),
   );
   $form['colorbox_advanced_settings']['colorbox_compression_type'] = array(
     '#type' => 'radios',
diff --git a/drupal7/sites/all/modules/colorbox/colorbox.api.php b/drupal7/sites/all/modules/colorbox/colorbox.api.php
index 9dbf4cd4..880270ca 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox.api.php
+++ b/drupal7/sites/all/modules/colorbox/colorbox.api.php
@@ -11,14 +11,18 @@
  * Implements hook_colorbox_settings_alter().
  *
  * @param array $settings
- *   An associative array of Colorbox settings. See the
- *   @link http://colorpowered.com/colorbox/ Colorbox documentation @endlink
- *   for the full list of supported parameters.
+ *   An associative array of Colorbox settings. See the.
  * @param string $style
  *   The name of the active style plugin. If $style is 'none', no Colorbox
  *   theme will be loaded.
+ *
+ * @link http://colorpowered.com/colorbox/ Colorbox documentation @endlink
+ *   for the full list of supported parameters.
+ *
+ * @codingStandardsIgnoreStart
  */
 function hook_colorbox_settings_alter(&$settings, &$style) {
+  // @codingStandardsIgnoreEnd.
   // Disable automatic downscaling of images to maxWidth/maxHeight size.
   $settings['scalePhotos'] = FALSE;
 
diff --git a/drupal7/sites/all/modules/colorbox/colorbox.info b/drupal7/sites/all/modules/colorbox/colorbox.info
index e72aad31..d3b3ae92 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox.info
+++ b/drupal7/sites/all/modules/colorbox/colorbox.info
@@ -3,12 +3,12 @@ description = A light-weight, customizable lightbox plugin for jQuery 1.4.3+.
 dependencies[] = libraries (>=2.x)
 core = 7.x
 configure = admin/config/media/colorbox
+package = Media
 
 files[] = views/colorbox_handler_field_colorbox.inc
 
-; Information added by Drupal.org packaging script on 2017-04-04
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2020-04-13
+version = "7.x-2.15"
 core = "7.x"
 project = "colorbox"
-datestamp = "1491291489"
-
+datestamp = "1586785587"
diff --git a/drupal7/sites/all/modules/colorbox/colorbox.install b/drupal7/sites/all/modules/colorbox/colorbox.install
index e1c8adf2..5e17fdde 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox.install
+++ b/drupal7/sites/all/modules/colorbox/colorbox.install
@@ -5,6 +5,16 @@
  * Install, update and uninstall functions for the colorbox module.
  */
 
+/**
+ * Implements hook_enable().
+ */
+function colorbox_enable() {
+  drupal_set_message(t('Thanks for installing Colorbox'));
+  drupal_set_message(t('You may configure Colorbox by visiting <a href="@url_settings">@url_settings</a>', array(
+    '@url_settings' => url('admin/config/media/colorbox'),
+  )));
+}
+
 /**
  * Implements hook_requirements().
  */
@@ -22,7 +32,12 @@ function colorbox_requirements($phase) {
         'title' => $t('Colorbox plugin'),
         'value' => $t('@e: At least @a', array('@e' => $error_type, '@a' => COLORBOX_MIN_PLUGIN_VERSION)),
         'severity' => REQUIREMENT_ERROR,
-        'description' => $t('!error You need to download the !colorbox, extract the archive and place the colorbox directory in the %path directory on your server.', array('!error' => $error_message, '!colorbox' => l($t('Colorbox plugin'), $library['download url']), '%path' => 'sites/all/libraries')),
+        'description' => $t('!error You need to download the !colorbox, extract the archive and place the colorbox directory in the %path directory on your server.', array(
+          '!error' => $error_message,
+          '!colorbox' => l($t('Colorbox plugin'),
+          $library['download url']),
+          '%path' => 'sites/all/libraries',
+        )),
       );
     }
     elseif (version_compare($library['version'], COLORBOX_MIN_PLUGIN_VERSION, '>=')) {
@@ -37,7 +52,11 @@ function colorbox_requirements($phase) {
         'title' => $t('Colorbox plugin'),
         'value' => $t('At least @a', array('@a' => COLORBOX_MIN_PLUGIN_VERSION)),
         'severity' => REQUIREMENT_ERROR,
-        'description' => $t('You need to download a later version of the !colorbox and replace the old version located in the %path directory on your server.', array('!colorbox' => l($t('Colorbox plugin'), $library['download url']), '%path' => $library['library path'])),
+        'description' => $t('You need to download a later version of the !colorbox and replace the old version located in the %path directory on your server.', array(
+          '!colorbox' => l($t('Colorbox plugin'),
+          $library['download url']),
+          '%path' => $library['library path'],
+        )),
       );
     }
   }
@@ -63,8 +82,10 @@ function colorbox_update_7001() {
 }
 
 /**
- * Delete the unused colorbox_title_trim and
- * colorbox_title_trim_length variables.
+ * Implements hook_update_N().
+ *
+ * Delete the unused colorbox_title_trim and colorbox_title_trim_length
+ * variables.
  */
 function colorbox_update_7002() {
   $ret = array();
@@ -117,4 +138,3 @@ function colorbox_update_7202() {
 
   return $ret;
 }
-
diff --git a/drupal7/sites/all/modules/colorbox/colorbox.module b/drupal7/sites/all/modules/colorbox/colorbox.module
index 4d16400d..80a52dfc 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox.module
+++ b/drupal7/sites/all/modules/colorbox/colorbox.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * A light-weight, customizable lightbox plugin for jQuery 1.3
+ * A light-weight, customizable lightbox plugin for jQuery 1.3.
  */
 
 /**
@@ -10,7 +10,6 @@
  */
 define('COLORBOX_MIN_PLUGIN_VERSION', '1.6.1');
 
-
 /**
  * Implements hook_theme().
  */
@@ -25,7 +24,6 @@ function colorbox_theme() {
       ),
       'file' => 'colorbox.theme.inc',
     ),
-
     'colorbox_insert_image' => array(
       'variables' => array(
         'item' => NULL,
@@ -35,13 +33,13 @@ function colorbox_theme() {
       'pattern' => 'colorbox_insert_image__[a-z0-9_]+',
       'file' => 'colorbox.theme.inc',
     ),
-
     'colorbox_image_formatter' => array(
       'variables' => array(
         'item' => NULL,
         'entity_type' => NULL,
         'entity' => NULL,
-        'node' => NULL,  // Left for legacy support.
+        // Left for legacy support.
+        'node' => NULL,
         'field' => array(),
         'display_settings' => array(),
         'delta' => NULL,
@@ -56,7 +54,8 @@ function colorbox_theme() {
  */
 function colorbox_init() {
   // Do not load colorbox during the Drupal installation process, e.g. if part
-  // of installation profiles. Only add the JavaScript and CSS on specified paths.
+  // of installation profiles. Only add the JavaScript and CSS on specified
+  // paths.
   if (!drupal_installation_attempted() && _colorbox_active()) {
     _colorbox_doheader();
   }
@@ -164,7 +163,8 @@ function _colorbox_active() {
 function _colorbox_doheader() {
   static $already_added = FALSE;
   if ($already_added) {
-    return; // Don't add the JavaScript and CSS multiple times.
+    // Don't add the JavaScript and CSS multiple times.
+    return;
   }
 
   // Insert options and translated strings as JavaScript settings.
@@ -209,6 +209,8 @@ function _colorbox_doheader() {
     );
   }
 
+  $js_settings['specificPagesDefaultValue'] = "admin*\nimagebrowser*\nimg_assist*\nimce*\nnode/add/*\nnode/*/edit\nprint/*\nprintpdf/*\nsystem/ajax\nsystem/ajax/*";
+
   $path = drupal_get_path('module', 'colorbox');
   $style = variable_get('colorbox_style', 'default');
 
@@ -229,12 +231,14 @@ function _colorbox_doheader() {
   switch ($style) {
     case 'none':
       break;
+
     case 'default':
     case 'plain':
     case 'stockholmsyndrome':
       drupal_add_css($path . '/styles/' . $style . '/colorbox_style.css');
       drupal_add_js($path . '/styles/' . $style . '/colorbox_style.js');
       break;
+
     default:
       drupal_add_css($style . '/colorbox.css');
   }
@@ -338,7 +342,7 @@ function colorbox_field_formatter_settings_form($field, $instance, $view_mode, $
   );
 
   $caption = array(
-    'auto' =>  t('Automatic'),
+    'auto' => t('Automatic'),
     'title' => t('Title text'),
     'alt' => t('Alt text'),
     'node_title' => t('Content title'),
@@ -363,7 +367,8 @@ function colorbox_field_formatter_settings_form($field, $instance, $view_mode, $
     ),
   );
   // Allow users to hide or set a custom recursion limit.
-  // The module token_tweaks sets a global recursion limit that can not be bypassed.
+  // The module token_tweaks sets a global recursion limit that can not be
+  // bypassed.
   if (module_exists('token') && $recursion_limit = min(variable_get('token_tree_recursion_limit', 3), variable_get('colorbox_token_recursion_limit', 3))) {
     // File entities do not have $field, only $instance.
     if (!empty($field)) {
@@ -459,7 +464,7 @@ function colorbox_field_formatter_settings_summary($field, $instance, $view_mode
   }
 
   $caption = array(
-    'auto' =>  t('Automatic'),
+    'auto' => t('Automatic'),
     'title' => t('Title text'),
     'alt' => t('Alt text'),
     'node_title' => t('Content title'),
@@ -487,7 +492,8 @@ function colorbox_field_formatter_view($entity_type, $entity, $field, $instance,
         '#item' => $item,
         '#entity_type' => $entity_type,
         '#entity' => $entity,
-        '#node' => $entity, // Left for legacy support.
+        // Left for legacy support.
+        '#node' => $entity,
         '#field' => $field,
         '#display_settings' => $display['settings'],
         '#delta' => $delta,
@@ -501,7 +507,9 @@ function colorbox_field_formatter_view($entity_type, $entity, $field, $instance,
 /**
  * Implements hook_insert_styles().
  *
+ * @codingStandardsIgnoreStart
  * @return array
+ *   Returns a array with styles.
  */
 function colorbox_insert_styles() {
   $insert_styles = array();
@@ -513,16 +521,88 @@ function colorbox_insert_styles() {
   return $insert_styles;
 }
 
+/**
+ * Implements hook_help().
+ */
+function colorbox_help($path, $arg) {
+
+  switch ($path) {
+    case 'admin/help#colorbox':
+      $output = '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('<a target="_blank" href="@colorbox_project_link">Colorbox</a> is a light-weight customizable lightbox plugin for jQuery. This module allows for integration of Colorbox into Drupal.', array('@colorbox_project_link' => 'https://www.drupal.org/project/colorbox')) . '</p>';
+      $output .= '<p>' . t('Images, iframed or inline content etc. can be displayed in a overlay above the current page.') . '</p>';
+
+      $output .= '<h3>' . t('Usage') . '</h3>';
+      $output .= '<p>' . t('Go to "Configuration" » "Media" » "Colorbox" to find all the configuration options.') . '</p>';
+
+      $output .= '<h3>' . t('Features') . '</h3>';
+      $output .= '<b>' . t('The Colorbox:') . '</b>';
+      $output .= '<ul>';
+      $output .= '<li>' . t('Excellent integration with Image field and Image styles') . '</li>';
+      $output .= '<li>' . t('Choose between a default style and 5 example styles that are included.') . '</li>';
+      $output .= '<li>' . t('Style the Colorbox with a custom colorbox.css file in your theme.') . '</li>';
+      $output .= '<li>' . t('Drush command to download and install the Colorbox plugin in sites/all/libraries') . '</li>';
+      $output .= '</ul>';
+
+      $output .= '<b>' . t('The Colorbox plugin:') . '</b>';
+      $output .= '<ul>';
+      $output .= '<li>' . t('Supports photos, grouping, slideshow, ajax, inline, and iframed content.') . '</li>';
+      $output .= '<li>' . t('Appearance is controlled through CSS so it can be restyled.') . '</li>';
+      $output .= '<li>' . t('Preloads upcoming images in a photo group.') . '</li>';
+      $output .= '<li>' . t('Completely unobtrusive, options are set in the JS and require no') . '</li>';
+      $output .= '<li>' . t('changes to existing HTML.') . '</li>';
+      $output .= '<li>' . t('Compatible with: jQuery 1.3.2+ in Firefox, Safari, Chrome, Opera,') . '</li>';
+      $output .= '<li>' . t('Internet Explorer 7+.') . '</li>';
+      $output .= '<li>' . t('Released under the MIT License.') . '</p>';
+      $output .= '</ul>';
+
+      $output .= '<h3>' . t('Colorbox screencasts') . '</h3>';
+      $output .= '<b>' . t('Part 1 to 3 is for an older 7.x-1.x version of the Colorbox:') . '</b>';
+      $output .= '<ul>';
+      $output .= '<li>' . t('Part 1: <a href="@colorbox_screencasts_part1" target="blank">Installation and image field integration on Vimeo</a>', array('@colorbox_screencasts_part1' => 'https://vimeo.com/19122850')) . '</li>';
+      $output .= '<li>' . t('Part 2: <a href="@colorbox_screencasts_part2" target="blank">Inline images with the Insert module on Vimeo</a>', array('@colorbox_screencasts_part2' => 'https://vimeo.com/19386122')) . '</li>';
+      $output .= '<li>' . t('Part 3: <a href="@colorbox_screencasts_part3" target="blank">Building a image gallery and a image slideshow.</a>', array('@colorbox_screencasts_part3' => 'https://vimeo.com/26411524')) . '</li>';
+      $output .= '</ul>';
+
+      $output .= '<b>' . t('Contributed screencasts:') . '</b>';
+      $output .= '<ul>';
+      $output .= '<li>' . t('<a href="@colorbox_contributed_screencasts_part1" target="blank">Drupal 7 Colorbox project</a> by Code Karate', array('@colorbox_contributed_screencasts_part1' => 'http://codekarate.com/daily-dose-of-drupal/drupal-7-colorbox-module')) . '</li>';
+      $output .= '<li>' . t('<a href="@colorbox_contributed_screencasts_part2" target="blank">Creating and Theming a Node Photo Gallery with Drupal 7 and Colorbox</a> by High Rock Media.', array('@colorbox_contributed_screencasts_part2' => 'http://dannyenglander.com/blog/screencast-creating-and-theming-node-photo-gallery-drupal-7-and-colorbox')) . '</li>';
+      $output .= '<li>' . t('<a href="@colorbox_contributed_screencasts_part3" target="blank">How to Build a Lightbox Portfolio in Drupal 7</a> by CMS Quickstart', array('@colorbox_contributed_screencasts_part3' => 'http://www.cmsquickstart.com/blog/tutorial-how-build-lightbox-portfolio-drupal-7')) . '</li>';
+      $output .= '</ul>';
+
+      $output .= '<h3>' . t('Load Content in a Colorbox') . '</h3>';
+      $output .= '<p>' . t('Check the "Enable Colorbox load" option in Colorbox settings.') . '</p>';
+      $output .= '<p>' . t('This enables custom links that can open content in a Colorbox.') . '</p>';
+      $output .= '<p>' . t('Add the class "colorbox-load" to the link and build the url like this "[path]?width=500&height=500&iframe=true" or "[path]?width=500&height=500" if you don\'t want an iframe.') . '</p>';
+      $output .= '<p>' . t('Other projects may activate this for easy Colorbox integration.') . '</p>';
+
+      $output .= '<h3>' . t('Load Images from custom links in a Colorbox') . '</h3>';
+      $output .= '<p>' . t('Add the class "colorbox" to the link and point its href attribute to the image you want to display in the Colorbox.') . '</p>';
+
+      return $output;
+  }
+}
+
 /**
  * Implements hook_insert_content().
  */
 function colorbox_insert_content($item, $style, $widget) {
   list($item['module_name'], $item['style_name']) = explode('__', $style['name'], 2);
-  return theme(array('colorbox_insert_image__' . str_replace('-', '_', $item['style_name']), 'colorbox_insert_image'), array('item' => $item, 'widget' => $widget));
+  return theme(array(
+    'colorbox_insert_image__' . str_replace('-', '_', $item['style_name']),
+    'colorbox_insert_image',
+      ), array(
+    'item' => $item,
+    'widget' => $widget,
+  ));
 }
 
 /**
- * Machine names normally need to be unique but that does not apply to galleries.
+ * Gallery Exists Function.
+ *
+ * Machine names normally need to be unique but that does not apply to
+ * galleries.
  *
  * @return false
  *   Always FALSE
diff --git a/drupal7/sites/all/modules/colorbox/colorbox.theme.inc b/drupal7/sites/all/modules/colorbox/colorbox.theme.inc
index cd4a2375..f9fab784 100644
--- a/drupal7/sites/all/modules/colorbox/colorbox.theme.inc
+++ b/drupal7/sites/all/modules/colorbox/colorbox.theme.inc
@@ -18,8 +18,12 @@
  *   An HTML string representing the themed output.
  *
  * @ingroup themeable
+ *
+ * @codingStandardsIgnoreStart
  */
 function theme_colorbox_image_formatter($variables) {
+  // @codingStandardsIgnoreEnd
+  global $language;
   static $gallery_token = NULL;
   $item = $variables['item'];
   $entity_type = $variables['entity_type'];
@@ -95,14 +99,15 @@ function theme_colorbox_image_formatter($variables) {
       break;
 
     case 'custom':
-      $caption = token_replace($settings['colorbox_caption_custom'], array($entity_type => $entity, 'file' => (object) $item), array('clear' => TRUE));
+      $caption = token_replace($settings['colorbox_caption_custom'], array($entity_type => $entity, 'file' => (object) $item), array('clear' => TRUE, 'language' => $language));
       break;
 
     default:
       $caption = '';
   }
 
-  // Shorten the caption for the example styles or when caption shortening is active.
+  // Shorten the caption for the example styles or when caption shortening is
+  // active.
   $colorbox_style = variable_get('colorbox_style', 'default');
   $trim_length = variable_get('colorbox_caption_trim_length', 75);
   if (((strpos($colorbox_style, 'colorbox/example') !== FALSE) || variable_get('colorbox_caption_trim', 0)) && (drupal_strlen($caption) > $trim_length)) {
@@ -110,7 +115,7 @@ function theme_colorbox_image_formatter($variables) {
   }
 
   // Build the gallery id.
-  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
+  list($id) = entity_extract_ids($entity_type, $entity);
   $entity_id = !empty($id) ? $entity_type . '-' . $id : 'entity-id';
   switch ($settings['colorbox_gallery']) {
     case 'post':
@@ -126,7 +131,7 @@ function theme_colorbox_image_formatter($variables) {
       break;
 
     case 'field_page':
-      $gallery_id = 'gallery-' . $field['field_name'];
+      $gallery_id = isset($field['field_name']) ? 'gallery-' . $field['field_name'] : 'gallery-page';
       break;
 
     case 'custom':
@@ -137,9 +142,11 @@ function theme_colorbox_image_formatter($variables) {
       $gallery_id = '';
   }
 
-  // If gallery id is not empty add unique per-request token to avoid images being added manually to galleries.
+  // If gallery id is not empty add unique per-request token to avoid images
+  // being added manually to galleries.
   if (!empty($gallery_id) && variable_get('colorbox_unique_token', 1)) {
-    // Check if gallery token has already been set, we need to reuse the token for the whole request.
+    // Check if gallery token has already been set, we need to reuse the token
+    // for the whole request.
     if (is_null($gallery_token)) {
       // We use a short token since randomness is not critical.
       $gallery_token = drupal_random_key(8);
@@ -154,7 +161,12 @@ function theme_colorbox_image_formatter($variables) {
     $path = file_create_url($image['path']);
   }
 
-  return theme('colorbox_imagefield', array('image' => $image, 'path' => $path, 'title' => $caption, 'gid' => $gallery_id));
+  return theme('colorbox_imagefield', array(
+    'image' => $image,
+    'path' => $path,
+    'title' => $caption,
+    'gid' => $gallery_id,
+  ));
 }
 
 /**
@@ -171,8 +183,11 @@ function theme_colorbox_image_formatter($variables) {
  *   An HTML string containing a link to the given path.
  *
  * @ingroup themeable
+ *
+ * @codingStandardsIgnoreStart
  */
 function theme_colorbox_imagefield($variables) {
+  // @codingStandardsIgnoreEnd
   $class = array('colorbox');
 
   if ($variables['image']['style_name'] == 'hide') {
@@ -204,8 +219,12 @@ function theme_colorbox_imagefield($variables) {
  * Preprocess variables for the colorbox-insert-image.tpl.php file.
  *
  * @param array $variables
+ *   Array with variables values.
+ *
+ * @codingStandardsIgnoreStart
  */
 function template_preprocess_colorbox_insert_image(&$variables) {
+  // @codingStandardsIgnoreEnd
   $item = $variables['item'];
   $variables['file'] = file_load($item['fid']);
   $variables['style_name'] = $item['style_name'];
diff --git a/drupal7/sites/all/modules/colorbox/drush/colorbox.drush.inc b/drupal7/sites/all/modules/colorbox/drush/colorbox.drush.inc
index 56df55c5..7fe6cb47 100644
--- a/drupal7/sites/all/modules/colorbox/drush/colorbox.drush.inc
+++ b/drupal7/sites/all/modules/colorbox/drush/colorbox.drush.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *   drush integration for colorbox.
+ * Drush integration for colorbox.
  */
 
 /**
@@ -12,7 +12,7 @@ define('COLORBOX_DOWNLOAD_URI', 'https://github.com/jackmoore/colorbox/archive/1
 define('COLORBOX_DOWNLOAD_PREFIX', 'colorbox-');
 
 /**
- * Implementation of hook_drush_command().
+ * Implements hook_drush_command().
  *
  * In this hook, you specify which commands your
  * drush module makes available, what it does and
@@ -23,17 +23,19 @@ define('COLORBOX_DOWNLOAD_PREFIX', 'colorbox-');
  *
  * See `drush topic docs-commands` for a list of recognized keys.
  *
+ * @codingStandardsIgnoreLine
  * @return array
  *   An associative array describing your command(s).
  */
 function colorbox_drush_command() {
   $items = array();
 
-  // the key in the $items array is the name of the command.
+  // The key in the $items array is the name of the command.
   $items['colorbox-plugin'] = array(
     'callback' => 'drush_colorbox_plugin',
     'description' => dt('Download and install the Colorbox plugin.'),
-    'bootstrap' => DRUSH_BOOTSTRAP_DRUSH, // No bootstrap.
+  // No bootstrap.
+    'bootstrap' => DRUSH_BOOTSTRAP_DRUSH,
     'arguments' => array(
       'path' => dt('Optional. A path where to install the Colorbox plugin. If omitted Drush will use the default location.'),
     ),
@@ -44,14 +46,16 @@ function colorbox_drush_command() {
 }
 
 /**
- * Implementation of hook_drush_help().
+ * Implements hook_drush_help().
  *
  * This function is called whenever a drush user calls
  * 'drush help <name-of-your-command>'
  *
+ * @codingStandardsIgnoreLine
  * @param string $section
  *   A string with the help section (prepend with 'drush:')
  *
+ * @codingStandardsIgnoreLine
  * @return string
  *   A string with the help text for your command.
  */
@@ -66,10 +70,10 @@ function colorbox_drush_help($section) {
  * Implements drush_MODULE_pre_pm_enable().
  */
 function drush_colorbox_pre_pm_enable() {
-   $modules = drush_get_context('PM_ENABLE_MODULES');
-   if (in_array('colorbox', $modules) && !drush_get_option('skip')) {
-     drush_colorbox_plugin();
-   }
+  $modules = drush_get_context('PM_ENABLE_MODULES');
+  if (in_array('colorbox', $modules) && !drush_get_option('skip')) {
+    drush_colorbox_plugin();
+  }
 }
 
 /**
@@ -96,7 +100,7 @@ function drush_colorbox_plugin() {
     $olddir = getcwd();
     chdir($path);
 
-    // Download the zip archive
+    // Download the zip archive.
     if ($filepath = drush_download_file(COLORBOX_DOWNLOAD_URI)) {
       $filename = basename($filepath);
       $dirname = COLORBOX_DOWNLOAD_PREFIX . basename($filepath, '.zip');
@@ -108,7 +112,7 @@ function drush_colorbox_plugin() {
         drush_log(dt('A existing Colorbox plugin was deleted from @path', array('@path' => $path)), 'notice');
       }
 
-      // Decompress the zip archive
+      // Decompress the zip archive.
       drush_tarball_extract($filename);
 
       // Change the directory name to "colorbox" if needed.
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_1.png b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_1.png
new file mode 100644
index 00000000..fa993a47
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_1.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_2.png b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_2.png
new file mode 100644
index 00000000..8c76b5a2
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_2.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_3.png b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_3.png
new file mode 100644
index 00000000..9163fecc
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_3.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_4.png b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_4.png
new file mode 100644
index 00000000..13fc0034
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_4.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_5.png b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_5.png
new file mode 100644
index 00000000..a24cecec
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/colorbox_example_5.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/example_default.png b/drupal7/sites/all/modules/colorbox/images/admin/example_default.png
new file mode 100644
index 00000000..1aef9ba1
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/example_default.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/example_none.png b/drupal7/sites/all/modules/colorbox/images/admin/example_none.png
new file mode 100644
index 00000000..84eaa604
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/example_none.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/example_plain.png b/drupal7/sites/all/modules/colorbox/images/admin/example_plain.png
new file mode 100644
index 00000000..73edddda
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/example_plain.png differ
diff --git a/drupal7/sites/all/modules/colorbox/images/admin/example_stockholm_syndrome.png b/drupal7/sites/all/modules/colorbox/images/admin/example_stockholm_syndrome.png
new file mode 100644
index 00000000..68f3ca67
Binary files /dev/null and b/drupal7/sites/all/modules/colorbox/images/admin/example_stockholm_syndrome.png differ
diff --git a/drupal7/sites/all/modules/colorbox/js/colorbox.js b/drupal7/sites/all/modules/colorbox/js/colorbox.js
index 567ad381..31faa9dd 100644
--- a/drupal7/sites/all/modules/colorbox/js/colorbox.js
+++ b/drupal7/sites/all/modules/colorbox/js/colorbox.js
@@ -7,7 +7,7 @@
 
 Drupal.behaviors.initColorbox = {
   attach: function (context, settings) {
-    if (!$.isFunction($.colorbox) || typeof settings.colorbox === 'undefined') {
+    if (!$.isFunction($('a, area, input', context).colorbox) || typeof settings.colorbox === 'undefined') {
       return;
     }
 
@@ -30,8 +30,9 @@ Drupal.behaviors.initColorbox = {
     };
 
     $('.colorbox', context)
-      .once('init-colorbox')
-      .colorbox(settings.colorbox);
+      .once('init-colorbox').each(function(){
+        $(this).colorbox(settings.colorbox);
+      });
 
     $(context).bind('cbox_complete', function () {
       Drupal.attachBehaviors('#cboxLoadedContent');
diff --git a/drupal7/sites/all/modules/colorbox/js/colorbox_admin_settings.js b/drupal7/sites/all/modules/colorbox/js/colorbox_admin_settings.js
index 79de0833..ed1d9d50 100644
--- a/drupal7/sites/all/modules/colorbox/js/colorbox_admin_settings.js
+++ b/drupal7/sites/all/modules/colorbox/js/colorbox_admin_settings.js
@@ -7,6 +7,7 @@
 
 Drupal.behaviors.initColorboxAdminSettings = {
   attach: function (context, settings) {
+
     $('div.colorbox-custom-settings-activate input.form-radio', context).click(function () {
       if (this.value == 1) {
         $('div.colorbox-custom-settings', context).show();
@@ -31,6 +32,16 @@ Drupal.behaviors.initColorboxAdminSettings = {
         $('div.colorbox-title-trim-settings', context).hide();
       }
     });
+    $('.colorbox-reset-specific-pages-default', context).click(function (event) {
+
+      event.preventDefault();
+
+      var colorbox_specific_pages_default_value = Drupal.settings.colorbox.specificPagesDefaultValue;
+
+      if (typeof colorbox_specific_pages_default_value !== 'undefined' && colorbox_specific_pages_default_value.length > 0) {
+        $("#edit-colorbox-pages").val(colorbox_specific_pages_default_value);
+      }
+    });
   }
 };
 
diff --git a/drupal7/sites/all/modules/colorbox/styles/default/colorbox_style.css b/drupal7/sites/all/modules/colorbox/styles/default/colorbox_style.css
index 2517c7f3..6f77db90 100644
--- a/drupal7/sites/all/modules/colorbox/styles/default/colorbox_style.css
+++ b/drupal7/sites/all/modules/colorbox/styles/default/colorbox_style.css
@@ -2,7 +2,9 @@
  * Colorbox Core Style:
  * The following CSS is consistent between example themes and should not be altered.
  */
-#colorbox, #cboxOverlay, #cboxWrapper {
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
   position: absolute;
   top: 0;
   left: 0;
@@ -14,7 +16,8 @@
   width: 100%;
   height: 100%;
 }
-#cboxMiddleLeft, #cboxBottomLeft {
+#cboxMiddleLeft,
+#cboxBottomLeft {
   clear: left;
 }
 #cboxContent {
@@ -27,7 +30,8 @@
 #cboxTitle {
   margin: 0;
 }
-#cboxLoadingOverlay, #cboxLoadingGraphic {
+#cboxLoadingOverlay,
+#cboxLoadingGraphic {
   position: absolute;
   top: 0;
   left: 0;
@@ -38,7 +42,10 @@
  * These elements are buttons, and may need to have additional
  * styles reset to avoid unwanted base styles.
  */
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow {
+#cboxPrevious,
+#cboxNext,
+#cboxClose,
+#cboxSlideshow {
   border: 0;
   padding: 0;
   margin: 0;
@@ -51,7 +58,10 @@
  * Avoid outlines on :active (mouseclick),
  * but preserve outlines on :focus (tabbed navigating)
  */
-#cboxPrevious:active, #cboxNext:active, #cboxClose:active, #cboxSlideshow:active {
+#cboxPrevious:active,
+#cboxNext:active,
+#cboxClose:active,
+#cboxSlideshow:active {
   outline: 0;
 }
 .cboxPhoto {
@@ -59,7 +69,8 @@
   margin: auto;
   border: 0;
   display: block;
-  max-width: none;
+  max-width: 100%;
+  max-height: 100%;
 }
 .cboxIframe {
   width: 100%;
@@ -68,7 +79,9 @@
   border: 0;
 }
 /* Reset box sizing to content-box if theme is using border-box. */
-#colorbox, #cboxContent, #cboxLoadedContent {
+#colorbox,
+#cboxContent,
+#cboxLoadedContent {
   -moz-box-sizing: content-box;
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
@@ -85,132 +98,132 @@
 #colorbox {
   outline: 0;
 }
-  #cboxWrapper {
-    background: #fff;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-  }
-    #cboxTopLeft {
-      width: 15px;
-      height: 15px;
-    }
-    #cboxTopCenter {
-      height: 15px;
-    }
-    #cboxTopRight {
-      width: 15px;
-      height: 15px;
-    }
-    #cboxBottomLeft {
-      width: 15px;
-      height: 10px;
-    }
-    #cboxBottomCenter {
-      height: 10px;
-    }
-    #cboxBottomRight {
-      width: 15px;
-      height: 10px;
-    }
-    #cboxMiddleLeft {
-      width: 15px;
-    }
-    #cboxMiddleRight {
-      width: 15px;
-    }
-    #cboxContent {
-      background: #fff;
-      overflow: hidden;
-    }
-      #cboxError {
-        padding: 50px;
-        border: 1px solid #ccc;
-      }
-      #cboxLoadedContent {
-        margin-bottom: 28px;
-      }
-      #cboxTitle {
-        position: absolute;
-        background: rgba(255, 255, 255, 0.7);
-        bottom: 28px;
-        left: 0;
-        color: #535353;
-        width: 100%;
-        padding: 4px 6px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-      }
-      #cboxCurrent {
-        position: absolute;
-        bottom: 4px;
-        left: 60px;
-        color: #949494;
-      }
-      .cboxSlideshow_on #cboxSlideshow {
-        position: absolute;
-        bottom: 0px;
-        right: 30px;
-        background: url(images/controls.png) no-repeat -75px -50px;
-        width: 25px;
-        height: 25px;
-        text-indent: -9999px;
-      }
-      .cboxSlideshow_on #cboxSlideshow:hover {
-        background-position: -101px -50px;
-      }
-      .cboxSlideshow_off #cboxSlideshow {
-        position: absolute;
-        bottom: 0px;
-        right: 30px;
-        background: url(images/controls.png) no-repeat -25px -50px;
-        width: 25px;
-        height: 25px;
-        text-indent: -9999px;
-      }
-      .cboxSlideshow_off #cboxSlideshow:hover {
-        background-position: -49px -50px;
-      }
-      #cboxPrevious {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        background: url(images/controls.png) no-repeat -75px 0px;
-        width: 25px;
-        height: 25px;
-        text-indent: -9999px;
-      }
-      #cboxPrevious:hover {
-        background-position: -75px -25px;
-      }
-      #cboxNext {
-        position: absolute;
-        bottom: 0;
-        left: 27px;
-        background: url(images/controls.png) no-repeat -50px 0px;
-        width: 25px;
-        height: 25px;
-        text-indent: -9999px;
-      }
-      #cboxNext:hover {
-        background-position: -50px -25px;
-      }
-      #cboxLoadingOverlay {
-        background: #fff;
-      }
-      #cboxLoadingGraphic {
-        background: url(images/loading_animation.gif) no-repeat center center;
-      }
-      #cboxClose {
-        position: absolute;
-        bottom: 0;
-        right: 0;
-        background: url(images/controls.png) no-repeat -25px 0px;
-        width: 25px;
-        height: 25px;
-        text-indent: -9999px;
-      }
-      #cboxClose:hover {
-        background-position: -25px -25px;
-      }
+#cboxWrapper {
+  background: #fff;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+#cboxTopLeft {
+  width: 15px;
+  height: 15px;
+}
+#cboxTopCenter {
+  height: 15px;
+}
+#cboxTopRight {
+  width: 15px;
+  height: 15px;
+}
+#cboxBottomLeft {
+  width: 15px;
+  height: 10px;
+}
+#cboxBottomCenter {
+  height: 10px;
+}
+#cboxBottomRight {
+  width: 15px;
+  height: 10px;
+}
+#cboxMiddleLeft {
+  width: 15px;
+}
+#cboxMiddleRight {
+  width: 15px;
+}
+#cboxContent {
+  background: #fff;
+  overflow: hidden;
+}
+#cboxError {
+  padding: 50px;
+  border: 1px solid #ccc;
+}
+#cboxLoadedContent {
+  margin-bottom: 28px;
+}
+#cboxTitle {
+  position: absolute;
+  background: rgba(255, 255, 255, 0.7);
+  bottom: 28px;
+  left: 0;
+  color: #535353;
+  width: 100%;
+  padding: 4px 6px;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+#cboxCurrent {
+  position: absolute;
+  bottom: 4px;
+  left: 60px;
+  color: #949494;
+}
+.cboxSlideshow_on #cboxSlideshow {
+  position: absolute;
+  bottom: 0px;
+  right: 30px;
+  background: url(images/controls.png) no-repeat -75px -50px;
+  width: 25px;
+  height: 25px;
+  text-indent: -9999px;
+}
+.cboxSlideshow_on #cboxSlideshow:hover {
+  background-position: -101px -50px;
+}
+.cboxSlideshow_off #cboxSlideshow {
+  position: absolute;
+  bottom: 0px;
+  right: 30px;
+  background: url(images/controls.png) no-repeat -25px -50px;
+  width: 25px;
+  height: 25px;
+  text-indent: -9999px;
+}
+.cboxSlideshow_off #cboxSlideshow:hover {
+  background-position: -49px -50px;
+}
+#cboxPrevious {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  background: url(images/controls.png) no-repeat -75px 0px;
+  width: 25px;
+  height: 25px;
+  text-indent: -9999px;
+}
+#cboxPrevious:hover {
+  background-position: -75px -25px;
+}
+#cboxNext {
+  position: absolute;
+  bottom: 0;
+  left: 27px;
+  background: url(images/controls.png) no-repeat -50px 0px;
+  width: 25px;
+  height: 25px;
+  text-indent: -9999px;
+}
+#cboxNext:hover {
+  background-position: -50px -25px;
+}
+#cboxLoadingOverlay {
+  background: #fff;
+}
+#cboxLoadingGraphic {
+  background: url(images/loading_animation.gif) no-repeat center center;
+}
+#cboxClose {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  background: url(images/controls.png) no-repeat -25px 0px;
+  width: 25px;
+  height: 25px;
+  text-indent: -9999px;
+}
+#cboxClose:hover {
+  background-position: -25px -25px;
+}
diff --git a/drupal7/sites/all/modules/colorbox/styles/plain/colorbox_style.css b/drupal7/sites/all/modules/colorbox/styles/plain/colorbox_style.css
index 0b500daf..8500975b 100644
--- a/drupal7/sites/all/modules/colorbox/styles/plain/colorbox_style.css
+++ b/drupal7/sites/all/modules/colorbox/styles/plain/colorbox_style.css
@@ -2,7 +2,9 @@
  * Colorbox Core Style:
  * The following CSS is consistent between example themes and should not be altered.
  */
-#colorbox, #cboxOverlay, #cboxWrapper {
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
   position: absolute;
   top: 0;
   left: 0;
@@ -14,7 +16,8 @@
   width: 100%;
   height: 100%;
 }
-#cboxMiddleLeft, #cboxBottomLeft {
+#cboxMiddleLeft,
+#cboxBottomLeft {
   clear: left;
 }
 #cboxContent {
@@ -27,7 +30,8 @@
 #cboxTitle {
   margin: 0;
 }
-#cboxLoadingOverlay, #cboxLoadingGraphic {
+#cboxLoadingOverlay,
+#cboxLoadingGraphic {
   position: absolute;
   top: 0;
   left: 0;
@@ -38,7 +42,10 @@
  * These elements are buttons, and may need to have additional
  * styles reset to avoid unwanted base styles.
  */
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow {
+#cboxPrevious,
+#cboxNext,
+#cboxClose,
+#cboxSlideshow {
   border: 0;
   padding: 0;
   margin: 0;
@@ -51,7 +58,10 @@
  * Avoid outlines on :active (mouseclick),
  * but preserve outlines on :focus (tabbed navigating)
  */
-#cboxPrevious:active, #cboxNext:active, #cboxClose:active, #cboxSlideshow:active {
+#cboxPrevious:active,
+#cboxNext:active,
+#cboxClose:active,
+#cboxSlideshow:active {
   outline: 0;
 }
 .cboxPhoto {
@@ -68,7 +78,9 @@
   border: 0;
 }
 /* Reset box sizing to content-box if theme is using border-box. */
-#colorbox, #cboxContent, #cboxLoadedContent {
+#colorbox,
+#cboxContent,
+#cboxLoadedContent {
   -moz-box-sizing: content-box;
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
@@ -85,60 +97,63 @@
 #colorbox {
   outline: 0;
 }
-  #cboxWrapper {}
-    #cboxContent {
-      overflow: hidden;
-    }
-      #cboxContent, .cboxPhoto {
-        -webkit-border-radius: 5px;
-        -moz-border-radius: 5px;
-        border-radius: 5px;
-      }
-      #cboxError {
-        padding: 50px;
-        border: 1px solid #ccc;
-      }
-      #cboxTitle {
-        position: absolute;
-        background: rgba(255, 255, 255, 0.7);
-        bottom: 0;
-        left: 0;
-        color: #535353;
-        width: 100%;
-        padding: 4px 6px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        -webkit-border-bottom-right-radius: 5px;
-        -webkit-border-bottom-left-radius: 5px;
-        -moz-border-radius-bottomright: 5px;
-        -moz-border-radius-bottomleft: 5px;
-        border-bottom-right-radius: 5px;
-        border-bottom-left-radius: 5px;
-      }
+/* @codingStandardsIgnoreLine */
+#cboxWrapper {
+}
+#cboxContent {
+  overflow: hidden;
+}
+#cboxContent,
+.cboxPhoto {
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+#cboxError {
+  padding: 50px;
+  border: 1px solid #ccc;
+}
+#cboxTitle {
+  position: absolute;
+  background: rgba(255, 255, 255, 0.7);
+  bottom: 0;
+  left: 0;
+  color: #535353;
+  width: 100%;
+  padding: 4px 6px;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-border-bottom-right-radius: 5px;
+  -webkit-border-bottom-left-radius: 5px;
+  -moz-border-radius-bottomright: 5px;
+  -moz-border-radius-bottomleft: 5px;
+  border-bottom-right-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
 
-      #cboxLoadingOverlay {
-        background: #fff;
-      }
-      #cboxLoadingGraphic {
-        background: url(images/loading_animation.gif) no-repeat center center;
-      }
-      #cboxClose.cbox-close-plain {
-        position: absolute;
-        font-size: 20px;
-        line-height: 18px;
-        text-align: center;
-        color: rgba(255, 255, 255, 0.7);
-        background: rgba(0, 0, 0, 0.5);
-        top: 4px;
-        right: 4px;
-        width: 20px;
-        height: 20px;
-        -webkit-border-radius: 10px;
-        -moz-border-radius: 10px;
-        border-radius: 10px;
-      }
-      .cbox-close-plain:hover {
-        color: rgba(255, 255, 255, 0.9);
-        background: rgba(0, 0, 0, 0.8);
-      }
+#cboxLoadingOverlay {
+  background: #fff;
+}
+#cboxLoadingGraphic {
+  background: url(images/loading_animation.gif) no-repeat center center;
+}
+#cboxClose.cbox-close-plain {
+  position: absolute;
+  font-size: 20px;
+  line-height: 18px;
+  text-align: center;
+  color: rgba(255, 255, 255, 0.7);
+  background: rgba(0, 0, 0, 0.5);
+  top: 4px;
+  right: 4px;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+.cbox-close-plain:hover {
+  color: rgba(255, 255, 255, 0.9);
+  background: rgba(0, 0, 0, 0.8);
+}
diff --git a/drupal7/sites/all/modules/colorbox/styles/stockholmsyndrome/colorbox_style.css b/drupal7/sites/all/modules/colorbox/styles/stockholmsyndrome/colorbox_style.css
index 6cdfa33c..3ac08717 100644
--- a/drupal7/sites/all/modules/colorbox/styles/stockholmsyndrome/colorbox_style.css
+++ b/drupal7/sites/all/modules/colorbox/styles/stockholmsyndrome/colorbox_style.css
@@ -2,7 +2,9 @@
  * Colorbox Core Style:
  * The following CSS is consistent between example themes and should not be altered.
  */
-#colorbox, #cboxOverlay, #cboxWrapper {
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
   position: absolute;
   top: 0;
   left: 0;
@@ -14,7 +16,8 @@
   width: 100%;
   height: 100%;
 }
-#cboxMiddleLeft, #cboxBottomLeft {
+#cboxMiddleLeft,
+#cboxBottomLeft {
   clear: left;
 }
 #cboxContent {
@@ -27,7 +30,8 @@
 #cboxTitle {
   margin: 0;
 }
-#cboxLoadingOverlay, #cboxLoadingGraphic {
+#cboxLoadingOverlay,
+#cboxLoadingGraphic {
   position: absolute;
   top: 0;
   left: 0;
@@ -38,7 +42,10 @@
  * These elements are buttons, and may need to have additional
  * styles reset to avoid unwanted base styles.
  */
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow {
+#cboxPrevious,
+#cboxNext,
+#cboxClose,
+#cboxSlideshow {
   border: 0;
   padding: 0;
   margin: 0;
@@ -51,7 +58,10 @@
  * Avoid outlines on :active (mouseclick),
  * but preserve outlines on :focus (tabbed navigating)
  */
-#cboxPrevious:active, #cboxNext:active, #cboxClose:active, #cboxSlideshow:active {
+#cboxPrevious:active,
+#cboxNext:active,
+#cboxClose:active,
+#cboxSlideshow:active {
   outline: 0;
 }
 .cboxPhoto {
@@ -68,7 +78,9 @@
   border: 0;
 }
 /* Reset box sizing to content-box if theme is using border-box. */
-#colorbox, #cboxContent, #cboxLoadedContent {
+#colorbox,
+#cboxContent,
+#cboxLoadedContent {
   -moz-box-sizing: content-box;
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
@@ -96,124 +108,128 @@
   border-bottom-right-radius: 9px;
   outline: 0;
 }
-#colorbox, #colorbox div {
+#colorbox,
+#colorbox div {
   overflow: visible; /* Required by the close button. */
 }
-  #cboxWrapper {
-    -moz-border-radius-bottomleft: 9px;
-    -moz-border-radius-bottomright: 9px;
-    -webkit-border-bottom-left-radius: 9px;
-    -webkit-border-bottom-right-radius: 9px;
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px;
-  }
-    #cboxTopLeft {
-      width: 0;
-      height: 0;
-    }
-    #cboxTopCenter {
-      height: 0;
-    }
-    #cboxTopRight {
-      width: 0;
-      height: 0;
-    }
-    #cboxBottomLeft {
-      width: 15px;
-      height: 10px;
-    }
-    #cboxBottomCenter {
-      height: 10px;
-    }
-    #cboxBottomRight {
-      width: 15px;
-      height: 10px;
-    }
-    #cboxMiddleLeft {
-      width: 0;
-    }
-    #cboxMiddleRight {
-      width: 0;
-    }
-    #cboxContent {
-      background: #fff;
-      overflow: hidden;
-      margin-bottom: 28px;
-    }
-      #cboxError {
-        padding: 50px;
-        border: 1px solid #ccc;
-      }
-      #cboxLoadedContent {
-      }
-      #cboxTitle {
-        left: 0;
-        height: 38px;
-        color: #313131;
-        padding: 0 140px 0 15px;
-        display: table-cell !important;
-        vertical-align: middle;
-        float: none !important;
-      }
-      #cboxCurrent {
-        position: absolute;
-        bottom: -26px;
-        right: 80px;
-        color: #313131;
-        border-left: 1px solid #313131;
-        padding: 0 0 0 15px;
-      }
-      /* Slideshow not implemented. */
-      .cboxSlideshow_on #cboxSlideshow {
-        display: none;
-      }
-      .cboxSlideshow_on #cboxSlideshow:hover {
-      }
-      .cboxSlideshow_off #cboxSlideshow {
-        display: none;
-      }
-      .cboxSlideshow_off #cboxSlideshow:hover {
-      }
-      #cboxPrevious {
-        position: absolute;
-        bottom: -26px;
-        right: 45px;
-        background: url(images/controls.png) no-repeat 0 -48px;
-        width: 21px;
-        height: 15px;
-        text-indent: -9999px;
-      }
-      #cboxPrevious:hover {
-        background-position: 0 -111px;
-      }
-      #cboxNext {
-        position: absolute;
-        bottom: -26px;
-        right: 15px;
-        background: url(images/controls.png) no-repeat 0 -29px;
-        width: 21px;
-        height: 15px;
-        text-indent: -9999px;
-      }
-      #cboxNext:hover {
-        background-position: 0 -92px;
-      }
-      #cboxLoadingOverlay {
-        background: #e6e6e6;
-      }
-      #cboxLoadingGraphic {
-        background: url(images/loading_animation.gif) no-repeat center center;
-      }
-      #cboxClose {
-        position: absolute;
-        top: -10px;
-        right: -10px;
-        background: url(images/controls.png) no-repeat 0px 0px;
-        width: 25px;
-        height: 25px;
-        text-indent: -9999px;
-        opacity: 0;
-      }
-      #cboxClose:hover {
-        background-position: 0 -63px;
-      }
+#cboxWrapper {
+  -moz-border-radius-bottomleft: 9px;
+  -moz-border-radius-bottomright: 9px;
+  -webkit-border-bottom-left-radius: 9px;
+  -webkit-border-bottom-right-radius: 9px;
+  border-bottom-left-radius: 9px;
+  border-bottom-right-radius: 9px;
+}
+#cboxTopLeft {
+  width: 0;
+  height: 0;
+}
+#cboxTopCenter {
+  height: 0;
+}
+#cboxTopRight {
+  width: 0;
+  height: 0;
+}
+#cboxBottomLeft {
+  width: 15px;
+  height: 10px;
+}
+#cboxBottomCenter {
+  height: 10px;
+}
+#cboxBottomRight {
+  width: 15px;
+  height: 10px;
+}
+#cboxMiddleLeft {
+  width: 0;
+}
+#cboxMiddleRight {
+  width: 0;
+}
+#cboxContent {
+  background: #fff;
+  overflow: hidden;
+  margin-bottom: 28px;
+}
+#cboxError {
+  padding: 50px;
+  border: 1px solid #ccc;
+}
+/* @codingStandardsIgnoreLine */
+#cboxLoadedContent {
+}
+#cboxTitle {
+  left: 0;
+  height: 38px;
+  color: #313131;
+  padding: 0 140px 0 15px;
+  display: table-cell !important;
+  vertical-align: middle;
+  float: none !important;
+}
+#cboxCurrent {
+  position: absolute;
+  bottom: -26px;
+  right: 80px;
+  color: #313131;
+  border-left: 1px solid #313131;
+  padding: 0 0 0 15px;
+}
+/* Slideshow not implemented. */
+.cboxSlideshow_on #cboxSlideshow {
+  display: none;
+}
+/* @codingStandardsIgnoreLine */
+.cboxSlideshow_on #cboxSlideshow:hover {
+}
+.cboxSlideshow_off #cboxSlideshow {
+  display: none;
+}
+/* @codingStandardsIgnoreLine */
+.cboxSlideshow_off #cboxSlideshow:hover {
+}
+#cboxPrevious {
+  position: absolute;
+  bottom: -26px;
+  right: 45px;
+  background: url(images/controls.png) no-repeat 0 -48px;
+  width: 21px;
+  height: 15px;
+  text-indent: -9999px;
+}
+#cboxPrevious:hover {
+  background-position: 0 -111px;
+}
+#cboxNext {
+  position: absolute;
+  bottom: -26px;
+  right: 15px;
+  background: url(images/controls.png) no-repeat 0 -29px;
+  width: 21px;
+  height: 15px;
+  text-indent: -9999px;
+}
+#cboxNext:hover {
+  background-position: 0 -92px;
+}
+#cboxLoadingOverlay {
+  background: #e6e6e6;
+}
+#cboxLoadingGraphic {
+  background: url(images/loading_animation.gif) no-repeat center center;
+}
+#cboxClose {
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  background: url(images/controls.png) no-repeat 0px 0px;
+  width: 25px;
+  height: 25px;
+  text-indent: -9999px;
+  opacity: 0;
+}
+#cboxClose:hover {
+  background-position: 0 -63px;
+}
diff --git a/drupal7/sites/all/modules/colorbox/views/colorbox.views.inc b/drupal7/sites/all/modules/colorbox/views/colorbox.views.inc
index 2731d7b8..6d02b3dc 100644
--- a/drupal7/sites/all/modules/colorbox/views/colorbox.views.inc
+++ b/drupal7/sites/all/modules/colorbox/views/colorbox.views.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_views_data()
+ * Implements hook_views_data().
  */
 function colorbox_views_data() {
 
diff --git a/drupal7/sites/all/modules/colorbox/views/colorbox_handler_field_colorbox.inc b/drupal7/sites/all/modules/colorbox/views/colorbox_handler_field_colorbox.inc
index 49b6af78..e220d546 100644
--- a/drupal7/sites/all/modules/colorbox/views/colorbox_handler_field_colorbox.inc
+++ b/drupal7/sites/all/modules/colorbox/views/colorbox_handler_field_colorbox.inc
@@ -9,13 +9,27 @@
  * A handler to provide a field that is completely custom by the administrator.
  *
  * @ingroup views_field_handlers
+ * @codingStandardsIgnoreStart
  */
 class colorbox_handler_field_colorbox extends views_handler_field {
-  function query() {
-    // Do nothing, as this handler does not need to do anything to the query itself.
+
+  /**
+   * Query.
+   *
+   * @codingStandardsIgnoreEnd
+   */
+  public function query() {
+    // Do nothing, as this handler does not need to do anything to the query
+    // itself.
   }
 
-  function option_definition() {
+  /**
+   * Option definition.
+   *
+   * @codingStandardsIgnoreStart
+   */
+  public function option_definition() {
+    // @codingStandardsIgnoreEnd
     $options = parent::option_definition();
 
     $options['trigger_field'] = array('default' => '');
@@ -29,10 +43,17 @@ class colorbox_handler_field_colorbox extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  /**
+   * Options for form.
+   *
+   * @codingStandardsIgnoreStart
+   */
+  public function options_form(&$form, &$form_state) {
+    // @codingStandardsIgnoreEnd
     parent::options_form($form, $form_state);
 
-    // Get a list of the available fields and arguments for trigger field and token replacement.
+    // Get a list of the available fields and arguments for trigger field and
+    // token replacement.
     $options = array();
     $fields = array('trigger_field' => t('- None -'));
     foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
@@ -44,8 +65,9 @@ class colorbox_handler_field_colorbox extends views_handler_field {
 
       $fields[$field] = $handler->definition['title'];
     }
-    $count = 0; // This lets us prepare the key as we want it printed.
-    foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+    // This lets us prepare the key as we want it printed.
+    $count = 0;
+    foreach ($this->view->display_handler->get_handlers('argument') as $handler) {
       $options[t('Arguments')]['%' . ++$count] = t('@argument title', array('@argument' => $handler->ui_name()));
       $options[t('Arguments')]['!' . $count] = t('@argument input', array('@argument' => $handler->ui_name()));
     }
@@ -142,7 +164,7 @@ If you would like to have the characters %5B and %5D please use the html entity
   /**
    * Render the trigger field and its linked popup information.
    */
-  function render($values) {
+  public function render($values) {
     // Load the necessary js file for Colorbox activation.
     if (_colorbox_active() && !variable_get('colorbox_inline', 0)) {
       drupal_add_js(drupal_get_path('module', 'colorbox') . '/js/colorbox_inline.js');
@@ -188,7 +210,7 @@ If you would like to have the characters %5B and %5D please use the html entity
       'attributes' => array(
         'class' => array('colorbox-inline'),
         'rel' => $gallery_id,
-      )
+      ),
     );
     // Remove any parameters that aren't set.
     $link_options['query'] = array_filter($link_options['query']);
@@ -198,8 +220,9 @@ If you would like to have the characters %5B and %5D please use the html entity
     $link_target = isset($values->nid) ? 'node/' . $values->nid : '';
     $link_tag = l($link_text, $link_target, $link_options);
 
-    // The outside div is there to hide all of the divs because if the specific Colorbox
-    // div is hidden it won't show up as a Colorbox.
+    // The outside div is there to hide all of the divs because if the specific
+    // Colorbox div is hidden it won't show up as a Colorbox.
     return $link_tag . '<div style="display: none;"><div id="colorbox-inline-' . $i . '">' . $popup . '</div></div>';
   }
+
 }
diff --git a/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.info b/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.info
index 641d996c..2cd7c2ed 100644
--- a/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.info
+++ b/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.info
@@ -5,9 +5,8 @@ dependencies[] = libraries
 package = Views
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2017-06-08
-version = "7.x-3.9"
+; Information added by Drupal.org packaging script on 2020-04-13
+version = "7.x-3.10"
 core = "7.x"
 project = "views_slideshow"
-datestamp = "1496893153"
-
+datestamp = "1586783966"
diff --git a/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/views_slideshow_simple_pager.info b/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/views_slideshow_simple_pager.info
index 8a117dbd..09f57b12 100644
--- a/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/views_slideshow_simple_pager.info
+++ b/drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/views_slideshow_simple_pager.info
@@ -4,9 +4,8 @@ dependencies[] = views_slideshow
 package = Views
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2017-06-08
-version = "7.x-3.9"
+; Information added by Drupal.org packaging script on 2020-04-13
+version = "7.x-3.10"
 core = "7.x"
 project = "views_slideshow"
-datestamp = "1496893153"
-
+datestamp = "1586783966"
diff --git a/drupal7/sites/all/modules/views_slideshow/views_slideshow.info b/drupal7/sites/all/modules/views_slideshow/views_slideshow.info
index 3ca9faba..8f95bdc5 100644
--- a/drupal7/sites/all/modules/views_slideshow/views_slideshow.info
+++ b/drupal7/sites/all/modules/views_slideshow/views_slideshow.info
@@ -6,9 +6,8 @@ core = 7.x
 
 files[] = views_slideshow_plugin_style_slideshow.inc
 
-; Information added by Drupal.org packaging script on 2017-06-08
-version = "7.x-3.9"
+; Information added by Drupal.org packaging script on 2020-04-13
+version = "7.x-3.10"
 core = "7.x"
 project = "views_slideshow"
-datestamp = "1496893153"
-
+datestamp = "1586783966"
diff --git a/drupal7/sites/all/modules/views_slideshow/views_slideshow.install b/drupal7/sites/all/modules/views_slideshow/views_slideshow.install
index cab072f3..05979ca9 100644
--- a/drupal7/sites/all/modules/views_slideshow/views_slideshow.install
+++ b/drupal7/sites/all/modules/views_slideshow/views_slideshow.install
@@ -11,5 +11,4 @@
   * Implements hook_update_N().
   */
 function views_slideshow_update_7300(&$sandbox) {
-  drupal_flush_all_caches();
 }
