cvs diff: Diffing . ? .buildpath ? .project ? bin Index: skeleton.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skeleton/skeleton.module,v retrieving revision 1.19 diff -u -p -r1.19 skeleton.module --- skeleton.module 16 Jul 2009 18:12:35 -0000 1.19 +++ skeleton.module 27 Aug 2009 19:13:14 -0000 @@ -157,7 +157,7 @@ function skeleton_menu() { $items['admin/content/skeleton/template/%skeleton_template/view'] = array( 'page callback' => 'skeleton_view_template', 'page arguments' => array(4), - 'access arguments' => array('configure skeleton outlines'), + 'access callback' => '_skeleton_user_can_view', 'type' => MENU_LOCAL_TASK, 'weight' => -5, 'title' => 'View template', Index: skeleton_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skeleton/skeleton_admin.inc,v retrieving revision 1.13 diff -u -p -r1.13 skeleton_admin.inc --- skeleton_admin.inc 5 Feb 2009 20:33:33 -0000 1.13 +++ skeleton_admin.inc 27 Aug 2009 19:13:14 -0000 @@ -26,19 +26,18 @@ function skeleton_admin() { while ($template = db_fetch_object($template_result)) { $node = (object)unserialize($template->node_data); module_exists('translation') ? $language = ' (' . locale_language_name($node->language) . ')': $language = ''; - $templates[] = l(check_plain($template->template) . $language, 'admin/content/skeleton/template/' . $template->template_id . '/edit'); + $templates[] = l(check_plain($template->template) . $language, 'admin/content/skeleton/template/' . $template->template_id .'/view'); } - $extra = $extra2 = $extra3 = ''; + $operations = array(); if (_skeleton_user_can_create_instance()) { - $extra = l(t('create new instance'), 'admin/content/skeleton/skeleton/'. $skeleton->skeleton_id . '/create'); + $operations[] = l(t('create new instance'), 'admin/content/skeleton/skeleton/'. $skeleton->skeleton_id . '/create'); } if (user_access('configure skeleton outlines')) { - $extra2 = l(t('edit skeleton'), 'admin/content/skeleton/skeleton/'. $skeleton->skeleton_id . '/edit'); - $extra3 = l(t('delete skeleton'), 'admin/content/skeleton/skeleton/'. $skeleton->skeleton_id . '/delete'); + $operations[] = l(t('edit skeleton'), 'admin/content/skeleton/skeleton/'. $skeleton->skeleton_id . '/edit'); + $operations[] = l(t('delete skeleton'), 'admin/content/skeleton/skeleton/'. $skeleton->skeleton_id . '/delete'); } - $operations = theme('item_list', array($extra, $extra2, $extra3)); - $rows[] = array(check_plain($skeleton->skeleton), theme('item_list', $templates), $operations); + $rows[] = array(check_plain($skeleton->skeleton), theme('item_list', $templates), theme('item_list', $operations)); } if (!empty($rows)) { return theme('table', $header, $rows);