Index: modules/linodef_taglists/linodef_taglists.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/linodef/modules/linodef_taglists/Attic/linodef_taglists.module,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 linodef_taglists.module --- modules/linodef_taglists/linodef_taglists.module 19 Dec 2009 02:38:17 -0000 1.1.2.3 +++ modules/linodef_taglists/linodef_taglists.module 10 Dec 2010 15:57:27 -0000 @@ -17,11 +17,11 @@ * @author Roi Danton */ -// ___________________________________________________________________________¸ +// ___________________________________________________________________________� // 1) Retrieve the data object list data for Linodef submodules that adds (or // provides functions for) contrib editor buttons and return a formatted // list of items with links. -// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +// ��������������������������������������������������������������������������� /** * Loads a taglist definition from the table. @@ -117,6 +117,9 @@ function linodef_taglists_load($tlid) { case 'getallviews': $taglist->content = _linodef_taglists_getallviews($taglist->tagoptionstransformed['string'], $taglist->properties); break; + case 'getsomeviews': + $taglist->content = _linodef_taglists_getsomeviews($taglist->source['source'], $taglist->tagoptionstransformed['string'], $taglist->properties); + break; } // Set cache. @@ -301,9 +304,9 @@ function linodef_taglists_field_labels($ return is_array($labels) ? $labels : FALSE; } -// ___________________________________________________________________________¸ +// ___________________________________________________________________________� // 2) Drupal hooks. -// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +// ��������������������������������������������������������������������������� /** * Implementation of hook_menu(). Index: modules/linodef_taglists/includes/admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/linodef/modules/linodef_taglists/includes/Attic/admin.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 admin.inc --- modules/linodef_taglists/includes/admin.inc 25 Mar 2010 15:40:57 -0000 1.1.2.3 +++ modules/linodef_taglists/includes/admin.inc 10 Dec 2010 15:57:28 -0000 @@ -84,6 +84,14 @@ function linodef_taglists_admin_taglists // Source. $source = $taglist->source['source']; + if (is_array($source)) { + foreach($source as $key => $val) { + if (!empty($val)){ + $active_sources[] = $val; + } + } + $source = implode(', ', $active_sources); + } // Add view display and arguments. if ($taglist->source['display']) { $source .= '
(' . $taglist->source['display']; @@ -477,6 +485,16 @@ function linodef_taglists_wizard_source_ $form['message'] = array('#value' => t('No source required.'), '#prefix' => '
', '#suffix' => '
'); $form['skip'] = array('#type' => 'hidden', '#value' => TRUE); } + elseif ($form_state['taglist']->sourcetype == 'getsomeviews') { + $options = linodef_taglists_wizard_form_source_options($form_state['taglist']->objecttype, $form_state['taglist']->sourcetype); + $form['source'] = array( + '#type' => 'checkboxes', + '#title' => t('Choose the objects'), + '#default_value' => $form_state['taglist']->source['source'] ? $form_state['taglist']->source['source'] : NULL, + '#options' => $options['source'], + '#tree' => TRUE + ); + } else { ctools_include('dependent'); $options = linodef_taglists_wizard_form_source_options($form_state['taglist']->objecttype, $form_state['taglist']->sourcetype); @@ -848,7 +866,10 @@ function linodef_taglists_wizard_form_so $output['vocabulary'] = t('using a vocabulary'); break; case 'views': - return array('getallviews' => t('creating a list of all views')); + return array( + 'getallviews' => t('creating a list of all views'), + 'getsomeviews' => t('creating a list containing specific views') + ); } $output['view'] = t('using a view'); return array_reverse($output, TRUE); @@ -861,6 +882,12 @@ function linodef_taglists_wizard_form_so function linodef_taglists_wizard_form_source_options($objecttype, $sourcetype) { $output = array(); switch ($sourcetype) { + case 'getsomeviews': + $views = views_get_all_views(); + foreach ($views as $view) { + $output['source'][$view->name] = $view->name; + } + return $output; case 'view': switch ($objecttype) { case 'nodes': Index: modules/linodef_taglists/includes/pages.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/linodef/modules/linodef_taglists/includes/Attic/pages.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 pages.inc --- modules/linodef_taglists/includes/pages.inc 14 Dec 2009 20:31:51 -0000 1.1.2.2 +++ modules/linodef_taglists/includes/pages.inc 10 Dec 2010 15:57:28 -0000 @@ -83,6 +83,9 @@ function linodef_taglists_popup($tlid, $ $GLOBALS['devel_shutdown'] = FALSE; // Suppress admin_menu. Thx to advanced help. module_invoke('admin_menu', 'suppress'); + // Suppress environment_indicator. + module_invoke('environment_indicator', 'suppress'); + // Don't use default theming header, instead use custom theme file from linodef. Therefore we use print(). print theme('linodef_taglists_popup', $title, $taglist->name, $text, $taglist_content, $calling_module, $instanceID); return; Index: modules/linodef_taglists/includes/taglist.load.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/linodef/modules/linodef_taglists/includes/Attic/taglist.load.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 taglist.load.inc --- modules/linodef_taglists/includes/taglist.load.inc 25 Mar 2010 15:40:57 -0000 1.1.2.2 +++ modules/linodef_taglists/includes/taglist.load.inc 10 Dec 2010 15:57:28 -0000 @@ -309,6 +309,46 @@ function _linodef_taglists_getallviews($ } /** + * Get data for button: List some views. + * + * @param string $viewnames + * List of view IDs to be included. + * @param string $option_string + * Linodef tag options separated by comma. + * @param string $tl_properties + * Properties of the taglist. + * @return + * array + * - data: the button list + * - tag: the tag to be inserted + * - desc: the description for the editor button + * - name: the label/name of the element the data was retrieved from + * - element type + * - element + * string + * if vid not found a message is returned which should appear in editor text field (depends on Linodef submodule for editor) + */ +function _linodef_taglists_getsomeviews($viewnames, $option_string, $tl_properties) { + if (module_exists('views')) { + $output = array(); + $all_views = array(); + + foreach($viewnames as $key => $val) { + if (!empty($val)){ + $all_views[] = views_get_view($val); + } + } + foreach ($all_views as $i => $item) { + $output[$i] = array('tag' => '[#' . $item->name . $option_string . $comment . ']', 'desc' => $item->name); + } + return $output; + } + else { + return linodef_message(array('warning' => array('activate module' => 'Views'))); + } +} + +/** * Helper function for _linodef_taglists_getelementssbyviewname(). * Investigate the result of a view. *