summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.18/sites/all/modules/views/plugins')
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/export_ui/views_ui.class.php5
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display.inc6
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_feed.inc1
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_page.inc24
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_exposed_form.inc25
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_pager_mini.inc48
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_query_default.inc2
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_grid.inc10
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_jump_menu.inc17
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_mapping.inc125
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_summary_jump_menu.inc17
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_table.inc11
12 files changed, 273 insertions, 18 deletions
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/export_ui/views_ui.class.php b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/export_ui/views_ui.class.php
index 22b65cb..9d80138 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/export_ui/views_ui.class.php
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/export_ui/views_ui.class.php
@@ -376,6 +376,11 @@ class views_ui extends ctools_export_ui {
}
function list_page($js, $input) {
+ // Remove filters values from session if filters are hidden.
+ if (!variable_get('views_ui_show_listing_filters', FALSE) && isset($_SESSION['ctools_export_ui'][$this->plugin['name']])) {
+ unset($_SESSION['ctools_export_ui'][$this->plugin['name']]);
+ }
+
// wrap output in a div for CSS
$output = parent::list_page($js, $input);
if (is_string($output)) {
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display.inc
index 6be3dcc..75a32c5 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display.inc
@@ -476,7 +476,7 @@ class views_plugin_display extends views_plugin {
'display_description' => FALSE,
'use_ajax' => TRUE,
'hide_attachment_summary' => TRUE,
- 'hide_admin_links' => FALSE,
+ 'hide_admin_links' => TRUE,
'pager' => TRUE,
'pager_options' => TRUE,
'use_more' => TRUE,
@@ -783,6 +783,10 @@ class views_plugin_display extends views_plugin {
if ($display_id && !empty($this->view->display[$display_id]) && is_object($this->view->display[$display_id]->handler)) {
return $this->view->display[$display_id]->handler->get_path();
}
+
+ if ($this->get_option('link_display') == 'custom_url' && $link_url = $this->get_option('link_url')) {
+ return $link_url;
+ }
}
function get_url() {
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_feed.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_feed.inc
index 37d0ae4..bfd220c 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_feed.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_feed.inc
@@ -139,7 +139,6 @@ class views_plugin_display_feed extends views_plugin_display_page {
* Provide the default form for setting options.
*/
function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
// It is very important to call the parent function here.
parent::options_form($form, $form_state);
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_page.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_page.inc
index cd7fe37..7ca4bf7 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_page.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_display_page.inc
@@ -30,6 +30,7 @@ class views_plugin_display_page extends views_plugin_display {
'weight' => array('default' => 0),
'name' => array('default' => variable_get('menu_default_node_menu', 'navigation')),
'context' => array('default' => ''),
+ 'context_only_inline' => array('default' => FALSE),
),
);
$options['tab_options'] = array(
@@ -153,7 +154,7 @@ class views_plugin_display_page extends views_plugin_display {
// Add context for contextual links.
// @see menu_contextual_links()
if (!empty($menu['context'])) {
- $items[$path]['context'] = MENU_CONTEXT_INLINE;
+ $items[$path]['context'] = !empty($menu['context_only_inline']) ? MENU_CONTEXT_INLINE : (MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE);
}
// If this is a 'default' tab, check to see if we have to create teh
@@ -251,9 +252,12 @@ class views_plugin_display_page extends views_plugin_display {
),
);
- $path = strip_tags('/' . $this->get_option('path'));
+ $path = strip_tags($this->get_option('path'));
if (empty($path)) {
- $path = t('None');
+ $path = t('No path is set');
+ }
+ else {
+ $path = '/' . $path;
}
$options['path'] = array(
@@ -297,7 +301,6 @@ class views_plugin_display_page extends views_plugin_display {
* Provide the default form for setting options.
*/
function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
// It is very important to call the parent function here:
parent::options_form($form, $form_state);
@@ -384,12 +387,23 @@ class views_plugin_display_page extends views_plugin_display {
);
$form['menu']['context'] = array(
'#title' => t('Context'),
- '#suffix' => '</div>',
'#type' => 'checkbox',
'#default_value' => !empty($menu['context']),
'#description' => t('Displays the link in contextual links'),
'#dependency' => array('radio:menu[type]' => array('tab')),
);
+ $form['menu']['context_only_inline'] = array(
+ '#title' => t('Hide menu tab'),
+ '#suffix' => '</div>',
+ '#type' => 'checkbox',
+ '#default_value' => !empty($menu['context_only_inline']),
+ '#description' => t('Only display menu item entry in contextual links. Menu tab should not be displayed.'),
+ '#dependency' => array(
+ 'radio:menu[type]' => array('tab'),
+ 'edit-menu-context' => array(1),
+ ),
+ '#dependency_count' => 2,
+ );
break;
case 'tab_options':
$form['#title'] .= t('Default tab options');
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_exposed_form.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_exposed_form.inc
index 833f44b..343eee8 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_exposed_form.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_exposed_form.inc
@@ -41,6 +41,7 @@ class views_plugin_exposed_form extends views_plugin {
$options['reset_button'] = array('default' => FALSE, 'bool' => TRUE);
$options['reset_button_label'] = array('default' => 'Reset', 'translatable' => TRUE);
$options['exposed_sorts_label'] = array('default' => 'Sort by', 'translatable' => TRUE);
+ $options['expose_sort_order'] = array('default' => TRUE, 'bool' => TRUE);
$options['sort_asc_label'] = array('default' => 'Asc', 'translatable' => TRUE);
$options['sort_desc_label'] = array('default' => 'Desc', 'translatable' => TRUE);
$options['autosubmit'] = array('default' => FALSE, 'bool' => TRUE);
@@ -84,12 +85,20 @@ class views_plugin_exposed_form extends views_plugin {
'#required' => TRUE,
);
+ $form['expose_sort_order'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Expose sort order'),
+ '#description' => t('Allow the user to choose the sort order. If sort order is not exposed, the sort criteria settings for each sort will determine its order.'),
+ '#default_value' => $this->options['expose_sort_order'],
+ );
+
$form['sort_asc_label'] = array(
'#type' => 'textfield',
'#title' => t('Ascending'),
'#description' => t('Text to use when exposed sort is ordered ascending.'),
'#default_value' => $this->options['sort_asc_label'],
'#required' => TRUE,
+ '#dependency' => array('edit-exposed-form-options-expose-sort-order' => array(TRUE)),
);
$form['sort_desc_label'] = array(
@@ -98,6 +107,7 @@ class views_plugin_exposed_form extends views_plugin {
'#description' => t('Text to use when exposed sort is ordered descending.'),
'#default_value' => $this->options['sort_desc_label'],
'#required' => TRUE,
+ '#dependency' => array('edit-exposed-form-options-expose-sort-order' => array(TRUE)),
);
$form['autosubmit'] = array(
@@ -231,12 +241,14 @@ class views_plugin_exposed_form extends views_plugin {
$form_state['input']['sort_by'] = array_shift($keys);
}
- $form['sort_order'] = array(
- '#type' => 'select',
- '#options' => $sort_order,
- '#title' => t('Order'),
- '#default_value' => $default_sort_order,
- );
+ if ($this->options['expose_sort_order']) {
+ $form['sort_order'] = array(
+ '#type' => 'select',
+ '#options' => $sort_order,
+ '#title' => t('Order'),
+ '#default_value' => $default_sort_order,
+ );
+ }
$form['submit']['#weight'] = 10;
if (isset($form['reset'])) {
$form['reset']['#weight'] = 10;
@@ -312,6 +324,7 @@ class views_plugin_exposed_form extends views_plugin {
$this->view->exposed_data = array();
}
+ $form_state['redirect'] = current_path();
$form_state['values'] = array();
}
}
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_pager_mini.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_pager_mini.inc
index 2daea99..bec48c8 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_pager_mini.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_pager_mini.inc
@@ -6,7 +6,7 @@
*/
/**
- * The plugin to handle full pager.
+ * The plugin to handle mini pager.
*
* @ingroup views_pager_plugins
*/
@@ -18,9 +18,53 @@ class views_plugin_pager_mini extends views_plugin_pager_full {
return format_plural($this->options['items_per_page'], 'Mini pager, @count item', 'Mini pager, @count items', array('@count' => $this->options['items_per_page']));
}
+ /**
+ * Overrides views_plugin_pager_full::option_definition().
+ *
+ * Overrides the full pager options form by deleting unused settings.
+ */
+ function option_definition() {
+ $options = parent::option_definition();
+
+ unset($options['quantity']);
+ unset($options['tags']['first']);
+ unset($options['tags']['last']);
+ $options['tags']['previous']['default'] = '‹‹';
+ $options['tags']['next']['default'] = '››';
+
+ return $options;
+ }
+
+ /**
+ * Overrides views_plugin_pager_full::options_form().
+ *
+ * Overrides the full pager options form by deleting unused settings.
+ */
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+ unset($form['quantity']);
+ unset($form['tags']['first']);
+ unset($form['tags']['last']);
+ }
+
+ /**
+ * Overrides views_plugin_pager_full::render().
+ *
+ * Overrides the full pager renderer by changing the theme function
+ * and leaving out variables that are not used in the mini pager.
+ */
function render($input) {
$pager_theme = views_theme_functions('views_mini_pager', $this->view, $this->display);
+ // The 1, 3 index are correct.
+ // @see theme_pager().
+ $tags = array(
+ 1 => $this->options['tags']['previous'],
+ 3 => $this->options['tags']['next'],
+ );
return theme($pager_theme, array(
- 'parameters' => $input, 'element' => $this->options['id']));
+ 'tags' => $tags,
+ 'element' => $this->options['id'],
+ 'parameters' => $input,
+ ));
}
}
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_query_default.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_query_default.inc
index c6c7649..030c5ea 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_query_default.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_query_default.inc
@@ -1578,7 +1578,7 @@ class views_plugin_query_default extends views_plugin_query {
),
),
'stddev_pop' => array(
- 'title' => t('Standard derivation'),
+ 'title' => t('Standard deviation'),
'method' => 'views_query_default_aggregation_method_simple',
'handler' => array(
'argument' => 'views_handler_argument_group_by_numeric',
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_grid.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_grid.inc
index 9be7ee1..a2e4375 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_grid.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_grid.inc
@@ -21,6 +21,7 @@ class views_plugin_style_grid extends views_plugin_style {
$options['alignment'] = array('default' => 'horizontal');
$options['fill_single_line'] = array('default' => TRUE, 'bool' => TRUE);
$options['summary'] = array('default' => '');
+ $options['caption'] = array('default' => '');
return $options;
}
@@ -52,10 +53,17 @@ class views_plugin_style_grid extends views_plugin_style {
'#default_value' => !empty($this->options['fill_single_line']),
);
+ $form['caption'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Short description of table'),
+ '#description' => t('Include a caption for better accessibility of your table.'),
+ '#default_value' => $this->options['caption'],
+ );
+
$form['summary'] = array(
'#type' => 'textfield',
'#title' => t('Table summary'),
- '#description' => t('This value will be displayed as table-summary attribute in the html. Set this for better accessiblity of your site.'),
+ '#description' => t('This value will be displayed as table-summary attribute in the html. Use this to give a summary of complex tables.'),
'#default_value' => $this->options['summary'],
);
}
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_jump_menu.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_jump_menu.inc
index f571f62..16b0aef 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_jump_menu.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_jump_menu.inc
@@ -17,7 +17,9 @@ class views_plugin_style_jump_menu extends views_plugin_style {
$options['hide'] = array('default' => FALSE, 'bool' => TRUE);
$options['path'] = array('default' => '');
$options['text'] = array('default' => 'Go', 'translatable' => TRUE);
+ $options['label'] = array('default' => '', 'translatable' => TRUE);
$options['choose'] = array('default' => '- Choose -', 'translatable' => TRUE);
+ $options['inline'] = array('default' => TRUE, 'bool' => TRUE);
$options['default_value'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
@@ -68,6 +70,13 @@ class views_plugin_style_jump_menu extends views_plugin_style {
'#default_value' => $this->options['text'],
);
+ $form['label'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Selector label'),
+ '#default_value' => $this->options['label'],
+ '#description' => t('The text that will appear as the the label of the selector element. If blank no label tag will be used.'),
+ );
+
$form['choose'] = array(
'#type' => 'textfield',
'#title' => t('Choose text'),
@@ -75,6 +84,12 @@ class views_plugin_style_jump_menu extends views_plugin_style {
'#description' => t('The text that will appear as the selected option in the jump menu.'),
);
+ $form['inline'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Set this field to display inline'),
+ '#default_value' => !empty($this->options['inline']),
+ );
+
$form['default_value'] = array(
'#type' => 'checkbox',
'#title' => t('Select the current contextual filter value'),
@@ -135,7 +150,9 @@ class views_plugin_style_jump_menu extends views_plugin_style {
$settings = array(
'hide' => $this->options['hide'],
'button' => $this->options['text'],
+ 'title' => $this->options['label'],
'choose' => $this->options['choose'],
+ 'inline' => $this->options['inline'],
'default_value' => $default_value,
);
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_mapping.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_mapping.inc
new file mode 100644
index 0000000..fb60a03
--- /dev/null
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_mapping.inc
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @file
+ * Definition of views_plugin_style_mapping.
+ */
+
+/**
+ * Allows fields to be mapped to specific use cases.
+ */
+abstract class views_plugin_style_mapping extends views_plugin_style {
+
+ /**
+ * Builds the list of field mappings.
+ *
+ * @return array
+ * An associative array, keyed by the field name, containing the following
+ * key-value pairs:
+ * - #title: The human-readable label for this field.
+ * - #default_value: The default value for this field. If not provided, an
+ * empty string will be used.
+ * - #description: A description of this field.
+ * - #required: Whether this field is required.
+ * - #filter: (optional) A method on the plugin to filter field options.
+ * - #toggle: (optional) If this select should be toggled by a checkbox.
+ */
+ abstract protected function define_mapping();
+
+ /**
+ * Overrides views_plugin_style::option_definition().
+ */
+ function option_definition() {
+ $options = parent::option_definition();
+
+ // Parse the mapping and add a default for each.
+ foreach ($this->define_mapping() as $key => $value) {
+ $default = !empty($value['#multiple']) ? array() : '';
+ $options['mapping']['contains'][$key] = array(
+ 'default' => isset($value['#default_value']) ? $value['#default_value'] : $default,
+ );
+ if (!empty($value['#toggle'])) {
+ $options['mapping']['contains']["toggle_$key"] = array(
+ 'default' => FALSE,
+ 'bool' => TRUE,
+ );
+ }
+ }
+
+ return $options;
+ }
+
+ /**
+ * Overrides views_plugin_style::options_form().
+ */
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+
+ // Get the mapping.
+ $mapping = $this->define_mapping();
+
+ // Restrict the list of defaults to the mapping, in case they have changed.
+ $options = array_intersect_key($this->options['mapping'], $mapping);
+
+ // Get the labels of the fields added to this display.
+ $field_labels = $this->display->handler->get_field_labels();
+
+ // Provide some default values.
+ $defaults = array(
+ '#type' => 'select',
+ '#required' => FALSE,
+ '#multiple' => FALSE,
+ );
+
+ // For each mapping, add a select element to the form.
+ foreach ($options as $key => $value) {
+ // If the field is optional, add a 'None' value to the top of the options.
+ $field_options = array();
+ $required = !empty($mapping[$key]['#required']);
+ if (!$required && empty($mapping[$key]['#multiple'])) {
+ $field_options = array('' => t('- None -'));
+ }
+ $field_options += $field_labels;
+
+ // Optionally filter the available fields.
+ if (isset($mapping[$key]['#filter'])) {
+ $this->view->init_handlers();
+ $this::$mapping[$key]['#filter']($field_options);
+ unset($mapping[$key]['#filter']);
+ }
+
+ // These values must always be set.
+ $overrides = array(
+ '#options' => $field_options,
+ '#default_value' => $options[$key],
+ );
+
+ // Optionally allow the select to be toggleable.
+ if (!empty($mapping[$key]['#toggle'])) {
+ $form['mapping']["toggle_$key"] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use a custom %field_name', array('%field_name' => strtolower($mapping[$key]['#title']))),
+ '#default_value' => $this->options['mapping']["toggle_$key"],
+ );
+ $overrides['#states']['visible'][':input[name="style_options[mapping][' . "toggle_$key" . ']"]'] = array('checked' => TRUE);
+ }
+
+ $form['mapping'][$key] = $overrides + $mapping[$key] + $defaults;
+ }
+ }
+
+ /**
+ * Overrides views_plugin_style::render().
+ *
+ * Provides the mapping definition as an available variable.
+ */
+ function render() {
+ return theme($this->theme_functions(), array(
+ 'view' => $this->view,
+ 'options' => $this->options,
+ 'rows' => $this->view->result,
+ 'mapping' => $this->define_mapping(),
+ ));
+ }
+
+}
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_summary_jump_menu.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_summary_jump_menu.inc
index 5b02163..a16a84b 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_summary_jump_menu.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_summary_jump_menu.inc
@@ -18,7 +18,9 @@ class views_plugin_style_summary_jump_menu extends views_plugin_style {
$options['count'] = array('default' => TRUE, 'bool' => TRUE);
$options['hide'] = array('default' => FALSE, 'bool' => TRUE);
$options['text'] = array('default' => 'Go', 'translatable' => TRUE);
+ $options['label'] = array('default' => '', 'translatable' => TRUE);
$options['choose'] = array('default' => '- Choose -', 'translatable' => TRUE);
+ $options['inline'] = array('default' => TRUE, 'bool' => TRUE);
$options['default_value'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
@@ -63,6 +65,13 @@ class views_plugin_style_summary_jump_menu extends views_plugin_style {
'#default_value' => $this->options['text'],
);
+ $form['label'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Selector label'),
+ '#default_value' => $this->options['label'],
+ '#description' => t('The text that will appear as the the label of the selector element. If blank no label tag will be used.'),
+ );
+
$form['choose'] = array(
'#type' => 'textfield',
'#title' => t('Choose text'),
@@ -70,6 +79,12 @@ class views_plugin_style_summary_jump_menu extends views_plugin_style {
'#description' => t('The text that will appear as the selected option in the jump menu.'),
);
+ $form['inline'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Set this field to display inline'),
+ '#default_value' => !empty($this->options['inline']),
+ );
+
$form['default_value'] = array(
'#type' => 'checkbox',
'#title' => t('Select the current contextual filter value'),
@@ -119,7 +134,9 @@ class views_plugin_style_summary_jump_menu extends views_plugin_style {
$settings = array(
'hide' => $this->options['hide'],
'button' => $this->options['text'],
+ 'title' => $this->options['label'],
'choose' => $this->options['choose'],
+ 'inline' => $this->options['inline'],
'default_value' => $default_value,
);
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_table.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_table.inc
index 98919ab..45ed976 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_table.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/plugins/views_plugin_style_table.inc
@@ -33,6 +33,7 @@ class views_plugin_style_table extends views_plugin_style {
$options['override'] = array('default' => TRUE, 'bool' => TRUE);
$options['sticky'] = array('default' => FALSE, 'bool' => TRUE);
$options['order'] = array('default' => 'asc');
+ $options['caption'] = array('default' => '', 'translatable' => TRUE);
$options['summary'] = array('default' => '', 'translatable' => TRUE);
$options['empty_table'] = array('default' => FALSE, 'bool' => TRUE);
@@ -179,10 +180,18 @@ class views_plugin_style_table extends views_plugin_style {
'#description' => t('(Sticky header effects will not be active for preview below, only on live output.)'),
);
+ $form['caption'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Short description of table'),
+ '#description' => t('Include a caption for better accessibility of your table.'),
+ '#default_value' => $this->options['caption'],
+ '#maxlength' => 255,
+ );
+
$form['summary'] = array(
'#type' => 'textfield',
'#title' => t('Table summary'),
- '#description' => t('This value will be displayed as table-summary attribute in the html. Set this for better accessiblity of your site.'),
+ '#description' => t('This value will be displayed as table-summary attribute in the html. Use this to give a summary of complex tables.'),
'#default_value' => $this->options['summary'],
'#maxlength' => 255,
);