From ee19aeefa6c7497ff0dfa64f525f3de397fbfd3d Mon Sep 17 00:00:00 2001
From: Earl Miles <merlin@logrus.com>
Date: Fri, 17 Apr 2009 19:16:26 +0000
Subject: [PATCH] Add "node" as a content type.
---
css/modal.css | 7 +-
ctools.module | 13 +
delegator/plugins/tasks/page.admin.inc | 2 +-
help/plugins-api.html | 14 +-
help/plugins-creating.html | 2 +-
includes/content.inc | 98 +++-
includes/context.inc | 151 ++++++
includes/wizard.inc | 8 +-
plugins/access/node_access.inc | 2 +-
plugins/access/node_language.inc | 2 +-
plugins/access/node_type.inc | 2 +-
plugins/access/perm.inc | 2 +-
plugins/access/role.inc | 2 +-
plugins/access/site_language.inc | 2 +-
plugins/access/term_vocabulary.inc | 2 +-
plugins/content_types/block/block.inc | 2 +-
plugins/content_types/custom/custom.inc | 1 +
plugins/content_types/node/icon_node.png | Bin 0 -> 460 bytes
plugins/content_types/node/node.inc | 213 ++++++++
plugins/contexts/node.inc | 28 +-
plugins/contexts/node_add_form.inc | 11 +
plugins/contexts/string.inc | 10 +-
plugins/contexts/term.inc | 20 +
.../content_types/icon_views_block_legacy.png | Bin 0 -> 599 bytes
.../plugins/content_types/icon_views_page.png | Bin 0 -> 716 bytes
.../content_types/icon_views_page_legacy.png | Bin 0 -> 587 bytes
views_content/plugins/content_types/views.inc | 474 ++++++++++++++++++
.../plugins/content_types/views_panes.inc | 403 +++++++++++++++
.../plugins/views/views_content.views.inc | 29 ++
...iews_content_plugin_display_panel_pane.inc | 349 +++++++++++++
views_content/views_content.admin.inc | 22 +
views_content/views_content.info | 7 +
views_content/views_content.module | 76 +++
33 files changed, 1922 insertions(+), 32 deletions(-)
create mode 100644 plugins/content_types/node/icon_node.png
create mode 100644 plugins/content_types/node/node.inc
create mode 100644 views_content/plugins/content_types/icon_views_block_legacy.png
create mode 100644 views_content/plugins/content_types/icon_views_page.png
create mode 100644 views_content/plugins/content_types/icon_views_page_legacy.png
create mode 100644 views_content/plugins/content_types/views.inc
create mode 100644 views_content/plugins/content_types/views_panes.inc
create mode 100644 views_content/plugins/views/views_content.views.inc
create mode 100644 views_content/plugins/views/views_content_plugin_display_panel_pane.inc
create mode 100644 views_content/views_content.admin.inc
create mode 100644 views_content/views_content.info
create mode 100644 views_content/views_content.module
diff --git a/css/modal.css b/css/modal.css
index 61cabacb..28294591 100644
--- a/css/modal.css
+++ b/css/modal.css
@@ -60,7 +60,7 @@ div.ctools-modal-content .modal-content .modal-throbber-wrapper img {
/** modal forms CSS **/
div.ctools-modal-content .form-item label {
- width: 8em;
+ width: 15em;
float: left;
}
@@ -91,7 +91,8 @@ div.ctools-modal-content .modal-form .form-checkboxes {
}
div.ctools-modal-content .resizable-textarea {
- width: 90%;
- margin-left: 8em;
+ width: auto;
+ margin-left: 15em;
+ margin-right: 5em;
}
diff --git a/ctools.module b/ctools.module
index cc5b13d1..8118feef 100644
--- a/ctools.module
+++ b/ctools.module
@@ -204,3 +204,16 @@ function ctools_break_phrase($str) {
return $object;
}
+
+/**
+ * A theme preprocess function to automatically allow panels-based node
+ * templates based upon input when the panel was configured.
+ */
+function ctools_preprocess_node(&$vars) {
+ // The 'panel_identifier' attribute of the node is added when the pane is
+ // rendered.
+ if (!empty($vars['node']->panel_identifier)) {
+ $vars['panel_identifier'] = check_plain($vars['node']->panel_identifier);
+ $vars['template_files'][] = 'node-panel-' . check_plain($vars['node']->panel_identifier);
+ }
+}
diff --git a/delegator/plugins/tasks/page.admin.inc b/delegator/plugins/tasks/page.admin.inc
index f60f0b8e..b63bcc73 100644
--- a/delegator/plugins/tasks/page.admin.inc
+++ b/delegator/plugins/tasks/page.admin.inc
@@ -1295,7 +1295,7 @@ function delegator_page_break_lock_subtask(&$form_state, $name) {
delegator_get_task('page');
$page = delegator_page_load($name);
- $form_state['task'] = delegator_get_task($task_name);
+ $form_state['task'] = delegator_get_task($page->task);
$form_state['name'] = $name;
ctools_include('object-cache');
diff --git a/help/plugins-api.html b/help/plugins-api.html
index 5f0fb917..41cf4fe3 100644
--- a/help/plugins-api.html
+++ b/help/plugins-api.html
@@ -2,7 +2,7 @@
APIs are a form of plugins that are tightly associated with a module. Instead of a module providing any number of plugins, each module provides only one file for an API and this file can contain hooks that the module should invoke.
Modules support this API by implementing hook_ctools_plugin_api($module, $api). If they support the API, they return a packet of data:
-
+<pre>
function mymodule_ctools_plugin_api($module, $api) {
if ($module == 'some module' && $api = 'some api') {
return array(
@@ -12,11 +12,13 @@ function mymodule_ctools_plugin_api($module, $api) {
);
}
}
+</pre>
This implementation must be in the .module file.
Modules utilizing this can invole ctools_plugin_api_include() in order to ensure all modules that support the API will have their files loaded as necessary. It's usually easiest to create a small helper function like this:
+<pre>
define('MYMODULE_MINIMUM_VERSION', 1);
define('MYMODULE_VERSION', 1);
@@ -24,14 +26,18 @@ function mymodule_include_api() {
ctools_include('plugins');
return ctools_plugin_api_include('mymodule', 'myapi', MYMODULE_MINIMUM_VERSION, MYMODULE_VERSION);
}
+</pre>
Using a define will ensure your use of version numbers is consistent and easy to update when you make API changes. You can then use the usual module_invoke type commands:
+<pre>
mymodule_include_api();
module_invoke('myhook', $data);
+</pre>
If you need to pass references, this construct is standard:
+<pre>
foreach (mymodule_include_api() as $module => $info) {
$function = $module . '_hookname';
// Just because they implement the API and include a file does not guarantee they implemented
@@ -42,4 +48,8 @@ foreach (mymodule_include_api() as $module => $info) {
// Typically array_merge() is used below if data is returned.
$result = $function($data1, $data2, $data3);
-}
\ No newline at end of file
+}
+</pre>
+
+TODO: There needs to be a way to check API version without including anything, as a module may simply
+provide normal plugins and versioning could still matter.
diff --git a/help/plugins-creating.html b/help/plugins-creating.html
index f4b94880..c5221e50 100644
--- a/help/plugins-creating.html
+++ b/help/plugins-creating.html
@@ -58,7 +58,7 @@ The following information can be specified:
<dt>cache</dt>
<dd>If set to TRUE, the results of ctools_get_plugins will be cached in the 'cache' table, thus preventing .inc files from being loaded. ctools_get_plugins looking for a specific plugin will always load the appropriate .inc file.</dd>
<dt>defaults</dt>
-<dd>An array of defaults that should be applied to each plugin; this can be used to ensure that every plugin has the basic data necessary. These defaults will not ovewrite data supplied by the plugin.</dd>
+<dd>An array of defaults that should be applied to each plugin; this can be used to ensure that every plugin has the basic data necessary. These defaults will not ovewrite data supplied by the plugin. This could also be a function name, in which case the callback will be used to provide defaults.</dd>
<dt>load themes</dt>
<dd>If set to TRUE, then plugins can be supplied by themes as well as modules. If this is the case, all themes that are currently enabled will provide a plugin: NOTE: Due to a slight UI bug in Drupal, it is possible for the default theme to be active but not enabled. If this is the case, that theme will NOT provide plugins, so if you are using this feature, be sure to document that issue. Also, themes set via $custom_theme do not necessarily need to be enabled, but the system has no way of knowing what those themes are, so the enabled flag is the only true method of identifying which themes can provide layouts.</dd>
<dt>hook</dt>
diff --git a/includes/content.inc b/includes/content.inc
index be810d71..56063b73 100644
--- a/includes/content.inc
+++ b/includes/content.inc
@@ -197,8 +197,10 @@ function ctools_content_get_subtype($type, $subtype_id) {
* Ensure minimal required settings on a content subtype exist.
*/
function ctools_content_prepare_subtype(&$subtype, $plugin) {
- if (empty($subtype['path'])) {
- $subtype['path'] = $plugin['path'];
+ foreach (array('path', 'js', 'css') as $key) {
+ if (!isset($subtype[$key]) && isset($plugin[$key])) {
+ $subtype[$key] = $plugin[$key];
+ }
}
}
@@ -236,7 +238,7 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
* - subtype: The content subtype. These two may be used together as
* module-delta for block style rendering.
*/
-function ctools_content_render($type, $subtype, $conf, $args = array(), $context = array(), $incoming_content = '') {
+function ctools_content_render($type, $subtype, $conf, $keywords = array(), $args = array(), $context = array(), $incoming_content = '') {
if (is_array($type)) {
$plugin = $type;
}
@@ -245,7 +247,21 @@ function ctools_content_render($type, $subtype, $conf, $args = array(), $context
}
if ($function = ctools_plugin_get_function($plugin, 'render callback')) {
- $content = $function($subtype, $conf, $args, $context, $incoming_content);
+ if (empty($subtype['all contexts'])) {
+ $pane_context = ctools_content_select_context($type, $subtype, $conf, $context);
+ // FALSE means rendering was forbidden.
+ if ($pane_context === FALSE) {
+ return FALSE;
+ }
+ }
+ else {
+ $pane_context = $context;
+ }
+
+ $content = $function($subtype, $conf, $args, $pane_context, $incoming_content);
+
+ // Set up some defaults and other massaging on the content before we hand
+ // it back to the caller.
if (!isset($content->type)) {
$content->type = $plugin['name'];
}
@@ -254,6 +270,36 @@ function ctools_content_render($type, $subtype, $conf, $args = array(), $context
$content->subtype = $subtype;
}
+ // Override the title if configured to
+ if (!empty($conf['override_title'])) {
+ // Give previous title as an available substitution here.
+ $keywords['%title'] = empty($content->title) ? '' : $content->title;
+ $content->title = $conf['override_title_text'];
+ }
+
+ if (!empty($content->title)) {
+ // Perform substitutions
+ if (!empty($keywords)) {
+ $content->title = strtr($content->title, $keywords);
+ }
+
+ // Sterilize the title
+ $content->title = filter_xss_admin($content->title);
+
+ // If a link is specified, populate.
+ if (!empty($content->title_link)) {
+ if (!is_array($content->title_link)) {
+ $url = array('href' => $content->title_link);
+ }
+ else {
+ $url = $content->title_link;
+ }
+ // set defaults so we don't bring up notices
+ $url += array('href' => '', 'attributes' => NULL, 'query' => NULL, 'fragment' => NULL, 'absolute' => NULL, 'html' => TRUE);
+ $content->title = l($content->title, $url['href'], $url);
+ }
+ }
+
return $content;
}
}
@@ -282,7 +328,17 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
}
if ($function = ctools_plugin_get_function($plugin, 'admin title')) {
- return $function($subtype, $conf, $context);
+ if (empty($subtype['all contexts'])) {
+ $pane_context = ctools_content_select_context($type, $subtype, $conf, $context);
+ // FALSE means rendering was forbidden.
+ if ($pane_context === FALSE) {
+ return FALSE;
+ }
+ }
+ else {
+ $pane_context = $context;
+ }
+ return $function($subtype, $conf, $pane_context);
}
else if (isset($plugin['admin title'])) {
return $plugin['admin title'];
@@ -426,10 +482,11 @@ function ctools_content_configure_form_defaults(&$form, &$form_state) {
* @return
* If this function returns false, no form exists.
*/
-function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype, &$conf, $step = NULL) {
+function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_name, $subtype, &$conf, $step = NULL) {
$form_state += array(
'plugin' => $plugin,
'subtype' => $subtype,
+ 'subtype_name' => $subtype_name,
'conf' => &$conf,
'op' => $op,
);
@@ -440,11 +497,11 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype, &
// Turn the forms defined in the plugin into the format the wizard needs.
if ($op == 'add' && isset($plugin['add form'])) {
- _ctools_content_create_add_form_info($form_info, $plugin['add form'], $plugin, $subtype, $op);
+ _ctools_content_create_form_info($form_info, $plugin['add form'], $plugin, $subtype, $op);
}
// Use the edit form for the add form if add form was completely left off.
else if (isset($plugin['edit form'])) {
- _ctools_content_create_add_form_info($form_info, $plugin['edit form'], $plugin, $subtype, $op);
+ _ctools_content_create_form_info($form_info, $plugin['edit form'], $plugin, $subtype, $op);
}
if (empty($form_info['order'])) {
@@ -456,9 +513,12 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype, &
}
-function _ctools_content_create_add_form_info(&$form_info, $info, $plugin, $subtype, $op) {
+function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype, $op) {
if (is_string($info)) {
- if ($op == 'add') {
+ if (empty($subtype['title'])) {
+ $title = t('Configure');
+ }
+ else if ($op == 'add') {
$title = t('Configure new !subtype_title', array('!subtype_title' => $subtype['title']));
}
else {
@@ -478,17 +538,29 @@ function _ctools_content_create_add_form_info(&$form_info, $info, $plugin, $subt
$form_info['forms'] = array();
$count = 0;
$base = 'step';
+ $wrapper = NULL;
foreach ($info as $form_id => $title) {
// @todo -- docs say %title can be used to sub for the admin title.
$step = $base . ++$count;
+ if (empty($wrapper)) {
+ $wrapper = $step;
+ }
+
+ if (is_array($title)) {
+ if (!empty($title['default'])) {
+ $wrapper = $step;
+ }
+ $title = $title['title'];
+ }
+
$form_info['order'][$step] = $title;
$form_info['forms'][$step] = array(
'title' => $title,
'form id' => $form_id,
);
- if ($count == 1) {
- $form_info['forms'][$step]['wrapper'] = 'ctools_content_configure_form_defaults';
- }
+ }
+ if ($wrapper) {
+ $form_info['forms'][$wrapper]['wrapper'] = 'ctools_content_configure_form_defaults';
}
}
}
diff --git a/includes/context.inc b/includes/context.inc
index 7eaf1eee..e5a05a51 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -255,6 +255,8 @@ function ctools_context_selector($contexts, $required, $default) {
function _ctools_context_selector($contexts, $required, $default, $num = 0) {
$filtered = ctools_context_filter($contexts, $required);
+ dsm($required);
+ dsm($filtered);
$count = count($filtered);
$form = array();
@@ -289,6 +291,155 @@ function _ctools_context_selector($contexts, $required, $default, $num = 0) {
}
}
+/**
+ * Create a select box to choose possible contexts.
+ *
+ * This only creates a selector if there is actually a choice; if there
+ * is only one possible context, that one is silently assigned.
+ *
+ * If an array of required contexts is provided, one selector will be
+ * provided for each context.
+ *
+ * @param $contexts
+ * A keyed array of all available contexts.
+ * @param $required
+ * The required context object or array of objects.
+ *
+ * @return
+ * A form element, or NULL if there are no contexts that satisfy the
+ * requirements.
+ */
+function ctools_context_converter_selector($contexts, $required, $default) {
+ if (is_array($required)) {
+ $result = array('#tree' => TRUE);
+ $count = 1;
+ foreach ($required as $id => $r) {
+ $result[] = _ctools_context_converter_selector($contexts, $r, isset($default[$id]) ? $default[$id] : '', $count++);
+ }
+ return $result;
+ }
+
+ return _ctools_context_converter_selector($contexts, $required, $default);
+}
+
+function _ctools_context_converter_selector($contexts, $required, $default, $num = 0) {
+ $filtered = ctools_context_filter($contexts, $required);
+ $count = count($filtered);
+
+ $form = array();
+
+ if ($count > 1) {
+ // If there's more than one to choose from, create a select widget.
+ $options = array();
+ foreach ($filtered as $cid => $context) {
+ if ($context->type == 'any') {
+ $options[''] = t('No context');
+ continue;
+ }
+ $key = $context->get_identifier();
+ if ($converters = ctools_context_get_converters($cid, $context)) {
+ $options[$key] = $converters;
+ }
+ }
+ if (empty($options)) {
+ return array(
+ '#type' => 'value',
+ '#value' => 'any',
+ );
+ }
+ if (!empty($required->title)) {
+ $title = $required->title;
+ }
+ else {
+ $title = $num ? t('Context %count', array('%count' => $num)) : t('Context');
+ }
+
+ return array(
+ '#type' => 'select',
+ '#options' => $options,
+ '#title' => $title,
+ '#description' => t('Please choose which context and how you would like it converted.'),
+ '#default_value' => $default,
+ );
+ }
+}
+
+/**
+ * Get a list of converters available for a given context.
+ */
+function ctools_context_get_converters($cid, $context) {
+ if (empty($context->plugin)) {
+ return;
+ }
+
+ return _ctools_context_get_converters($cid, $context->plugin);
+}
+
+/**
+ * Get a list of converters available for a given context.
+ */
+function _ctools_context_get_converters($id, $plugin_name) {
+ $plugin = ctools_get_context($plugin_name);
+ if (empty($plugin['convert list'])) {
+ return;
+ }
+
+ $converters = array();
+ if (is_array($plugin['convert list'])) {
+ $converters = $plugin['convert list'];
+ }
+ else if ($function = ctools_plugin_get_function($plugin, 'convert list')) {
+ $converters = (array) $function();
+ }
+
+ foreach (module_implements('ctools_context_convert_list') as $module) {
+ $function = $module . '_ctools_context_convert_list';
+ $function($plugin, $converters);
+ }
+
+ // Now, change them all to include the plugin:
+ $return = array();
+ foreach ($converters as $key => $title) {
+ $return[$id . '.' . $key] = $title;
+ }
+
+ natcasesort($return);
+ return $return;
+}
+
+/**
+ * Get a list of all contexts + converters available.
+ */
+function ctools_context_get_all_converters() {
+ $contexts = ctools_get_contexts();
+ $converters = array();
+ foreach ($contexts as $name => $context) {
+ $context_converters = _ctools_context_get_converters($name, $name);
+ if ($context_converters) {
+ $converters[$context['title']] = $context_converters;
+ }
+ }
+
+ return $converters;
+}
+
+/**
+ * Let the context convert an argument based upon the converter that was given.
+ */
+function ctools_context_convert_context($context, $converter) {
+ $value = $context->argument;
+ if ($function = ctools_plugin_load_function('ctools', 'contexts', $context->plugin, 'convert')) {
+ $value = $function($context, $converter);
+ }
+
+ foreach (module_implements('ctools_context_converter_alter') as $module) {
+ $function = $module . '_ctools_context_convert_list';
+ $function($context, $converter, $value);
+ }
+
+ return $value;
+}
+
/**
* Choose a context or contexts based upon the selection made via
* ctools_context_filter.
diff --git a/includes/wizard.inc b/includes/wizard.inc
index dcc84c25..d573e743 100644
--- a/includes/wizard.inc
+++ b/includes/wizard.inc
@@ -93,8 +93,12 @@ function ctools_wizard_multistep_form($form_info, $step, &$form_state) {
// Automatically use the modal tool if set to true.
if (!empty($form_state['modal'])) {
ctools_include('modal');
- $title = isset($form_state['title']) ? $form_state['title'] : $info['title'];
- $form_state['commands'][] = ctools_modal_command_display($title, $output);
+ if (empty($form_state['title'])) {
+ $form_state['title'] = $info['title'];
+ }
+
+ // This overwrites any previous commands.
+ $form_state['commands'] = ctools_modal_form_render($form_state, $output);
}
}
else {
diff --git a/plugins/access/node_access.inc b/plugins/access/node_access.inc
index 5de95c99..ecc2d10d 100644
--- a/plugins/access/node_access.inc
+++ b/plugins/access/node_access.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_node_access_ctools_access() {
$args['node_access'] = array(
diff --git a/plugins/access/node_language.inc b/plugins/access/node_language.inc
index f5b6a154..34b09a70 100644
--- a/plugins/access/node_language.inc
+++ b/plugins/access/node_language.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_node_language_ctools_access() {
if (module_exists('locale')) {
diff --git a/plugins/access/node_type.inc b/plugins/access/node_type.inc
index 0447abdc..5c7afdfe 100644
--- a/plugins/access/node_type.inc
+++ b/plugins/access/node_type.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_node_type_ctools_access() {
$args['node_type'] = array(
diff --git a/plugins/access/perm.inc b/plugins/access/perm.inc
index 8ecd2960..1a9c5119 100644
--- a/plugins/access/perm.inc
+++ b/plugins/access/perm.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_perm_ctools_access() {
$args['perm'] = array(
diff --git a/plugins/access/role.inc b/plugins/access/role.inc
index a689584e..cae2e565 100644
--- a/plugins/access/role.inc
+++ b/plugins/access/role.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_role_ctools_access() {
$args['role'] = array(
diff --git a/plugins/access/site_language.inc b/plugins/access/site_language.inc
index a97c31fc..c37bfe60 100644
--- a/plugins/access/site_language.inc
+++ b/plugins/access/site_language.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_site_language_ctools_access() {
if (module_exists('locale')) {
diff --git a/plugins/access/term_vocabulary.inc b/plugins/access/term_vocabulary.inc
index 1ec4798d..1ce60153 100644
--- a/plugins/access/term_vocabulary.inc
+++ b/plugins/access/term_vocabulary.inc
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of specially named hook_ctools_arguments().
+ * Implementation of specially named hook_ctools_access().
*/
function ctools_term_vocabulary_ctools_access() {
$args['term_vocabulary'] = array(
diff --git a/plugins/content_types/block/block.inc b/plugins/content_types/block/block.inc
index 595fe957..ef26057b 100644
--- a/plugins/content_types/block/block.inc
+++ b/plugins/content_types/block/block.inc
@@ -223,7 +223,7 @@ function ctools_block_content_type_admin_title($subtype, $conf) {
function ctools_block_content_type_admin_info($subtype, $conf) {
list($module, $delta) = explode('-', $subtype, 2);
$block = (object) module_invoke($module, 'block', 'view', $delta);
- if (!empty($block)) {
+ if (!empty($block) && !empty($block->subject)) {
$block->title = $block->subject;
return $block;
}
diff --git a/plugins/content_types/custom/custom.inc b/plugins/content_types/custom/custom.inc
index 6fe17eed..6401f5ff 100644
--- a/plugins/content_types/custom/custom.inc
+++ b/plugins/content_types/custom/custom.inc
@@ -27,6 +27,7 @@ function ctools_custom_ctools_content_types() {
'defaults' => array('title' => '', 'body' => '', 'format' => FILTER_FORMAT_DEFAULT),
// render callback is automatically deduced:
// 'render callback' => 'ctools_custom_content_type_render',
+ 'js' => array('misc/autocomplete.js', 'misc/textarea.js', 'misc/collapse.js'),
);
}
diff --git a/plugins/content_types/node/icon_node.png b/plugins/content_types/node/icon_node.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0417cb6515aa7fb2856c90722b386ed99bfc501
GIT binary patch
literal 460
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6yD0X`wFE+MINE`9S#t2456o^<}3
zj-i#Dir(tW_tssyv-H%p2QS{7I(h2a%eT+pe}4bz%ad1cEnR}A?LYhN=dY$Udly~(
zcH;T(jkkW}PF%M8!OyMteyqCr{ovzY|Ns978vk!K_g5e#R}$nG3>3i)7~V+8!~s>F
z^K@|xskoK&Ao2MF5fKqKrozHP$H>SAhNOh)j!aFDHZd?BIiRS_#db+SLGK)kfCJAQ
zqeTU>kA$3ffHDdi%#){0m?9#a#K57jfnf&sBX3Sa1{Q(l4Luqi?2o!UJvli+Tm$)4
z3=Ry8tOs@-j1d%!V{BkJBmmUGR=9zogZqi`CnIJS0S|@~)0;j>{+!9k)ZrMzp`^g{
zWb=lCjZ7>85e%#3G!7i+5^!)}RE&#@t221;=y4h|P`{c&LV^GTQ(9VBm>F9G12cn9
XiE#1KH6NpaK4b87^>bP0l+XkKLQcLN
literal 0
HcmV?d00001
diff --git a/plugins/content_types/node/node.inc b/plugins/content_types/node/node.inc
new file mode 100644
index 00000000..8a364ebf
--- /dev/null
+++ b/plugins/content_types/node/node.inc
@@ -0,0 +1,213 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Plugin to handle the 'node' content type which allows individual nodes
+ * to be embedded into a panel.
+ */
+
+/**
+ * Implementation of hook_panels_content_types()
+ */
+function ctools_node_ctools_content_types() {
+ return array(
+ 'title' => t('Node'),
+ 'single' => TRUE,
+ 'defaults' => array(
+ 'nid' => '',
+ 'teaser' => TRUE,
+ 'links' => TRUE,
+ 'leave_node_title' => FALSE,
+ 'identifier' => '',
+ ),
+ 'title' => t('Add a node'),
+ 'icon' => 'icon_node.png',
+ 'description' => t('Add a node from your site as content.'),
+ 'category' => t('Custom'),
+ 'top level' => TRUE,
+ 'js' => array('misc/autocomplete.js'),
+ );
+}
+
+/**
+ * Output function for the 'node' content type.
+ *
+ * Outputs a node based on the module and delta supplied in the configuration.
+ */
+function ctools_node_content_type_render($subtype, $conf, $panel_args) {
+ $nid = $conf['nid'];
+ $block = new stdClass();
+
+ foreach (explode('/', $_GET['q']) as $id => $arg) {
+ $nid = str_replace("%$id", $arg, $nid);
+ }
+
+ foreach ($panel_args as $id => $arg) {
+ $nid = str_replace("@$id", $arg, $nid);
+ }
+
+ // Support node translation
+ if (module_exists('translation')) {
+ if ($translations = module_invoke('translation', 'node_get_translations', $nid)) {
+ if ($translations[$GLOBALS['language']->language]) {
+ $nid = $translations[$GLOBALS['language']->language]->nid;
+ }
+ }
+ }
+
+ if (!is_numeric($nid)) {
+ return;
+ }
+
+ $node = node_load($nid);
+ if (!node_access('view', $node)) {
+ return;
+ }
+
+ if (node_access('update', $node)) {
+ $block->admin_links['update'] = array(
+ 'title' => t('Edit node'),
+ 'alt' => t("Edit this node"),
+ 'href' => "node/$node->nid/edit",
+ 'query' => drupal_get_destination(),
+ );
+ }
+
+ $block->module = 'node';
+ $block->delta = $node->nid;
+
+ $block->title = $node->title;
+
+ if (empty($conf['leave_node_title'])) {
+ $node->title = NULL;
+ }
+ if (!empty($conf['identifier'])) {
+ $node->panel_identifier = $conf['identifier'];
+ }
+
+ $block->content = node_view($node, $conf['teaser'], FALSE, $conf['links']);
+ return $block;
+}
+
+/**
+ * The form to add or edit a node as content.
+ */
+function ctools_node_content_type_edit_form(&$form, &$form_state) {
+ $conf = $form_state['conf'];
+
+ if ($form_state['op'] == 'add') {
+ $form['nid'] = array(
+ '#prefix' => '<div class="no-float">',
+ '#title' => t('Enter the title or NID of a post'),
+ '#description' => t('To use a NID from the URL, you may use %0, %1, ..., %N to get URL arguments. Or use @0, @1, @2, ..., @N to use arguments passed into the panel.'),
+ '#type' => 'textfield',
+ '#maxlength' => 512,
+ '#autocomplete_path' => 'ctools/autocomplete/node',
+ '#weight' => -10,
+ '#suffix' => '</div>',
+ );
+ }
+ else {
+ $form['nid'] = array(
+ '#type' => 'value',
+ '#value' => $conf['nid'],
+ );
+ }
+
+ $form['teaser'] = array(
+ '#title' => t('Teaser'),
+ '#type' => 'checkbox',
+ '#default_value' => $conf['teaser'],
+ '#description' => t('Check here to show only the node teaser'),
+ );
+
+ $form['links'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['links'],
+ '#title' => t('Display links'),
+ '#description' => t('Check here to display the links with the post.'),
+ );
+
+ $form['leave_node_title'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['leave_node_title'],
+ '#title' => t('Leave node title'),
+ '#description' => t('Advanced: if checked, do not touch the node title; this can cause the node title to appear twice unless your theme is aware of this.'),
+ );
+
+ $form['identifier'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['identifier'],
+ '#title' => t('Identifier'),
+ '#description' => t('Whatever is placed here will appear in $node->panel_identifier in the node template to make it easier to theme a node or part of a node as necessary. This identifier will automatically be added as a node template suggestion: node-panel-IDENTIFIER.tpl.php'),
+ );
+
+}
+
+/**
+ * Validate the node selection.
+ */
+function ctools_node_content_type_edit_form_validate(&$form, &$form_state) {
+ if ($form_state['op'] != 'add') {
+ return;
+ }
+
+ $nid = $form_state['values']['nid'];
+ $preg_matches = array();
+ $match = preg_match('/\[nid: (\d+)\]/', $nid, $preg_matches);
+ if (!$match) {
+ $match = preg_match('/^nid: (\d+)/', $nid, $preg_matches);
+ }
+
+ if ($match) {
+ $nid = $preg_matches[1];
+ }
+ if (is_numeric($nid)) {
+ $node = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n WHERE n.nid = %d"), $nid));
+ }
+ else {
+ $node = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n WHERE LOWER(n.title) = LOWER('%s')"), $nid));
+ }
+ if ($node) {
+ $form_state['values']['nid'] = $node->nid;
+ }
+
+ if (!($node || preg_match('/^[@%]\d+$/', $nid))) {
+ form_error($form['nid'], t('Invalid node'));
+ }
+}
+
+/**
+ * Validate the node selection.
+ */
+function ctools_node_content_type_edit_form_submit(&$form, &$form_state) {
+ foreach (array('nid', 'teaser', 'links', 'leave_node_title', 'identifier') as $key) {
+ $form_state['conf'][$key] = $form_state['values'][$key];
+ }
+}
+
+/**
+ * Returns the administrative title for a node.
+ */
+function ctools_node_content_type_admin_title($subtype, $conf) {
+ if (!is_numeric($conf['nid'])) {
+ return t('Node loaded from @var', array('@var' => $conf['nid']));
+ }
+
+ $node = node_load($conf['nid']);
+ if ($node) {
+ return check_plain($node->title);
+ }
+ else {
+ return t('Deleted/missing node @nid', array('@nid' => $conf['nid']));
+ }
+}
+
+/**
+ * Display the administrative information for a node pane.
+ */
+function ctools_node_content_type_admin_info($subtype, $conf) {
+ // Just render the node.
+ return ctools_node_content_type_render($subtype, $conf, array());
+}
diff --git a/plugins/contexts/node.inc b/plugins/contexts/node.inc
index 5238676d..6a4a1a70 100644
--- a/plugins/contexts/node.inc
+++ b/plugins/contexts/node.inc
@@ -21,6 +21,8 @@ function ctools_node_ctools_contexts() {
'settings form submit' => 'ctools_context_node_settings_form_submit',
'keyword' => 'node',
'context name' => 'node',
+ 'convert list' => 'ctools_context_node_convert_list',
+ 'convert' => 'ctools_context_node_convert',
);
return $args;
}
@@ -31,7 +33,7 @@ function ctools_node_ctools_contexts() {
*/
function ctools_context_create_node($empty, $data = NULL, $conf = FALSE) {
$types = array('node');
- // FIXME this is broken when called from ctools_page's render process, through ctools_context_load_contexts(); it passes in $conf as TRUE.
+
if (!empty($conf['types'])) {
foreach ($conf['types'] as $type) {
if ($type) {
@@ -174,3 +176,27 @@ function ctools_context_node_settings_form_submit($form, &$form_values, &$form_s
unset($form_values['set_identifier']);
}
+/**
+ * Provide a list of ways that this context can be converted to a string.
+ */
+function ctools_context_node_convert_list() {
+ return array(
+ 'nid' => t('Node ID'),
+ 'title' => t('Node title'),
+ 'uid' => t('Author UID'),
+ );
+}
+
+/**
+ * Convert a context into a string.
+ */
+function ctools_context_node_convert($context, $type) {
+ switch ($type) {
+ case 'nid':
+ return $context->data->nid;
+ case 'title':
+ return $context->data->title;
+ case 'uid':
+ return $context->data->uid;
+ }
+}
diff --git a/plugins/contexts/node_add_form.inc b/plugins/contexts/node_add_form.inc
index f30e724b..54bcb534 100644
--- a/plugins/contexts/node_add_form.inc
+++ b/plugins/contexts/node_add_form.inc
@@ -18,6 +18,8 @@ function ctools_node_add_form_ctools_contexts() {
'settings form' => 'ctools_context_node_add_form_settings_form',
'keyword' => 'node_add',
'context name' => 'node_add_form',
+ 'convert list' => array('type' => t('Node type')),
+ 'convert' => 'ctools_context_node_add_form_convert',
);
return $args;
}
@@ -93,3 +95,12 @@ function ctools_context_node_add_form_settings_form($conf, $external = FALSE) {
return $form;
}
+/**
+ * Convert a context into a string.
+ */
+function ctools_context_node_add_form_convert($context, $type) {
+ switch ($type) {
+ case 'type':
+ return $context->data;
+ }
+}
diff --git a/plugins/contexts/string.inc b/plugins/contexts/string.inc
index d07abfcb..e33f7391 100644
--- a/plugins/contexts/string.inc
+++ b/plugins/contexts/string.inc
@@ -1,7 +1,6 @@
<?php
// $Id$
-
/**
* @file
*
@@ -19,6 +18,8 @@ function ctools_string_ctools_contexts() {
'keyword' => 'string',
'no ui' => TRUE,
'context name' => 'string',
+ 'convert list' => array('raw' => t('Raw string')),
+ 'convert' => 'ctools_context_string_convert',
);
return $args;
}
@@ -43,3 +44,10 @@ function ctools_context_create_string($empty, $data = NULL, $conf = FALSE) {
return $context;
}
}
+
+/**
+ * Convert a context into a string.
+ */
+function ctools_context_string_convert($context, $type) {
+ return $context->data;
+}
diff --git a/plugins/contexts/term.inc b/plugins/contexts/term.inc
index 8b174e74..dd1c6994 100644
--- a/plugins/contexts/term.inc
+++ b/plugins/contexts/term.inc
@@ -20,6 +20,12 @@ function ctools_term_ctools_contexts() {
'keyword' => 'term',
'no ui' => TRUE,
'context name' => 'term',
+ 'convert list' => array(
+ 'id' => t('Term ID'),
+ 'name' => t('Term name'),
+ 'vid' => t('Vocabulary ID'),
+ ),
+ 'convert' => 'ctools_context_term_convert',
);
return $args;
}
@@ -47,3 +53,17 @@ function ctools_context_create_term($empty, $data = NULL, $conf = FALSE) {
return $context;
}
}
+
+/**
+ * Convert a context into a string.
+ */
+function ctools_context_term_convert($context, $type) {
+ switch ($type) {
+ case 'tid':
+ return $context->data->tid;
+ case 'name':
+ return $context->data->name;
+ case 'vid':
+ return $context->data->vid;
+ }
+}
diff --git a/views_content/plugins/content_types/icon_views_block_legacy.png b/views_content/plugins/content_types/icon_views_block_legacy.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2e07474a358847696d4525c1e94696fd1907559
GIT binary patch
literal 599
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6y71AIbU-+%d_V`c1;8hGOORdx@F
zroG(<e_i<h|NpeJbDw{HnY*m&?f*|+b<siHiQj&G+x_#*)*r_<{y6G7DRSwxRr8*1
zT77T5Ww6Vv=j)a{+Pdz}rd8kf`Si#7_a;1f`)uKpO>%MiswrlR?rdbxW#~IQzw6kn
z((P?h(b|jdZt`xA=JA!?{r-e#sG3T=v2%0C@@G5F|G&56)A7|$cRl<0T0PZ#_NA4}
zA8Z3UrXglRB+$X;B|(0{KrR`8K_GH&H_(W$o-U3d6}OTMgr|x;dyv4&q$eh(XKdWS
zkR;H`EwNeS<>wiUECS6c*2WSWG&il-uyONe1|Z+S!@+xQuW$79`Sa)Zb1F1QSlpQD
zYZ4K`b2H)#3k%E784OGuDhF~FoK#xBhV6;>M?;_?%-Yt*($e<a+}*1dESMrPU&4XG
zaD!0;i%7%_g$6-|h6bjb9HUEaIzBuJ2RH;A92n!`^78Uz)dbi(7@0a6yBn{ExXqd^
zt;QhWpuos!DX6G8g8^tn!N*3HBM+Gv7>^t{dQwwSiBB*gB_)A{LxIg$&QD>&)Yh9!
p0uDTBX*M=KK1oSE0Sp2O3}uIS?0i-H+<^hW;OXk;vd$@?2>>9!3+Mm<
literal 0
HcmV?d00001
diff --git a/views_content/plugins/content_types/icon_views_page.png b/views_content/plugins/content_types/icon_views_page.png
new file mode 100644
index 0000000000000000000000000000000000000000..27efe7c13a4ba5eb9c8c98d1610c71408a77abae
GIT binary patch
literal 716
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6z61AIbUpMQSoRTr&eWo+bZHR;=$
zjX#cV{c%iAPi@_uO{?#%UwUoTgEx<Me>oMkG}nJZ!j#KPqo-xA|8|(uOG+e6)wMfZ
zDn@7Xw<8O`ZlCygS<CquQ*SK0_V)UMw_D~t*{GOcsF!cg=P%!JdA4J75U-zH+PaG1
z>8a_ftNf=WNknSSzqP*daPNVi=QXpfb@S{}mXta)2gxTI<Zo$`Pd1QC)L-^_*ZkL;
zS3KL<a%^hriD@TKo|^k|<D6S-C8M=w-B_((=pY@dGw0hDb`ObF-}kws2EPCD;mO-)
z-+q0Yc6P31u*;%vJ9hs()3moccUjem-&YU*y72%1f1tnbwR4sOslbvTzhIyURRKfB
zn-vEc7#Nv6T^vIyZY524_T)iP`FA!Zd3pKo4GawoNe{lbGrhB8WMDjU;Ng32wmO9e
zj}LPQIPk>$+h-ulRK&IK98l`PJO0ULmrF~&l(KOsY+&ek{q*SbjQlsxcz_D;{oAK7
zPkeT3<HD&uv)LUO3@dj3_>~#`xw=zx<t8i3os|qM0s#m7gU`DijtO(Wbn^1#gUkvI
z4oo)N%KAQK{aTj52z14VLPjY?)mIv8n4VZ07%;O4cpT{V4Y(WV!F{5<AQfmSo4ok~
zhSiHUO>9}t%*|~s?7+~-8Zp<$rQ)b;1CyQ)10#z_L2^Pu0V{K!xOW-Q!~_<m^mKlO
igtWAzq;fV61BQL!=4&?0oV^hk)C``kelF{r5}E)?@L=x%
literal 0
HcmV?d00001
diff --git a/views_content/plugins/content_types/icon_views_page_legacy.png b/views_content/plugins/content_types/icon_views_page_legacy.png
new file mode 100644
index 0000000000000000000000000000000000000000..31173353471a442a55937d9ca37db8861c953777
GIT binary patch
literal 587
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6zI1AIbU-+%dV@Ye+$D`S_`!2kdM
zpZI+>cUe`_-tOH$&rCZzm)%3++plk4b<vi=F3&%|-1_6#(rc^M-PyG9$I&NmpRK;P
ze%a?;`CFQ%TwWSIEpyh5)h)-SN=9q(`OBv)DZTdgx_qL6Zl0Z9zWu82`=;JlCLOCI
z6{FL7Vw!%TgKKyAfuHBse>=S5*-l<Rx%s!&D<&BFPe_<^Ywd!!TjUb;{ih|(eYvsY
z^6cGTPDw;+0^KID*>@e#*_I_ie!)O4S%AT6O{xRXkcXZwjv*Ddk|qcXiadCd!p>x7
zX6DDu-N29}km$%XCr6Bd@rc5SLtJb<3I~oIV-|4WVbWP+AS+a5wB`&@>cB~+$=AXj
zJW5Js<51YZ&~f_U!t+a$j-2HIDtx1}MnR5!|ExVTIu*_J9T*HZ7;iAjlIkcnaApv8
zU|?jGC{0~@cIgbs0}Y%C4Gv6clU~Jiol)QuU}h0umS(=dks7KugTaBJk;UT2)}Dt<
zAnT6tiU=58ZRBKN5r}Z`@C;#AIdJ620TuxV2gW=*JG;ch8M+{4%q(Zl?AhZJz#x#o
ZaAXUY$mv_E_CU`vc)I$ztaD0e0sv5#3!VS~
literal 0
HcmV?d00001
diff --git a/views_content/plugins/content_types/views.inc b/views_content/plugins/content_types/views.inc
new file mode 100644
index 00000000..04522dd4
--- /dev/null
+++ b/views_content/plugins/content_types/views.inc
@@ -0,0 +1,474 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Content type plugin to expose all views as content.
+ */
+
+/**
+ * Implementation of hook_ctools_content_types()
+ */
+function views_content_views_ctools_content_types() {
+ if (!variable_get('ctools_content_all_views', TRUE)) {
+ return;
+ }
+
+ return array(
+ 'title' => t('All views'),
+ 'defaults' => array(
+ 'nodes_per_page' => 10,
+ 'pager_id' => 1,
+ 'use_pager' => FALSE,
+ 'offset' => 0,
+ 'more_link' => FALSE,
+ 'feed_icons' => FALSE,
+ 'panel_args' => FALSE,
+ 'link_to_view' => FALSE,
+ 'args' => '',
+ 'url' => '',
+ ),
+ 'add form' => array(
+ 'views_content_views_select_display' => t('Select display'),
+ 'views_content_views_content_type_edit_form' => array(
+ 'default' => TRUE, // put wrapper here, not on the previous form.
+ 'title' => t('Configure view'),
+ ),
+ ),
+ 'all contexts' => TRUE,
+ );
+}
+
+/**
+ * Return all content types available.
+ */
+function views_content_views_content_type_content_types($plugin) {
+ $types = array();
+ // It can be fairly intensive to calculate this, so let's cache this in the
+ // cache_views table. The nice thing there is that if views ever change, that
+ // table will always be cleared. Except for the occasional default view, so
+ // we must use the Views caching functions in order to respect Views caching
+ // settings.
+ views_include('cache');
+ $data = views_cache_get('views_content_all', TRUE);
+ if (!empty($data->data)) {
+ $types = $data->data;
+ }
+
+ if (empty($types)) {
+ $views = views_get_all_views();
+
+ foreach ($views as $view) {
+ $types[$view->name] = _views_content_views_content_type($view);
+ }
+
+ views_cache_set('views_content_all', $types, TRUE);
+ }
+
+ return $types;
+}
+
+/**
+ * Return a single content type.
+ */
+function views_content_views_content_type_content_type($subtype, $plugin) {
+ $view = views_get_view($name);
+ if (empty($view)) {
+ return;
+ }
+
+ return _views_content_views_content_type($view);
+}
+
+/**
+ * Create the content type info array to give back to ctools for a given display.
+ */
+function _views_content_views_content_type($view) {
+ $title = $view->name;
+
+ $icon = 'icon_views_page_legacy.png';
+
+ return array(
+ 'view' => $view->name,
+ 'title' => $title,
+ 'icon' => $icon,
+ 'description' => filter_xss_admin($view->description),
+// 'required context' => $contexts,
+ 'category' => t('Views'),
+ );
+
+}
+
+/**
+ * Output function for the 'views' content type.
+ *
+ * Outputs a view based on the module and delta supplied in the configuration.
+ */
+function views_content_views_content_type_render($subtype, $conf, $panel_args, $contexts) {
+ if (!is_array($contexts)) {
+ $contexts = array($contexts);
+ }
+
+ if (strpos($subtype, '-')) {
+ list($name, $display) = explode('-', $subtype);
+ $view = views_get_view($name);
+ }
+ else {
+ $view = views_get_view($subtype);
+ $display = $conf['display'];
+ }
+
+ if (empty($view)) {
+ return;
+ }
+
+ $view->set_display($display);
+ if (!$view->display_handler->access($GLOBALS['user'])) {
+ return;
+ }
+
+ $arguments = explode('/', $_GET['q']);
+ $args = $conf['args'];
+
+ foreach ($arguments as $id => $arg) {
+ $args = str_replace("%$id", $arg, $args);
+ }
+
+ foreach ($panel_args as $id => $arg) {
+ $args = str_replace("@$id", $arg, $args);
+ }
+
+ $args = preg_replace(',/?(%\d|@\d),', '', $args);
+ $args = $args ? explode('/', $args) : array();
+
+ if ($conf['panel_args'] && is_array($panel_args)) {
+ $args = array_merge($panel_args, $args);
+ }
+
+ if (isset($conf['context']) && is_array($conf['context'])) {
+ foreach ($conf['context'] as $count => $context_info) {
+ if (!strpos($context_info, '.')) {
+ // old skool: support pre-converter contexts as well.
+ $cid = $context_info;
+ $converter = '';
+ }
+ else {
+ list($cid, $converter) = explode('.', $context_info, 2);
+ }
+ if (!empty($contexts[$cid])) {
+ $arg = ctools_context_convert_context($contexts[$cid], $converter);
+ array_splice($args, $count, 0, array($arg));
+ }
+ }
+ }
+
+ $view->set_arguments($args);
+
+ if ($conf['url']) {
+ $display_id = $view->display_handler->get_link_display();
+ if ($display_id) {
+ $view->display[$display_id]->handler->set_option('path', $conf['url']);
+ }
+ else {
+ $view->display_handler->set_option('path', $conf['url']);
+ }
+ }
+
+ $block = new stdClass();
+ $block->module = 'views';
+ $block->delta = $view->name .'-'. $display;
+
+ if (!empty($conf['link_to_view'])) {
+ $block->title_link = $view->get_url();
+ }
+
+ if (!empty($conf['more_link'])) {
+ $block->more = array('href' => $view->get_url());
+ $view->display_handler->set_option('use_more', FALSE);
+ }
+ $view->display_handler->set_option('use_pager', $conf['use_pager']);
+ $view->display_handler->set_option('pager_element', $conf['pager_id']);
+ $view->display_handler->set_option('items_per_page', $conf['nodes_per_page']);
+ $view->display_handler->set_option('offset', $conf['offset']);
+
+ $stored_feeds = drupal_add_feed();
+ $block->content = $view->preview();
+
+ $block->title = $view->get_title();
+
+ if (!empty($conf['feed_icons'])) {
+ $new_feeds = drupal_add_feed();
+ if ($diff = array_diff(array_keys($new_feeds), array_keys($stored_feeds))) {
+ foreach ($diff as $url) {
+ $block->feeds[$url] = $new_feeds[$url];
+ }
+ }
+ }
+
+ $view->destroy();
+ return $block;
+}
+
+/**
+ * Returns an edit form for a block.
+ */
+function views_content_views_select_display(&$form, &$form_state) {
+ $view = views_get_view($form_state['subtype_name']);
+ if (empty($view)) {
+ return;
+ }
+
+ $displays = array();
+ foreach ($view->display as $id => $display) {
+ $displays[$id] = $display->display_title;
+ }
+
+ $form['display'] = array(
+ '#type' => 'select',
+ '#title' => t('Display'),
+ '#options' => $displays,
+ '#description' => t('Choose which display of this view you wish to use.')
+ );
+}
+
+/**
+ * Submit the basic view edit form.
+ *
+ * This just dumps everything into the $conf array.
+ */
+function views_content_views_select_display_submit(&$form, &$form_state) {
+ $form_state['conf']['display'] = $form_state['values']['display'];
+}
+
+/**
+ * Returns an edit form for a block.
+ */
+function views_content_views_content_type_edit_form(&$form, &$form_state) {
+ $conf = $form_state['conf'];
+ // This allows older content to continue to work, where we used to embed
+ // the display directly.
+ if (strpos($form_state['subtype_name'], '-')) {
+ list($name, $conf['display']) = explode('-', $form_state['subtype_name']);
+ $view = views_get_view($name);
+ }
+ else {
+ $view = views_get_view($form_state['subtype_name']);
+ }
+
+ if (empty($view)) {
+ $form['markup'] = array('#value' => t('Broken/missing/deleted view.'));
+ return;
+ }
+
+ $view->set_display($conf['display']);
+
+ $form_state['title'] = t('Configure view @view (@display)', array('@view' => $view->name, '@display' => $view->display[$conf['display']]->display_title));
+
+ // @todo
+ // If using the older format, just a context is listed. We should go through
+ // and check for that and forcibly set them to the right converter so that
+ // it doesn't get changed to some whacky default. Oooor just let it get changed
+ // to 'no context', I suppose.
+
+ $required = array();
+ if (isset($view->display_handler) && $arguments = $view->display_handler->get_handlers('argument')) {
+ foreach ($arguments as $arg) {
+ $required[] = new ctools_context_optional($arg->ui_name(), 'any');
+ }
+ }
+
+ if ($required) {
+ $form['context'] = ctools_context_converter_selector($form_state['contexts'], $required, isset($conf['context']) ? $conf['context'] : array());
+ }
+
+ $form['link_to_view'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['link_to_view'],
+ '#title' => t('Link title to view'),
+ '#description' => t('If checked, the title will be a link to the view.'),
+ );
+
+ $form['more_link'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['more_link'],
+ '#title' => t('Provide a "more" link that links to the view'),
+ '#description' => t('This is independent of any more link that may be provided by the view itself; if you see two more links, turn this one off. Views will only provide a more link if using the "block" type, however, so if using embed, use this one.'),
+ );
+
+ $form['feed_icons'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['feed_icons'],
+ '#title' => t('Display feed icons'),
+ '#description' => t('If checked, any feed icons provided by this view will be displayed.'),
+ );
+
+ $form['pager_aligner_start'] = array(
+ '#value' => '<div class="option-text-aligner">',
+ );
+ $form['use_pager'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use pager'),
+ '#default_value' => $conf['use_pager'],
+ '#id' => 'use-pager-checkbox',
+ );
+ $form['pager_id'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['pager_id'],
+ '#title' => t('Pager ID'),
+ '#size' => 4,
+ '#id' => 'use-pager-textfield',
+ );
+ $form['pager_aligner_stop'] = array(
+ '#value' => '</div><div style="clear: both; padding: 0; margin: 0"></div>',
+ );
+
+ $form['nodes_per_page'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['nodes_per_page'],
+ '#title' => t('Num posts'),
+ '#size' => 4,
+ '#description' => t('Select the number of posts to display, or 0 to display all results.'),
+ );
+
+ $form['offset'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['offset'],
+ '#title' => t('Offset'),
+ '#size' => 4,
+ '#description' => t('Offset in the node list or 0 to start at 1st item.'),
+ );
+
+ $form['panel_args'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Send arguments'),
+ '#default_value' => $conf['panel_args'],
+ '#description' => t('Select this to send all arguments from the panel directly to the view. If checked, the panel arguments will come after any context arguments above and precede any additional arguments passed in through the Arguments field below.'),
+ );
+
+ $form['args'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['args'],
+ '#title' => t('Arguments'),
+ '#size' => 30,
+ '#description' => t('Additional arguments to send to the view as if they were part of the URL in the form of arg1/arg2/arg3. You may use %0, %1, ..., %N to grab arguments from the URL. Or use @0, @1, @2, ..., @N to use arguments passed into the panel.'),
+ );
+
+ $form['url'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['url'],
+ '#title' => t('Override URL'),
+ '#size' => 30,
+ '#description' => t('If this is set, override the View URL; this can sometimes be useful to set to the panel URL'),
+ );
+
+ $view->destroy();
+ return $form;
+}
+
+/**
+ * Store form values in $conf.
+ */
+function views_content_views_content_type_edit_form_submit(&$form, &$form_state) {
+ // Copy everything from our defaults.
+ foreach (array_keys($form_state['plugin']['defaults']) as $key) {
+ $form_state['conf'][$key] = $form_state['values'][$key];
+ }
+}
+
+/**
+ * Returns the administrative title for a type.
+ */
+function views_content_views_content_type_admin_title($subtype, $conf) {
+ if (strpos($subtype, '-')) {
+ list($name, $display) = explode('-', $subtype);
+ $view = views_get_view($name);
+ }
+ else {
+ $view = views_get_view($subtype);
+ }
+
+ if (empty($view)) {
+ return t('Deleted/missing view @view', array('@view' => $name));
+ }
+ return t('View: @name', array('@name' => $view->name));
+}
+
+/**
+ * Returns the administrative title for a type.
+ */
+function views_content_views_content_type_admin_info($subtype, $conf, $contexts) {
+ if (strpos($subtype, '-')) {
+ list($name, $conf['display']) = explode('-', $subtype);
+ $view = views_get_view($name);
+ }
+ else {
+ $view = views_get_view($subtype);
+ }
+
+ if (empty($view)) {
+ return t('Deleted/missing view @view', array('@view' => $name));
+ }
+
+ $view->set_display($conf['display']);
+ $block->title = t('View information');
+
+ $block->content = '<ul>';
+ $block->content .= '<li>' . t('Using display @display.', array('@display' => $view->display[$conf['display']]->display_title)) . '</li>';
+
+ if (!empty($conf['context']) && $arguments = $view->display_handler->get_handlers('argument')) {
+ $argument = reset($arguments);
+ foreach ($conf['context'] as $count => $context_info) {
+ if (!$argument) {
+ break;
+ }
+
+ if (!strpos($context_info, '.')) {
+ // old skool: support pre-converter contexts as well.
+ $cid = $context_info;
+ $converter = '';
+ }
+ else {
+ list($cid, $converter) = explode('.', $context_info, 2);
+ }
+
+ if (!empty($contexts[$cid])) {
+ $converters = ctools_context_get_converters($cid, $contexts[$cid]);
+ $converter = !empty($converters[$context_info]) ? $converters[$context_info] : t('Default');
+ $block->content .= '<li>' . t('Argument @arg using context @context converted into @converter', array(
+ '@arg' => $argument->ui_name(), '@context' => $contexts[$cid]->get_identifier(),
+ '@converter' => $converter)) . '</li>';
+ }
+ $argument = next($arguments);
+ }
+ }
+
+ $block->content .= '<li>' . t('@count items displayed.', array('@count' => $conf['nodes_per_page'])) . '</li>';
+ if ($conf['use_pager']) {
+ $block->content .= '<li>' . t('With pager.') . '</li>';
+ }
+ else {
+ $block->content .= '<li>' . t('Without pager.') . '</li>';
+ }
+
+ if ($conf['offset']) {
+ $block->content .= '<li>' . t('Skipping first @count results', array('@count' => $conf['offset'])) . '</li>';
+ }
+ if ($conf['more_link']) {
+ $block->content .= '<li>' . t('With more link.') . '</li>';
+ }
+ if ($conf['feed_icons']) {
+ $block->content .= '<li>' . t('With feed icon.') . '</li>';
+ }
+ if ($conf['panel_args']) {
+ $block->content .= '<li>' . t('Sending arguments.') . '</li>';
+ }
+ if ($conf['args']) {
+ $block->content .= '<li>' . t('Using arguments: @args', array('@args' => $conf['args'])) . '</li>';
+ }
+ if ($conf['url']) {
+ $block->content .= '<li>' . t('Using url: @url', array('@url' => $conf['url'])) . '</li>';
+ }
+
+ $view->destroy();
+ return $block;
+}
diff --git a/views_content/plugins/content_types/views_panes.inc b/views_content/plugins/content_types/views_panes.inc
new file mode 100644
index 00000000..c6b8225d
--- /dev/null
+++ b/views_content/plugins/content_types/views_panes.inc
@@ -0,0 +1,403 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Content type plugin to allow Views to be exposed as a display type,
+ * leaving most of the configuration on the view.
+ */
+
+/**
+ * Implementation of hook_ctools_content_types()
+ */
+function views_content_views_panes_ctools_content_types() {
+ return array(
+ 'title' => t('View panes'),
+ );
+}
+
+/**
+ * Return all content types available.
+ */
+function views_content_views_panes_content_type_content_types($plugin) {
+ $types = array();
+ // It can be fairly intensive to calculate this, so let's cache this in the
+ // cache_views table. The nice thing there is that if views ever change, that
+ // table will always be cleared. Except for the occasional default view, so
+ // we must use the Views caching functions in order to respect Views caching
+ // settings.
+ views_include('cache');
+ $data = views_cache_get('views_content_panes', TRUE);
+ if (!empty($data->data)) {
+ $types = $data->data;
+ }
+
+ if (empty($types)) {
+ $types = array();
+
+ $views = views_get_all_views();
+
+ foreach ($views as $view) {
+ $view->init_display();
+
+ foreach ($view->display as $id => $display) {
+ if (empty($display->handler->panel_pane_display)) {
+ continue;
+ }
+ $types[$view->name . '-' . $id] = _views_content_panes_content_type($view, $display);
+ }
+
+ $view->destroy();
+ }
+ views_cache_set('views_content_panes', $types, TRUE);
+ }
+
+ return $types;
+}
+
+/**
+ * Return a single content type.
+ */
+function views_content_views_panes_content_type_content_type($subtype, $plugin) {
+ list($name, $display) = explode('-', $subtype);
+ $view = views_get_view($name);
+ if (empty($view)) {
+ return;
+ }
+
+ $view->set_display($display);
+ $retval = _views_content_panes_content_type($view, $view->display[$display]);
+
+ $view->destroy();
+ return $retval;
+}
+
+function _views_content_panes_content_type($view, $display) {
+ $title = $display->handler->get_option('pane_title');
+ if (!$title) {
+ $title = $view->name;
+ }
+
+ $description = $display->handler->get_option('pane_description');
+ if (!$description) {
+ $description = $view->description;
+ }
+
+ $category = $display->handler->get_option('pane_category');
+ if (!$category['name']) {
+ $category['name'] = t('View panes');
+ }
+
+ $icon = 'icon_views_page.png';
+
+ $contexts = array();
+
+ $arguments = $display->handler->get_argument_input();
+ foreach ($arguments as $argument) {
+ if ($argument['type'] == 'context') {
+ if (strpos($argument['context'], '.')) {
+ list($context, $converter) = explode('.', $argument['context'], 2);
+ }
+ else {
+ $context = $argument['context'];
+ }
+ $contexts[] = new ctools_context_required($argument['label'], $context);
+ }
+ }
+
+ $allow = $display->handler->get_option('allow');
+ return array(
+ 'title' => $title,
+ 'icon' => $icon,
+ 'description' => filter_xss_admin($description),
+ 'required context' => $contexts,
+ 'category' => array($category['name'], $category['weight']),
+ 'no title override' => empty($allow['title_override']),
+ );
+}
+
+/**
+ * Output function for the 'views' content type.
+ *
+ * Outputs a view based on the module and delta supplied in the configuration.
+ */
+function views_content_views_panes_content_type_render($subtype, $conf, $panel_args, $contexts) {
+ if (!is_array($contexts)) {
+ $contexts = array($contexts);
+ }
+
+ list($name, $display) = explode('-', $subtype);
+ $view = views_get_view($name);
+ if (empty($view)) {
+ return;
+ }
+
+ $view->set_display($display);
+ if (!$view->display_handler->access($GLOBALS['user'])) {
+ return;
+ }
+
+ $args = array();
+ $arguments = $view->display_handler->get_option('arguments');
+
+ $context_keys = array_keys($contexts);
+ foreach ($view->display_handler->get_argument_input() as $id => $argument) {
+ switch ($argument['type']) {
+ case 'context':
+ $key = array_shift($context_keys);
+ if ($key) {
+ if (strpos($argument['context'], '.')) {
+ list($context, $converter) = explode('.', $argument['context'], 2);
+ $args[] = ctools_context_convert_context($contexts[$key], $converter);
+ }
+ else {
+ $args[] = $contexts[$key]->argument;
+ }
+ }
+ break;
+
+ case 'fixed':
+ $args[] = $argument['fixed'];
+ break;
+
+ case 'panel':
+ $args[] = $panel_args[$argument['panel']];
+ break;
+
+ case 'user':
+ $args[] = isset($conf['arguments'][$id]) ? $conf['arguments'][$id] : NULL;
+ break;
+
+ case 'wildcard':
+ // Put in the wildcard.
+ $args[] = isset($arguments[$id]['wildcard']) ? $arguments[$id]['wildcard'] : '*';
+ break;
+
+ case 'none':
+ default:
+ // Put in NULL.
+ // views.module knows what to do with NULL (or missing) arguments
+ $args[] = NULL;
+ break;
+ }
+ }
+
+ // remove any trailing NULL arguments as these are non-args:
+ while (count($args) && end($args) === NULL) {
+ array_pop($args);
+ }
+ $view->set_arguments($args);
+
+ $allow = $view->display_handler->get_option('allow');
+
+ if ($allow['path_override'] && !empty($conf['path'])) {
+ $view->display_handler->set_option('path', $conf['path']);
+ }
+
+ $block = new stdClass();
+ $block->module = 'views';
+ $block->delta = $view->name . $display;
+ $block->title = $view->get_title();
+
+ if (($allow['link_to_view'] && !empty($conf['link_to_view'])) ||
+ (!$allow['link_to_view'] && $view->display_handler->get_option('link_to_view'))) {
+ $block->title_link = $view->get_url();
+ }
+
+ // more link
+ if (($allow['more_link'] && !empty($conf['more_link'])) ||
+ (!$allow['more_link'] && $view->display_handler->get_option('more_link'))) {
+ $block->more = array('href' => $view->get_url());
+ $view->display_handler->set_option('use_more', FALSE);
+ // make sure the view runs the count query so we know whether or not the more link
+ // applies.
+ $view->get_total_rows = TRUE;
+ }
+
+ if ($allow['use_pager']) {
+ $view->display_handler->set_option('use_pager', $conf['use_pager']);
+ $view->display_handler->set_option('pager_element', $conf['pager_id']);
+ }
+ if ($allow['items_per_page'] && isset($conf['items_per_page'])) {
+ $view->display_handler->set_option('items_per_page', $conf['items_per_page']);
+ }
+ if ($allow['offset']) {
+ $view->display_handler->set_option('offset', $conf['offset']);
+ }
+
+ $stored_feeds = drupal_add_feed();
+
+ $block->content = $view->preview();
+
+ if (empty($view->total_rows) || $view->total_rows <= $view->display_handler->get_option('items_per_page')) {
+ unset($block->more);
+ }
+
+ if ((!empty($allow['feed_icons']) && !empty($conf['feed_icons'])) ||
+ (empty($allow['feed_icons']) && $view->display_handler->get_option('feed_icons'))) {
+ $new_feeds = drupal_add_feed();
+ if ($diff = array_diff(array_keys($new_feeds), array_keys($stored_feeds))) {
+ foreach ($diff as $url) {
+ $block->feeds[$url] = $new_feeds[$url];
+ }
+ }
+ }
+
+ return $block;
+}
+
+/**
+ * Returns an edit form for a block.
+ */
+function views_content_views_panes_content_type_edit_form(&$form, &$form_state) {
+ $conf = $form_state['conf'];
+ // This allows older content to continue to work, where we used to embed
+ // the display directly.
+ list($name, $display_id) = explode('-', $form_state['subtype_name']);
+ $view = views_get_view($name);
+
+ if (empty($view)) {
+ $form['markup'] = array('#value' => t('Broken/missing/deleted view.'));
+ return;
+ }
+
+ $view->set_display($display_id);
+
+ $allow = $view->display_handler->get_option('allow');
+
+ // Provide defaults for everything in order to prevent warnings.
+ if (empty($conf)) {
+ $conf['link_to_view'] = $view->display_handler->get_option('link_to_view');
+ $conf['more_link'] = $view->display_handler->get_option('more_link');
+ $conf['feed_icons'] = FALSE;
+ $conf['use_pager'] = $view->display_handler->get_option('use_pager');
+ $conf['pager_id'] = $view->display_handler->get_option('element_id');
+ $conf['items_per_page'] = $view->display_handler->get_option('items_per_page');
+ $conf['offset'] = $view->display_handler->get_option('offset');
+ $conf['path_override'] = FALSE;
+ $conf['path'] = $view->get_path();
+ }
+
+ foreach ($view->display_handler->get_argument_input() as $id => $argument) {
+ if ($argument['type'] == 'user') {
+ $form['arguments'][$id] = array(
+ '#type' => 'textfield',
+ '#default_value' => isset($conf['arguments'][$id]) ? $conf['arguments'][$id] : '',
+ '#title' => $argument['label'],
+ );
+ }
+ }
+ if ($view->display_handler->has_path()) {
+ if ($allow['link_to_view'] ) {
+ $form['link_to_view'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['link_to_view'],
+ '#title' => t('Link title to page'),
+ );
+ }
+ if ($allow['more_link']) {
+ $form['more_link'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['more_link'],
+ '#title' => t('Provide a "more" link.'),
+ );
+ }
+ }
+
+ if (!empty($allow['feed_icons'])) {
+ $form['feed_icons'] = array(
+ '#type' => 'checkbox',
+ '#default_value' => $conf['feed_icons'],
+ '#title' => t('Display feed icons'),
+ );
+ }
+
+ if ($allow['use_pager']) {
+ $form['pager_aligner_start'] = array(
+ '#value' => '<div class="option-text-aligner">',
+ );
+ $form['use_pager'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use pager'),
+ '#default_value' => $conf['use_pager'],
+ '#id' => 'use-pager-checkbox',
+ );
+ $form['pager_id'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['pager_id'],
+ '#title' => t('Pager ID'),
+ '#size' => 4,
+ '#id' => 'use-pager-textfield',
+ );
+ $form['pager_aligner_stop'] = array(
+ '#value' => '</div><div style="clear: both; padding: 0; margin: 0"></div>',
+ );
+ }
+ if ($allow['items_per_page']) {
+ $form['items_per_page'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['items_per_page'],
+ '#title' => t('Num items'),
+ '#size' => 4,
+ '#description' => t('Select the number of items to display, or 0 to display all results.'),
+ );
+ }
+ if ($allow['offset']) {
+ $form['offset'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['offset'],
+ '#title' => t('Offset'),
+ '#size' => 4,
+ '#description' => t('Enter the number of items to skip; enter 0 to skip no items.'),
+ );
+ }
+ if ($allow['path_override']) {
+ // TODO: Because javascript in the dialogs is kind of weird, dependent checkboxes
+ // don't work right for external modules. This needs fixing in panels itself.
+ $form['path'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $conf['path'],
+ '#title' => t('Override path'),
+ '#size' => 30,
+ '#description' => t('If this is set, override the View URL path; this can sometimes be useful to set to the panel URL.'),
+ );
+ }
+}
+
+/**
+ * Store form values in $conf.
+ */
+function views_content_views_panes_content_type_edit_form_submit(&$form, &$form_state) {
+ // Copy everything from our defaults.
+ $keys = array('link_to_view', 'more_link', 'feed_icons', 'use_pager',
+ 'pager_id', 'items_per_page', 'offset', 'path_override', 'path');
+
+ foreach ($keys as $key) {
+ $form_state['conf'][$key] = $form_state['values'][$key];
+ }
+}
+
+
+/**
+ * Returns the administrative title for a type.
+ */
+function views_content_views_panes_content_type_admin_title($subtype, $conf, $contexts) {
+ list($name, $display) = explode('-', $subtype);
+ $view = views_get_view($name);
+ if (empty($view)) {
+ return t('Deleted/missing view @view', array('@view' => $name));
+ }
+ if (empty($view->display[$display])) {
+ return t('Deleted/missing view @view', array('@view' => $name));
+ }
+
+ $view->set_display($display);
+ $title = $view->display_handler->get_option('pane_title');
+ return check_plain($title ? $title : $view->name);
+}
+
+/**
+ * Returns the administrative title for a type.
+ */
+function views_content_views_panes_content_type_admin_info($subtype, $conf, $contexts) {
+}
diff --git a/views_content/plugins/views/views_content.views.inc b/views_content/plugins/views/views_content.views.inc
new file mode 100644
index 00000000..9887a9f7
--- /dev/null
+++ b/views_content/plugins/views/views_content.views.inc
@@ -0,0 +1,29 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Contains Views plugin definitions for the panel pane display.
+ */
+
+/**
+ * Implementation of hook_views_plugins
+ */
+function views_content_views_plugins() {
+ return array(
+ 'display' => array(
+ 'panel_pane' => array(
+ 'title' => t('Content pane'),
+ 'help' => t('Is available as content for a panel or dashboard display.'),
+ 'handler' => 'views_content_plugin_display_panel_pane',
+ 'path' => drupal_get_path('module', 'views_content') . '/plugins/views',
+ 'theme' => 'views_view',
+ 'use ajax' => TRUE,
+ 'use pager' => TRUE,
+ 'use more' => TRUE,
+ 'accept attachments' => TRUE,
+ 'help topic' => 'display-pane',
+ ),
+ ),
+ );
+}
diff --git a/views_content/plugins/views/views_content_plugin_display_panel_pane.inc b/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
new file mode 100644
index 00000000..59ca5786
--- /dev/null
+++ b/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
@@ -0,0 +1,349 @@
+<?php
+// $Id$
+
+/**
+ * The plugin that handles a panel_pane.
+ */
+class views_content_plugin_display_panel_pane extends views_plugin_display {
+ /**
+ * If this variable is true, this display counts as a panel pane. We use
+ * this variable so that other modules can create alternate pane displays.
+ */
+ var $panel_pane_display = TRUE;
+
+ function option_definition() {
+ $options = parent::option_definition();
+
+ $options['pane_title'] = array('default' => '', 'translatable' => TRUE);
+ $options['pane_description'] = array('default' => '', 'translatable' => TRUE);
+ $options['pane_category'] = array(
+ 'contains' => array(
+ 'name' => array('default' => 'View panes', 'translatable' => TRUE),
+ 'weight' => array('default' => 0),
+ ),
+ );
+
+ $options['allow'] = array(
+ 'contains' => array(
+ 'use_pager' => array('default' => FALSE),
+ 'items_per_page' => array('default' => FALSE),
+ 'offset' => array('default' => FALSE),
+ 'link_to_view' => array('default' => FALSE),
+ 'more_link' => array('default' => FALSE),
+ 'path_override' => array('default' => FALSE),
+ 'title_override' => array('default' => FALSE),
+ 'exposed_form' => array('default' => FALSE),
+ ),
+ );
+
+ $options['argument_input'] = array('default' => array());
+ $options['link_to_view'] = array('default' => 0);
+ $options['inherit_panels_path'] = array('default' => 0);
+
+ return $options;
+ }
+
+ /**
+ * Provide the summary for page options in the views UI.
+ *
+ * This output is returned as an array.
+ */
+ function options_summary(&$categories, &$options) {
+ // It is very important to call the parent function here:
+ parent::options_summary($categories, $options);
+
+ $categories['panel_pane'] = array(
+ 'title' => t('Pane settings'),
+ );
+
+ $pane_title = $this->get_option('pane_title');
+ if (empty($pane_title)) {
+ $pane_title = t('Use view name');
+ }
+
+ if (strlen($pane_title) > 16) {
+ $pane_title = substr($pane_title, 0, 16) . '...';
+ }
+
+ $options['pane_title'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Admin title'),
+ 'value' => $pane_title,
+ );
+
+ $pane_description = $this->get_option('pane_description');
+ if (empty($pane_description)) {
+ $pane_description = t('Use view description');
+ }
+
+ if (strlen($pane_description) > 16) {
+ $pane_description = substr($pane_description, 0, 16) . '...';
+ }
+
+ $options['pane_description'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Admin desc'),
+ 'value' => $pane_description,
+ );
+
+ $category = $this->get_option('pane_category');
+ $pane_category = $category['name'];
+ if (empty($pane_category)) {
+ $pane_category = t('View panes');
+ }
+
+ if (strlen($pane_category) > 16) {
+ $pane_category = substr($pane_category, 0, 16) . '...';
+ }
+
+ $options['pane_category'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Category'),
+ 'value' => $pane_category,
+ );
+
+ $options['link_to_view'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Link to view'),
+ 'value' => $this->get_option('link_to_view') ? t('Yes') : t('No'),
+ );
+
+ $options['inherit_panels_path'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Use Panel path'),
+ 'value' => $this->get_option('inherit_panels_path') ? t('Yes') : t('No'),
+ );
+
+ $options['argument_input'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Argument input'),
+ 'value' => t('Edit'),
+ );
+
+ $allow = $this->get_option('allow');
+ $filtered_allow = array_filter($allow);
+
+ $options['allow'] = array(
+ 'category' => 'panel_pane',
+ 'title' => t('Allow settings'),
+ 'value' => empty($filtered_allow) ? t('None') : ($allow === $filtered_allow ? t('All') : t('Some')),
+ );
+ }
+
+ /**
+ * Provide the default form for setting options.
+ */
+ function options_form(&$form, &$form_state) {
+ // It is very important to call the parent function here:
+ parent::options_form($form, $form_state);
+
+ switch ($form_state['section']) {
+ case 'allow':
+ $form['#title'] .= t('Allow settings');
+ $form['description'] = array(
+ '#value' => '<div class="form-item description">' . t('Checked settings will be available in the panel pane config dialog for modification by the panels user. Unchecked settings will not be available and will only use the settings in this display.') . '</div>',
+ );
+
+ $options = array(
+ 'use_pager' => t('Use pager'),
+ 'items_per_page' => t('Items per page'),
+ 'offset' => t('Pager offset'),
+ 'link_to_view' => t('Link to view'),
+ 'more_link' => t('More link'),
+ 'path_override' => t('Path override'),
+ 'title_override' => t('Title override'),
+ 'exposed_form' => t('Use exposed widgets form as pane configuration'),
+ );
+
+ $allow = array_filter($this->get_option('allow'));
+ $form['allow'] = array(
+ '#type' => 'checkboxes',
+ '#default_value' => $allow,
+ '#options' => $options,
+ );
+ break;
+ case 'pane_title':
+ $form['#title'] .= t('Administrative title');
+
+ $form['pane_title'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $this->get_option('pane_title'),
+ '#description' => t('This is the title that will appear for this view pane in the add content dialog. If left blank, the view name will be used.'),
+ );
+ break;
+
+ case 'pane_description':
+ $form['#title'] .= t('Administrative description');
+
+ $form['pane_description'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $this->get_option('pane_description'),
+ '#description' => t('This is text that will be displayed when the user mouses over the pane in the add content dialog. If blank the view description will be used.'),
+ );
+ break;
+
+ case 'pane_category':
+ $form['#title'] .= t('Administrative description');
+
+ $cat = $this->get_option('pane_category');
+ $form['pane_category']['#tree'] = TRUE;
+ $form['pane_category']['name'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $cat['name'],
+ '#description' => t('This is category the pane will appear in on the add content dialog.'),
+ );
+ $form['pane_category']['weight'] = array(
+ '#title' => t('Weight'),
+ '#type' => 'textfield',
+ '#default_value' => $cat['weight'],
+ '#description' => t('This is the default weight of the category. Note that if the weight of a category is defined in multiple places, only the first one Panels sees will get that definition, so if the weight does not appear to be working, check other places that the weight might be set.'),
+ );
+ break;
+
+ case 'link_to_view':
+ $form['#title'] .= t('Link pane title to view');
+
+ $form['link_to_view'] = array(
+ '#type' => 'select',
+ '#options' => array(1 => t('Yes'), 0 => t('No')),
+ '#default_value' => $this->get_option('link_to_view'),
+ );
+ break;
+
+ case 'inherit_panels_path':
+ $form['#title'] .= t('Inherit path from panel display');
+
+ $form['inherit_panels_path'] = array(
+ '#type' => 'select',
+ '#options' => array(1 => t('Yes'), 0 => t('No')),
+ '#default_value' => $this->get_option('inherit_panels_path'),
+ '#description' => t('If yes, all links generated by Views, such as more links, summary links, and exposed input links will go to the panels display path, not the view, if the display has a path.'),
+ );
+ break;
+
+ case 'argument_input':
+ $form['#title'] .= t('Choose the data source for view arguments');
+ $argument_input = $this->get_argument_input();
+
+ ctools_include('context');
+ $form['argument_input']['#tree'] = TRUE;
+
+ foreach ($argument_input as $id => $argument) {
+ $form['argument_input'][$id] = array(
+ '#tree' => TRUE,
+ );
+
+ $safe = str_replace(array('][', '_', ' '), '-', $id);
+ $type_id = 'edit-argument-input-' . $safe;
+
+ $form['argument_input'][$id]['type'] = array(
+ '#type' => 'select',
+ '#options' => array(
+ 'none' => t('No argument'),
+ 'wildcard' => t('Argument wildcard'),
+ 'context' => t('From context'),
+ 'panel' => t('From panel argument'),
+ 'fixed' => t('Fixed'),
+ 'user' => t('Input on pane config'),
+ ),
+ '#id' => $type_id,
+ '#title' => t('@arg source', array('@arg' => $argument['name'])),
+ '#default_value' => $argument['type'],
+ );
+
+ $form['argument_input'][$id]['context'] = array(
+ '#type' => 'select',
+ '#title' => t('Required context'),
+ '#description' => t('If "From context" is selected, which context to require.'),
+ '#default_value' => $argument['context'],
+ '#options' => ctools_context_get_all_converters(),
+ '#process' => array('views_process_dependency'),
+ '#dependency' => array($type_id => array('context')),
+ );
+
+ $form['argument_input'][$id]['panel'] = array(
+ '#type' => 'select',
+ '#title' => t('Panel argument'),
+ '#description' => t('If "From panel argument" is selected, which panel argument to use.'),
+ '#default_value' => $argument['panel'],
+ '#options' => array(0 => t('First'), 1 => t('Second'), 2 => t('Third'), 3 => t('Fourth'), 4 => t('Fifth'), 5 => t('Sixth')),
+ '#process' => array('views_process_dependency'),
+ '#dependency' => array($type_id => array('panel')),
+ );
+
+ $form['argument_input'][$id]['fixed'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Fixed argument'),
+ '#description' => t('If "Fixed" is selected, what to use as an argument.'),
+ '#default_value' => $argument['fixed'],
+ '#process' => array('views_process_dependency'),
+ '#dependency' => array($type_id => array('fixed')),
+ );
+
+ $form['argument_input'][$id]['label'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Label'),
+ '#description' => t('If this argument is presented to the panels user, what label to apply to it.'),
+ '#default_value' => empty($argument['label']) ? $argument['name'] : $argument['label'],
+ '#process' => array('views_process_dependency'),
+ '#dependency' => array($type_id => array('user')),
+ );
+ }
+ break;
+ }
+ }
+
+ /**
+ * Perform any necessary changes to the form values prior to storage.
+ * There is no need for this function to actually store the data.
+ */
+ function options_submit($form, &$form_state) {
+ // It is very important to call the parent function here:
+ parent::options_submit($form, $form_state);
+ switch ($form_state['section']) {
+ case 'allow':
+ case 'argument_input':
+ case 'link_to_view':
+ case 'inherit_panels_path':
+ case 'pane_title':
+ case 'pane_description':
+ case 'pane_category':
+ $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
+ break;
+ }
+ }
+
+ /**
+ * Adjust the array of argument input to match the current list of
+ * arguments available for this display. This ensures that changing
+ * the arguments doesn't cause the argument input field to just
+ * break.
+ */
+ function get_argument_input() {
+ $arguments = $this->get_option('argument_input');
+ $handlers = $this->get_handlers('argument');
+
+ // We use a separate output so as to seamlessly discard info for
+ // arguments that no longer exist.
+ $output = array();
+
+ foreach ($handlers as $id => $handler) {
+ if (empty($arguments[$id])) {
+ $output[$id] = array(
+ 'type' => 'none',
+ 'context' => 'any',
+ 'panel' => 0,
+ 'fixed' => '',
+ 'name' => $handler->ui_name(),
+ );
+ }
+ else {
+ $output[$id] = $arguments[$id];
+ $output[$id]['name'] = $handler->ui_name();
+ }
+ }
+
+ return $output;
+ }
+}
+
diff --git a/views_content/views_content.admin.inc b/views_content/views_content.admin.inc
new file mode 100644
index 00000000..272961e5
--- /dev/null
+++ b/views_content/views_content.admin.inc
@@ -0,0 +1,22 @@
+<?php
+// $Id$
+
+/**
+ * @file panels_views.module
+ *
+ * Provides views as panels content, configurable by the administrator.
+ * Each view provided as panel content must be configured in advance,
+ * but once configured, building panels with views is a little bit simpler.
+ */
+
+function views_content_admin_page() {
+ $form['panels_views_all_views'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Make all views available as panes'),
+ '#description' => t("If checked, all views will be made available as content panes to be added to content types. If not checked, only Views that have a 'Content pane' display will be available as content panes."),
+ '#default_value' => variable_get('ctools_content_all_views', TRUE),
+ );
+
+ return system_settings_form($form);
+
+}
\ No newline at end of file
diff --git a/views_content/views_content.info b/views_content/views_content.info
new file mode 100644
index 00000000..584ce849
--- /dev/null
+++ b/views_content/views_content.info
@@ -0,0 +1,7 @@
+; $Id$
+name = Views content panes
+description = Allows Views content to be used in Panels, Dashboard and other modules which use the CTools Content API.
+package = "Views"
+dependencies[] = ctools
+dependencies[] = views
+core = 6.x
diff --git a/views_content/views_content.module b/views_content/views_content.module
new file mode 100644
index 00000000..ddd6db5d
--- /dev/null
+++ b/views_content/views_content.module
@@ -0,0 +1,76 @@
+<?php
+// $Id$
+
+/**
+ * @file views_content.module
+ *
+ * Provides views as panels content, configurable by the administrator.
+ * Each view provided as panel content must be configured in advance,
+ * but once configured, building panels with views is a little bit simpler.
+ */
+
+/**
+ * Implementation of hook_menu().
+ */
+function views_content_menu() {
+ $items = array();
+
+ $base = array(
+ 'access arguments' => array('administer views content plugin'),
+ 'file' => 'views_content.admin.inc',
+ );
+
+ $items['admin/panels/views'] = array(
+ 'title' => 'Views panes',
+ 'type' => MENU_NORMAL_ITEM,
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('views_content_admin_page'),
+ 'description' => 'Configure Views to be used as panes within panel displays.',
+ ) + $base;
+
+ return $items;
+}
+
+/**
+ * Implementation of hook_ctools_plugin_dierctory() to let the system know
+ * we implement task and task_handler plugins.
+ */
+function views_content_ctools_plugin_directory($module, $plugin) {
+ if ($module == 'ctools' && $plugin == 'content_types') {
+ return 'plugins/' . $plugin;
+ }
+}
+
+/**
+ * Don't show Views' blocks; we expose them already.
+ */
+function views_ctools_block_info($module, $delta, &$info) {
+ if (strlen($delta) == 32) {
+ $hashes = variable_get('views_block_hashes', array());
+ if (!empty($hashes[$delta])) {
+ $delta = $hashes[$delta];
+ }
+ }
+
+ // We remove any non 'special' blocks so they don't show up repeatedly.
+ if (substr($delta, 0, 1) != '-') {
+ $info = NULL;
+ }
+ else {
+ $info['category'] = t('Views');
+ $info['icon'] = 'icon_views_block_legacy.png';
+ $info['path'] = drupal_get_path('module', 'views_content');
+ }
+}
+
+/**
+ * Implementation of hook_views_api().
+ *
+ * This one is used as the base to reduce errors when updating.
+ */
+function views_content_views_api() {
+ return array(
+ 'api' => 2,
+ 'path' => drupal_get_path('module', 'views_content') . '/plugins/views',
+ );
+}
--
GitLab