diff --git a/css/dropdown.css b/css/dropdown.css
new file mode 100644
index 0000000000000000000000000000000000000000..1b82787737a65d17a375c8b40e37ee04b1a2b8a2
--- /dev/null
+++ b/css/dropdown.css
@@ -0,0 +1,66 @@
+/* $Id$ */
+html.js div.ctools-dropdown div.ctools-dropdown-container {
+ position: absolute;
+ z-index: 99;
+ display: none;
+ text-align: left;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul li a {
+ display: block;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul {
+ display: inline;
+ list-style-type: none;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul li {
+ display: block;
+}
+
+.ctools-dropdown-no-js .ctools-dropdown-link,
+.ctools-dropdown-no-js span.text {
+ display: none;
+}
+
+/* Everything from here down is purely visual style and can be overridden. */
+
+html.js div.ctools-dropdown a.ctools-dropdown-link {
+ background: url(../images/collapsible-expanded.png) 3px 5px no-repeat;
+ padding-left: 12px;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container {
+ width: 175px;
+ background: #fff;
+ border: 1px solid black;
+ margin-top: 4px;
+ color: #494949;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul li li a {
+ padding-left: 25px;
+ width: 150px;
+ color: #027AC6;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul li a {
+ text-decoration: none;
+ padding-left: 5px;
+ width: 170px;
+ color: #027AC6;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul li span {
+ display: block;
+}
+
+html.js div.ctools-dropdown div.ctools-dropdown-container ul li span.text {
+ font-style: italic;
+ padding-left: 5px;
+}
+
+html.js .ctools-dropdown-hover {
+ background-color: #ECECEC;
+}
diff --git a/delegator/delegator.module b/delegator/delegator.module
index 8f88131500e577e4678edf7c2096275150ac3f83..4eda9a649deaa1a951bf14a83446dde0f040428c 100644
--- a/delegator/delegator.module
+++ b/delegator/delegator.module
@@ -98,6 +98,16 @@ function delegator_menu() {
'type' => MENU_LOCAL_TASK,
);
+ // Task types get menu entries so they can set up their own administrative
+ // areas.
+ $task_types = delegator_get_task_types();
+
+ foreach ($task_types as $id => $task_type) {
+ if ($function = ctools_plugin_get_function($task_type, 'hook menu')) {
+ $function($items, $task_type);
+ }
+ }
+
$tasks = delegator_get_tasks();
// Provide menu items for each task.
@@ -361,6 +371,22 @@ function delegator_update_task_handler_weight($handler, $weight) {
db_query("INSERT INTO {delegator_weights} (name, weight) VALUES ('%s', %d)", $handler->name, $weight);
}
+/**
+ * Shortcut function to get task type plugins.
+ */
+function delegator_get_task_types() {
+ ctools_include('plugins');
+ return ctools_get_plugins('delegator', 'task_types');
+}
+
+/**
+ * Shortcut function to get a task type plugin.
+ */
+function delegator_get_task_type($id) {
+ ctools_include('plugins');
+ return ctools_get_plugins('delegator', 'task_types', $id);
+}
+
/**
* Shortcut function to get task plugins.
*/
@@ -377,6 +403,22 @@ function delegator_get_task($id) {
return ctools_get_plugins('delegator', 'tasks', $id);
}
+/**
+ * Get all tasks for a given type.
+ */
+function delegator_get_tasks_by_type($type) {
+ ctools_include('plugins');
+ $all_tasks = ctools_get_plugins('delegator', 'tasks');
+ $tasks = array();
+ foreach ($all_tasks as $id => $task) {
+ if (isset($task['task type']) && $task['task type'] == $type) {
+ $tasks[$id] = $task;
+ }
+ }
+
+ return $tasks;
+}
+
/**
* Fetch all subtasks for a delegator task.
*
diff --git a/delegator/plugins/tasks/node_view.inc b/delegator/plugins/tasks/node_view.inc
index 380081e5cfd0fd4bd33e55b0f1d5d94d1283343d..059bbd0b0feab0ac36f138b52b824cebcbbcbcd4 100644
--- a/delegator/plugins/tasks/node_view.inc
+++ b/delegator/plugins/tasks/node_view.inc
@@ -9,11 +9,14 @@ function delegator_node_view_delegator_tasks() {
return array(
'node_view' => array(
'title' => t('Node view'),
- 'description' => t('The node view task allows you to control which functions will handle the actual job of rendering a node view. The first task that matches the node will be used to display the node. If there are no task handlers listed, or no task handlers are configured to handle a given node, the default Drupal node view mechanism will be used.'),
+ 'description' => t('The node view task allows you to control what handler will handle the job of rendering a node view at the path <em>node/%node</em>. If no handler is set or matches the criteria, the default Drupal node renderer will be used.'),
+ 'type' => 'node_view', // handler type -- misnamed
'admin title' => 'Node view', // translated by menu system
- 'admin description' => 'Overrides for the built in node view handler which allows customized node output.',
+ 'admin description' => 'Overrides for the built in node view handler at <em>node/%node</em>.',
+ 'admin path' => 'node/%node',
'hook menu' => 'delegator_node_view_menu',
'hook menu alter' => 'delegator_node_view_menu_alter',
+ 'task type' => 'page',
),
);
}
diff --git a/delegator/plugins/tasks/page.admin.inc b/delegator/plugins/tasks/page.admin.inc
index 1f03414dbf46e0c406d09aee77d4b09b283bc172..e4c1fb6baf3ca353dbb7a01d8bd28572c0aa38fc 100644
--- a/delegator/plugins/tasks/page.admin.inc
+++ b/delegator/plugins/tasks/page.admin.inc
@@ -14,7 +14,14 @@
*/
function delegator_page_get_page_cache($name) {
ctools_include('object-cache');
- return ctools_object_cache_get('delegator_page', $name);
+ $cache = ctools_object_cache_get('delegator_page', $name);
+ if (!$cache) {
+ // This ensures the task .inc file is loaded
+ $task = delegator_get_task('page');
+ $cache = delegator_page_load($name);
+ }
+
+ return $cache;
}
/**
@@ -62,45 +69,14 @@ function delegator_page_get_arguments($path) {
* Page callback to add a subtask.
*/
function delegator_page_add_subtask($step = NULL) {
- $form_info = array(
- 'id' => 'delegator_page',
- 'path' => 'admin/build/delegator/page/add/%step',
- 'return path' => 'admin/build/delegator/page',
- 'show trail' => TRUE,
- 'show back' => TRUE,
- 'show return' => FALSE,
- 'next callback' => 'delegator_page_add_subtask_next',
- 'finish callback' => 'delegator_page_add_subtask_finish',
- 'cancel callback' => 'delegator_page_add_subtask_cancel',
- 'order' => array(
- 'basic' => t('Basic settings'),
- 'argument' => t('Argument settings'),
- 'access' => t('Access type'),
- 'access-settings' => t('Access settings'),
- 'menu' => t('Menu settings'),
- ),
- 'forms' => array(
- 'basic' => array(
- 'form id' => 'delegator_page_form_basic'
- ),
- 'access' => array(
- 'form id' => 'delegator_page_form_access'
- ),
- 'access-settings' => array(
- 'form id' => 'delegator_page_form_access_settings'
- ),
- 'menu' => array(
- 'form id' => 'delegator_page_form_menu'
- ),
- 'argument' => array(
- 'form id' => 'delegator_page_form_argument'
- ),
- ),
- );
-
// We load the task to make sure our .inc file is loaded.
$task = delegator_get_task('page');
+ $form_info = delegator_page_edit_form_info();
+ $form_info += array(
+ 'path' => 'admin/build/pages/add/%step',
+ );
+
// If step is unset, we're creating a new one. Wipe out our values and start
// over.
if (!isset($step) || !$page = delegator_page_get_page_cache('::new')) {
@@ -114,6 +90,46 @@ function delegator_page_add_subtask($step = NULL) {
$form_state = array(
'cache name' => '::new',
'page' => $page,
+ 'type' => 'add',
+ );
+ $output = ctools_wizard_multistep_form($form_info, $step, $form_state);
+
+ if (!$output) {
+ // redirect.
+ drupal_redirect_form(array(), $form_state['redirect']);
+ }
+
+ return $output;
+}
+
+/**
+ * Page callback to add a subtask.
+ */
+function delegator_page_edit_subtask($page_name, $step = NULL) {
+ if (!$page = delegator_page_get_page_cache($page_name)) {
+ return drupal_not_found();
+ }
+
+ // We load the task to make sure our .inc file is loaded.
+ $task = delegator_get_task('page');
+
+ $form_info = array(
+ 'path' => "admin/build/pages/edit/$page_name/%step",
+ 'show trail' => FALSE,
+ 'show return' => TRUE,
+ 'return path' => 'admin/build/pages',
+ ) + delegator_page_edit_form_info();
+
+ // If step is unset, go with the basic step.
+ if (!isset($step)) {
+ $step = 'basic';
+ }
+
+ ctools_include('wizard');
+ $form_state = array(
+ 'cache name' => $page_name,
+ 'page' => $page,
+ 'type' => 'edit',
);
$output = ctools_wizard_multistep_form($form_info, $step, $form_state);
@@ -138,7 +154,12 @@ function delegator_page_add_subtask_finish(&$form_state) {
$args[$keyword] = $page->arguments[$keyword];
}
else {
- $args[$keyword] = array('argument' => '', 'settings' => array());
+ $args[$keyword] = array(
+ 'id' => '',
+ 'identifier' => '',
+ 'argument' => '',
+ 'settings' => array()
+ );
}
}
$page->arguments = $args;
@@ -151,8 +172,13 @@ function delegator_page_add_subtask_finish(&$form_state) {
// Force a menu rebuild to recognize our new subtask
menu_rebuild();
- // Redirect to the new page's task handler editor.
- $form_state['redirect'] = 'admin/build/delegator/page-' . $page->name;
+ if ($form_state['type'] == 'add') {
+ // Redirect to the new page's task handler editor.
+ $form_state['redirect'] = 'admin/build/delegator/page-' . $page->name;
+ }
+ else {
+ $form_state['redirect'] = 'admin/build/pages';
+ }
}
/**
@@ -403,7 +429,14 @@ function delegator_page_form_access(&$form, &$form_state) {
$contexts = array();
// Load contexts based on argument data:
if ($page->arguments) {
- $contexts = ctools_context_get_placeholders_from_argument($page->arguments);
+ $arguments = array();
+ foreach ($page->arguments as $keyword => $argument) {
+ if (isset($argument['name'])) {
+ $argument['keyword'] = $keyword;
+ $arguments[$argument['id']] = $argument;
+ }
+ }
+ $contexts = ctools_context_get_placeholders_from_argument($arguments);
}
$plugins = ctools_get_access_plugins();
@@ -452,7 +485,7 @@ function delegator_page_form_access_submit(&$form, &$form_state) {
$access['type'] = $type;
// If there's no settings form, skip the settings form.
- if (!ctools_plugin_get_function($plugin, 'settings form')) {
+ if (!$plugin) {
$form_state['clicked_button']['#next'] = 'menu';
}
}
@@ -536,7 +569,8 @@ function delegator_page_form_argument(&$form, &$form_state) {
$context = t('No context assigned');
- if ($conf) {
+ $plugin = array();
+ if ($conf && isset($conf['name'])) {
ctools_include('context');
$plugin = ctools_get_argument($conf['name']);
@@ -565,7 +599,7 @@ function delegator_page_form_argument(&$form, &$form_state) {
$form['table']['argument'][$keyword]['settings'] = array();
// Only show the button if this has a settings form available:
- if (isset($plugin) && ctools_plugin_get_function($plugin, 'settings form')) {
+ if (!empty($plugin)) {
// The URL for this ajax button
$form['table']['argument'][$keyword]['settings-url'] = array(
'#attributes' => array('class' => "delegator-context-$keyword-settings-url"),
@@ -796,6 +830,17 @@ function delegator_page_argument_form_change_submit(&$form, &$form_state) {
}
ctools_include('context');
+
+ // If switching to the no context, just wipe out the old data.
+ if (empty($argument)) {
+ $form_state['clicked_button']['#wizard type'] = 'finish';
+ $page->temporary_arguments[$keyword] = array(
+ 'settings' => array(),
+ 'identifier' => t('No context'),
+ );
+ return;
+ }
+
$plugin = ctools_get_argument($argument);
// Acquire defaults.
@@ -810,17 +855,16 @@ function delegator_page_argument_form_change_submit(&$form, &$form_state) {
}
}
+ $id = ctools_context_next_id($page->arguments, $argument);
+ $title = isset($plugin['title']) ? $plugin['title'] : t('No context');
+
// Set the new argument in a temporary location.
$page->temporary_arguments[$keyword] = array(
+ 'id' => $id,
+ 'identifier' => $title . ($id > 1 ? ' ' . $id : ''),
'name' => $argument,
'settings' => $settings,
);
-
- // Does the new type actually have settings? If not, we are actually
- // finished here.
- if (!ctools_plugin_get_function($plugin, 'settings form')) {
- $form_state['clicked_button']['#wizard type'] = 'finish';
- }
}
/**
@@ -850,14 +894,12 @@ function delegator_page_argument_form_settings(&$form, &$form_state) {
'#tree' => TRUE,
);
-/*
$form['identifier'] = array(
'#type' => 'textfield',
'#title' => t('Context identifier'),
- '#description' => t('This is the title of the context used to identify it later in the administrative process.'),
+ '#description' => t('This is the title of the context used to identify it later in the administrative process. This will never be shown to a user.'),
'#default_value' => $conf['identifier'],
);
-*/
if (!$plugin) {
// This should be impossible and thus never seen.
@@ -895,5 +937,11 @@ function delegator_page_argument_form_settings_submit(&$form, &$form_state) {
// Copy the form to our temporary location which will get moved again when
// finished. Yes, finished is always next but finish can happen from other
// locations so we funnel through that path rather than duplicate.
- $page->temporary_arguments[$keyword]['settings'] = $form_state['values']['settings'];
+ $page->temporary_arguments[$keyword]['identifier'] = $form_state['values']['identifier'];
+ if (isset($form_state['values']['settings'])) {
+ $page->temporary_arguments[$keyword]['settings'] = $form_state['values']['settings'];
+ }
+ else {
+ $page->temporary_arguments[$keyword]['settings'] = array();
+ }
}
diff --git a/delegator/plugins/tasks/page.inc b/delegator/plugins/tasks/page.inc
index e8ca19e4a1f5949a569e96d9e3c62f180cbde61c..84630943c3856f7d5425b3f3227e229eb645fcd9 100644
--- a/delegator/plugins/tasks/page.inc
+++ b/delegator/plugins/tasks/page.inc
@@ -16,12 +16,25 @@
function delegator_page_delegator_tasks() {
return array(
'page' => array(
- 'title' => t('Page'),
- 'type' => 'node_view',
+ 'title' => t('User pages'),
+ 'description' => t('Administrator created pages that have a URL path, access control and entries in the Drupal menu system.'),
'subtasks' => TRUE,
'subtasks callback' => 'delegator_page_subtasks',
'hook menu' => 'delegator_page_menu',
'hook theme' => 'delegator_page_theme',
+
+ // page only items
+ 'task type' => 'page',
+ 'operations' => array(
+ array(
+ 'title' => t('Import'),
+ 'href' => 'admin/build/pages/import',
+ ),
+ array(
+ 'title' => t('Add page'),
+ 'href' => 'admin/build/pages/add',
+ ),
+ ),
),
);
}
@@ -33,10 +46,62 @@ function delegator_page_subtasks($task) {
$subtasks = delegator_page_load_all();
$return = array();
foreach ($subtasks as $name => $subtask) {
+ $form_info = delegator_page_edit_form_info();
+ $edit_links = array();
+ foreach ($form_info['order'] as $form_id => $form_title) {
+ $edit_links[] = array(
+ 'title' => $form_title,
+ 'href' => "admin/build/pages/edit/$name/$form_id",
+ );
+ }
+
+ $operations = array();
+
+ if (empty($subtask->disabled)) {
+ $operations[] = array(
+ 'title' => '<span class="text">' . t('Edit page') . '</span>' . theme('links', $edit_links),
+ 'html' => TRUE,
+ );
+ $operations[] = array(
+ 'title' => t('Clone'),
+ 'href' => "admin/build/pages/clone/$name",
+ );
+ $operations[] = array(
+ 'title' => t('Export'),
+ 'href' => "admin/build/pages/export/$name",
+ );
+ if ($subtask->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
+ $operations[] = array(
+ 'title' => t('Revert'),
+ 'href' => "admin/build/pages/delete/$name",
+ );
+ }
+ else if ($subtask->export_type == EXPORT_IN_CODE) {
+ $operations[] = array(
+ 'title' => t('Disable'),
+ 'href' => "admin/build/pages/disable/$name",
+ );
+ }
+ else {
+ $operations[] = array(
+ 'title' => t('Delete'),
+ 'href' => "admin/build/pages/delete/$name",
+ );
+ }
+ }
+ else {
+ $operations[] = array(
+ 'title' => t('Enable'),
+ 'href' => "admin/build/pages/enable/$name",
+ );
+ }
$return[$name] = array(
+ 'name' => $name,
'admin title' => $subtask->admin_title,
'admin description' => t('TODO'),
+ 'admin path' => $subtask->path,
'subtask' => $subtask,
+ 'operations' => $operations,
);
}
@@ -57,14 +122,49 @@ function delegator_page_menu(&$items, $task) {
'file' => 'plugins/tasks/page.admin.inc',
);
- $items['admin/build/delegator/page/add'] = array(
+ $items['admin/build/pages/add'] = array(
'title' => 'Add page',
'description' => 'Add a delegator page subtask.',
'page callback' => 'delegator_page_add_subtask',
+ 'type' => MENU_LOCAL_TASK,
) + $base;
+ $form_info = delegator_page_edit_form_info();
+ $default_task = FALSE;
+ $weight = 0;
+ foreach ($form_info['order'] as $form_id => $form_title) {
+ // The first edit form is the default for tabs, so it gets a bit
+ // of special treatment here.
+ if (!$default_task) {
+ $default_task = TRUE;
+ // Add the callback for the default tab.
+ $items["admin/build/pages/edit/%"] = array(
+ 'title' => t('Edit'),
+ 'page callback' => 'delegator_page_edit_subtask',
+ 'page arguments' => array(4, $form_id),
+ ) + $base;
+
+ // And make sure it's the default local task.
+ $type = MENU_DEFAULT_LOCAL_TASK;
+ }
+ else {
+ // This allows an empty form title to provide a hidden form
+ // which is useful for doing more branch-like multi-step
+ // functionality.
+ $type = $form_title ? MENU_LOCAL_TASK : MENU_CALLBACK;
+ }
- // AJAX callbacks for argument love.
+ // Handler to edit delegator task handlers. May exist in its own UI.
+ $items["admin/build/pages/edit/%/$form_id"] = array(
+ 'title' => $form_title,
+ 'page callback' => 'delegator_page_edit_subtask',
+ 'page arguments' => array(4, 5),
+ 'type' => $type,
+ 'weight' => $weight++,
+ ) + $base;
+ }
+
+ // AJAX callbacks for argument modal.
$items['admin/build/delegator/argument'] = array(
'page callback' => 'delegator_page_subtask_argument_ajax',
) + $base;
@@ -81,6 +181,46 @@ function delegator_page_theme(&$items, $task) {
);
}
+/**
+ * Supply information for the multi-step wizard for both edit and add subtask
+ */
+function delegator_page_edit_form_info() {
+ return array(
+ 'id' => 'delegator_page',
+ 'show trail' => TRUE,
+ 'show back' => TRUE,
+ 'show return' => FALSE,
+ 'next callback' => 'delegator_page_add_subtask_next',
+ 'finish callback' => 'delegator_page_add_subtask_finish',
+ 'return callback' => 'delegator_page_add_subtask_finish',
+ 'cancel callback' => 'delegator_page_add_subtask_cancel',
+ 'order' => array(
+ 'basic' => t('Basic settings'),
+ 'argument' => t('Argument settings'),
+ 'access' => t('Access type'),
+ 'access-settings' => t('Access settings'),
+ 'menu' => t('Menu settings'),
+ ),
+ 'forms' => array(
+ 'basic' => array(
+ 'form id' => 'delegator_page_form_basic'
+ ),
+ 'access' => array(
+ 'form id' => 'delegator_page_form_access'
+ ),
+ 'access-settings' => array(
+ 'form id' => 'delegator_page_form_access_settings'
+ ),
+ 'menu' => array(
+ 'form id' => 'delegator_page_form_menu'
+ ),
+ 'argument' => array(
+ 'form id' => 'delegator_page_form_argument'
+ ),
+ ),
+ );
+}
+
// --------------------------------------------------------------------------
// Page task database info.
@@ -115,7 +255,7 @@ function delegator_page_load_all() {
* Write a page subtask to the database.
*/
function delegator_page_save(&$subtask) {
- $update = (isset($subtask->did)) ? array('pid') : array();
+ $update = (isset($subtask->pid)) ? array('pid') : array();
drupal_write_record('delegator_pages', $subtask, $update);
return $subtask;
}
diff --git a/delegator/plugins/tasks/user_view.inc b/delegator/plugins/tasks/user_view.inc
index 1d837d83be5815bb00771243dbff885767b89a12..79d70587bbc8ca4e7de32f0be1490072e645a2b9 100644
--- a/delegator/plugins/tasks/user_view.inc
+++ b/delegator/plugins/tasks/user_view.inc
@@ -12,8 +12,10 @@ function delegator_user_view_delegator_tasks() {
'description' => t('The user view task allows you to control which modules serve requests made to user/%. By default, the core user module will show the user account page. The first task that matches the user will be used to display the user. If no task handlers exist, or if none of the existing task handlers are configured to handle the currently requested user, then the request falls back to the default Drupal user view mechanism.'),
'admin title' => 'User view', // translated by menu system
'admin description' => 'Overrides for the built in user handler, allowing customized user output.',
+ 'admin path' => 'user/%user',
'hook menu' => 'delegator_user_view_menu',
'hook menu alter' => 'delegator_user_view_menu_alter',
+ 'task type' => 'page',
),
);
}
diff --git a/includes/collapsible-div.inc b/includes/collapsible-div.inc
deleted file mode 100644
index fa60660038af7f1c5c6c6a36006599fa556fda27..0000000000000000000000000000000000000000
--- a/includes/collapsible-div.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-// $Id$
-
-/**
- * @file
- * Theme function for the collapsible div tool.
- *
- * Call theme('ctools_collapsible', $handle, $content, $collapsed) to draw the
- * div. The theme function is not necessary; you can add the classes, js and css
- * yourself if you really want to.
- */
-
-function theme_ctools_collapsible($handle, $content, $collapsed = FALSE) {
- ctools_add_js('collapsible-div');
- ctools_add_css('collapsible-div');
-
- $class = $collapsed ? ' ctools-collapsed' : '';
- $output = '<div class="ctools-collapsible-container' . $class . '">';
- $output .= '<div class="ctools-collapsible-handle">';
- $output .= $handle;
- $output .= '</div>';
- $output .= '<div class="ctools-collapsible-content">';
- $output .= $content;
- $output .= '</div>';
- $output .= '</div>';
-
- return $output;
-}
\ No newline at end of file
diff --git a/includes/collapsible.theme.inc b/includes/collapsible.theme.inc
index a08550af7de9c86556e82e680cac8d845a5efa4f..a1f731768e7ed43ecb905d43901d72ceb2c4512c 100644
--- a/includes/collapsible.theme.inc
+++ b/includes/collapsible.theme.inc
@@ -3,11 +3,49 @@
/**
* @file
- * Theme registry for collapsible-div tool.
+ * Theme function for the collapsible div tool.
+ *
+ * Call theme('ctools_collapsible', $handle, $content, $collapsed) to draw the
+ * div. The theme function is not necessary; you can add the classes, js and css
+ * yourself if you really want to.
+ */
+
+/**
+ * Delegated implementation of hook_theme()
*/
function ctools_collapsible_theme(&$items) {
$items['ctools_collapsible'] = array(
'arguments' => array('handle' => NULL, 'content' => NULL, 'collapsed' => FALSE),
- 'file' => 'includes/collapsible-div.inc',
+ 'file' => 'includes/collapsible.theme.inc',
);
}
+
+/**
+ * Render a collapsible div.
+ *
+ * @todo Should this be a tpl.php with preprocess?
+ *
+ * @param $handle
+ * Text to put in the handle/title area of the div.
+ * @param $content
+ * Text to put in the content area of the div, this is what will get
+ * collapsed
+ * @param $collapsed = FALSE
+ * If true, this div will start out collapsed.
+ */
+function theme_ctools_collapsible($handle, $content, $collapsed = FALSE) {
+ ctools_add_js('collapsible-div');
+ ctools_add_css('collapsible-div');
+
+ $class = $collapsed ? ' ctools-collapsed' : '';
+ $output = '<div class="ctools-collapsible-container' . $class . '">';
+ $output .= '<div class="ctools-collapsible-handle">';
+ $output .= $handle;
+ $output .= '</div>';
+ $output .= '<div class="ctools-collapsible-content">';
+ $output .= $content;
+ $output .= '</div>';
+ $output .= '</div>';
+
+ return $output;
+}
\ No newline at end of file
diff --git a/includes/context-admin.inc b/includes/context-admin.inc
index a9d9ea0780df681e02e18067de196d319df955ae..d2b1532e8ffc84f63d7b95aab0607712ddb2e7b8 100644
--- a/includes/context-admin.inc
+++ b/includes/context-admin.inc
@@ -321,7 +321,7 @@ function ctools_context_ajax_item_add($module = NULL, $type = NULL, $object_name
// Give this item an id, which is really just the nth version
// of this particular context.
- $id = ctools_get_arg_id($ref, $name) + 1;
+ $id = ctools_context_next_id($ref, $name) + 1;
// Figure out the position for our new context.
$position = empty($ref) ? 0 : max(array_keys($ref)) + 1;
@@ -910,20 +910,6 @@ function ctools_save_context($type, &$ref, $form_values) {
$ref = $new;
}
-// TODO: Move this somewhere more appropriate
-function ctools_get_arg_id($arguments, $name) {
- // Figure out which instance of this argument we're creating
- $id = 0;
- foreach ($arguments as $arg) {
- if ($arg['name'] == $name) {
- if ($arg['id'] > $id) {
- $id = $arg['id'];
- }
- }
- }
- return $id;
-}
-
function ctools_get_keyword($page, $word) {
// Create a complete set of keywords
$keywords = array();
diff --git a/includes/context.inc b/includes/context.inc
index 3a7152fb717484255f012d44b0b9fe48eaec4470..23d6a1e44c74328c146af2f942c2b41232c38139 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -394,6 +394,30 @@ function ctools_context_id($context, $type = 'context') {
return $type . '_' . $context['name'] . '_' . $context['id'];
}
+/**
+ * Get the next id available given a list of already existing objects.
+ *
+ * This finds the next id available for the named object.
+ *
+ * @param $objects
+ * A list of context descriptor objects, i.e, arguments, relationships, contexts, etc.
+ * @param $name
+ * The name being used.
+ */
+function ctools_context_next_id($objects, $name) {
+ // Figure out which instance of this argument we're creating
+ $id = 0;
+ foreach ($objects as $object) {
+ if (isset($object['name']) && $object['name'] == $name) {
+ if ($object['id'] > $id) {
+ $id = $object['id'];
+ }
+ }
+ }
+ return $id;
+}
+
+
// ---------------------------------------------------------------------------
// Functions related to contexts from arguments.
diff --git a/includes/dropdown.theme.inc b/includes/dropdown.theme.inc
new file mode 100644
index 0000000000000000000000000000000000000000..c52f6b7c90a495ddcb284575fed35065269669c8
--- /dev/null
+++ b/includes/dropdown.theme.inc
@@ -0,0 +1,37 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Theme registry for dropdown-div tool.
+ */
+function ctools_dropdown_theme(&$items) {
+ $items['ctools_dropdown'] = array(
+ 'arguments' => array('title' => NULL, 'links' => NULL),
+ 'file' => 'includes/dropdown.theme.inc',
+ );
+}
+
+/**
+ * Create a dropdown menu.
+ */
+function theme_ctools_dropdown($title, $links, $class = '') {
+ // Provide a unique identifier for every dropdown on the page.
+ static $id = 0;
+ $id++;
+
+ $class = 'ctools-dropdown-no-js ctools-dropdown' . ($class ? (' ' . $class) : '');
+
+ ctools_add_js('dropdown');
+ ctools_add_css('dropdown');
+
+ $output = '';
+
+ $output .= '<div class="' . $class . '" id="ctools-dropdown-' . $id . '">';
+ $output .= '<a href="#" class="ctools-dropdown-link">' . check_plain($title) . '</a>';
+ $output .= '<div class="ctools-dropdown-container">';
+ $output .= theme('links', $links);
+ $output .= '</div>'; // container
+ $output .= '</div>'; // dropdown
+ return $output;
+}
diff --git a/js/dropdown.js b/js/dropdown.js
new file mode 100644
index 0000000000000000000000000000000000000000..67fcd6ae6722dabb57e68e2fae008d8f0708be81
--- /dev/null
+++ b/js/dropdown.js
@@ -0,0 +1,62 @@
+// $Id$
+
+Drupal.behaviors.CToolsDropdown = function() {
+ $('div.ctools-dropdown:not(.ctools-dropdown-processed)')
+ .removeClass('ctools-dropdown-no-js')
+ .addClass('ctools-dropdown-processed')
+ .each(function() {
+ var $dropdown = $(this);
+ var open = false;
+ var hovering = false;
+ var timerID = 0;
+
+ var toggle = function(close) {
+ // if it's open or we're told to close it, close it.
+ if (open || close) {
+ // If we're just toggling it, close it immediately.
+ if (!close) {
+ open = false;
+ $("div.ctools-dropdown-container", $dropdown).slideUp(100);
+ }
+ else {
+ // If we were told to close it, wait half a second to make
+ // sure that's what the user wanted.
+ // Clear any previous timer we were using.
+ if (timerID) {
+ clearTimeout(timerID);
+ }
+ timerID = setTimeout(function() {
+ if (!hovering) {
+ open = false;
+ $("div.ctools-dropdown-container", $dropdown).slideUp(100);
+ }}, 500);
+ }
+ }
+ else {
+ // open it.
+ open = true;
+ $("div.ctools-dropdown-container", $dropdown).animate({height: "show", opacity: "show"}, 100);
+ }
+ }
+ $("a.ctools-dropdown-link", $dropdown).click(function() {
+ toggle();
+ return false;
+ });
+
+ $dropdown.hover(
+ function() {
+ hovering = true;
+ }, // hover in
+ function() { // hover out
+ hovering = false;
+ toggle(true);
+ return false;
+ });
+ // @todo -- just use CSS for this noise.
+ $("div.ctools-dropdown-container a").hover(
+ function() { $(this).addClass('ctools-dropdown-hover'); },
+ function() { $(this).removeClass('ctools-dropdown-hover'); }
+ );
+ });
+};
+