summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--colorbox.module3
-rw-r--r--drush/colorbox.drush.inc20
-rw-r--r--views/colorbox_handler_field_colorbox.inc4
3 files changed, 14 insertions, 13 deletions
diff --git a/colorbox.module b/colorbox.module
index 1ccd4da..cd8414d 100644
--- a/colorbox.module
+++ b/colorbox.module
@@ -211,8 +211,7 @@ function _colorbox_doheader() {
$path = drupal_get_path('module', 'colorbox');
$style = variable_get('colorbox_style', 'default');
- // Give other modules the possibility to override Colorbox settings and
- // style.
+ // Give other modules the possibility to override Colorbox settings and style.
$data = &$js_settings;
$data['__drupal_alter_by_ref'] = array(&$style);
drupal_alter('colorbox_settings', $data);
diff --git a/drush/colorbox.drush.inc b/drush/colorbox.drush.inc
index 1450149..b64ff4a 100644
--- a/drush/colorbox.drush.inc
+++ b/drush/colorbox.drush.inc
@@ -61,15 +61,17 @@ function colorbox_drush_help($section) {
}
/**
- * Example drush command callback.
- *
- * This is where the action takes place.
- *
- * In this function, all of Drupals API is (usually) available, including
- * any functions you have added in your own modules/themes.
- *
- * To print something to the terminal window, use drush_print().
- *
+ * Implements drush_MODULE_post_pm_enable().
+ */
+// function drush_colorbox_post_pm_enable() {
+// $modules = func_get_args();
+// if (in_array('colorbox', $modules)) {
+// drush_colorbox_plugin();
+// }
+// }
+
+/**
+ * Command to download the Colorbox plugin.
*/
function drush_colorbox_plugin() {
if (!drush_shell_exec('type unzip')) {
diff --git a/views/colorbox_handler_field_colorbox.inc b/views/colorbox_handler_field_colorbox.inc
index 29c708b..a8e231c 100644
--- a/views/colorbox_handler_field_colorbox.inc
+++ b/views/colorbox_handler_field_colorbox.inc
@@ -88,7 +88,7 @@ class colorbox_handler_field_colorbox extends views_handler_field {
$form['height'] = array(
'#type' => 'textfield',
'#title' => t('Height'),
- '#description' => t('Specify the height of the Colorbox popup window. Because the content is dynamic, we cannot detect this value automatically.'),
+ '#description' => t('Specify the height of the Colorbox popup window. Because the content is dynamic, we cannot detect this value automatically. Example: "100%", 500, "500px".'),
'#default_value' => $this->options['height'],
'#weight' => -7,
);
@@ -96,7 +96,7 @@ class colorbox_handler_field_colorbox extends views_handler_field {
$form['width'] = array(
'#type' => 'textfield',
'#title' => t('Width'),
- '#description' => t('Specify the width of the Colorbox popup window. Because the content is dynamic, we cannot detect this value automatically.'),
+ '#description' => t('Specify the width of the Colorbox popup window. Because the content is dynamic, we cannot detect this value automatically. Example: "100%", 500, "500px".'),
'#default_value' => $this->options['width'],
'#weight' => -6,
);