' . t('If you are upgrading to a newer version of Drupal or upgrading contributed modules or themes you may need to run !update-php.', array('!update-php' => l('update.php', 'update.php'))) . '
'; } - case 'admin/config/system/actions': - case 'admin/config/system/actions/manage': + case 'admin/config/workflow/actions': + case 'admin/config/workflow/actions/manage': $output = ''; $output .= '' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration, and are listed here automatically. Advanced actions can do more than simple actions; for example, send an e-mail to a specified address, or check for certain words within a piece of content. These actions need to be created and configured first before they may be used. To create an advanced action, select the action from the drop-down list in the advanced action section below and click the Create button.') . '
'; if (module_exists('trigger')) { $output .= '' . t('You may proceed to the Triggers page to assign these actions to system events.', array('@url' => url('admin/structure/trigger'))) . '
'; } return $output; - case 'admin/config/system/actions/configure': + case 'admin/config/workflow/actions/configure': return t('An advanced action offers additional configuration options which may be filled out below. Changing the Description field is recommended, in order to better identify the precise action taking place. This description will be displayed in modules such as the Trigger module when assigning actions to system events, so it is best if it is as descriptive as possible (for example, "Send e-mail to Moderation Team" rather than simply "Send e-mail").'); case 'admin/config/people/ip-blocking': return '' . t('IP addresses listed here are blocked from your site before any modules are loaded. You may add IP addresses to the list, or delete existing entries.') . '
'; @@ -584,6 +584,7 @@ function system_menu() { 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', ); + // Appearance. $items['admin/appearance'] = array( 'title' => 'Appearance', @@ -696,15 +697,22 @@ function system_menu() { 'file' => 'system.admin.inc', ); - // Actions. - $items['admin/config/system/actions'] = array( + // Workflow. + $items['admin/config/workflow'] = array( + 'title' => 'Workflow', + 'description' => 'Editorial workflow and automation tools.', + 'page callback' => 'system_admin_menu_block_page', + 'access arguments' => array('access administration pages'), + 'file' => 'system.admin.inc', + ); + $items['admin/config/workflow/actions'] = array( 'title' => 'Actions', 'description' => 'Manage the actions defined for your site.', 'access arguments' => array('administer actions'), 'page callback' => 'system_actions_manage', 'file' => 'system.admin.inc', ); - $items['admin/config/system/actions/manage'] = array( + $items['admin/config/workflow/actions/manage'] = array( 'title' => 'Manage actions', 'description' => 'Manage the actions defined for your site.', 'page callback' => 'system_actions_manage', @@ -712,7 +720,7 @@ function system_menu() { 'weight' => -2, 'file' => 'system.admin.inc', ); - $items['admin/config/system/actions/configure'] = array( + $items['admin/config/workflow/actions/configure'] = array( 'title' => 'Configure an advanced action', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_actions_configure'), @@ -720,7 +728,7 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); - $items['admin/config/system/actions/delete/%actions'] = array( + $items['admin/config/workflow/actions/delete/%actions'] = array( 'title' => 'Delete action', 'description' => 'Delete an action.', 'page callback' => 'drupal_get_form', @@ -729,7 +737,7 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); - $items['admin/config/system/actions/orphan'] = array( + $items['admin/config/workflow/actions/orphan'] = array( 'title' => 'Remove orphans', 'page callback' => 'system_actions_remove_orphans', 'access arguments' => array('administer actions'), @@ -939,6 +947,7 @@ function system_menu() { 'file' => 'system.admin.inc', ); + // Search. $items['admin/config/search'] = array( 'title' => 'Search and metadata', 'description' => 'Local site search, metadata and SEO.', @@ -962,6 +971,8 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); + + // Content authoring. $items['admin/config/content'] = array( 'title' => 'Content authoring', 'description' => 'Settings related to formatting and authoring content.', diff --git modules/trigger/trigger.admin.inc modules/trigger/trigger.admin.inc index c649b3e..dee2431 100644 --- modules/trigger/trigger.admin.inc +++ modules/trigger/trigger.admin.inc @@ -177,7 +177,7 @@ function trigger_assign_form($form, $form_state, $module, $hook, $label) { } else { $form[$hook]['none'] = array( - '#markup' => t('No actions available for this trigger. Add action.', array('@link' => url('admin/config/system/actions/manage'))) + '#markup' => t('No actions available for this trigger. Add action.', array('@link' => url('admin/config/workflow/actions/manage'))) ); } return $form; diff --git modules/trigger/trigger.module modules/trigger/trigger.module index 0f4eb28..2685273 100644 --- modules/trigger/trigger.module +++ modules/trigger/trigger.module @@ -11,7 +11,7 @@ * Implements hook_help(). */ function trigger_help($path, $arg) { - $explanation = '' . t('Triggers are system events, such as when new content is added or when a user logs in. The trigger module associates these triggers with actions (functional tasks), such as unpublishing content or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure additional actions.', array('@url' => url('admin/config/system/actions'))) . '
'; + $explanation = '' . t('Triggers are system events, such as when new content is added or when a user logs in. The trigger module associates these triggers with actions (functional tasks), such as unpublishing content or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure additional actions.', array('@url' => url('admin/config/workflow/actions'))) . '
'; switch ($path) { case 'admin/structure/trigger/comment': return $explanation . '' . t('Below you can assign actions to run when certain comment-related triggers happen. For example, you could promote a post to the front page when a comment is added.') . '
'; @@ -24,7 +24,7 @@ function trigger_help($path, $arg) { case 'admin/structure/trigger/user': return $explanation . '' . t("Below you can assign actions to run when certain user-related triggers happen. For example, you could send an e-mail to an administrator when a user account is deleted.") . '
'; case 'admin/help#trigger': - $output = '' . t('The Trigger module provides the ability to trigger actions upon system events, such as when new content is added or when a user logs in.', array('@actions' => url('admin/config/system/actions'))) . '
'; + $output = '' . t('The Trigger module provides the ability to trigger actions upon system events, such as when new content is added or when a user logs in.', array('@actions' => url('admin/config/workflow/actions'))) . '
'; $output .= '' . t('The combination of actions and triggers can perform many useful tasks, such as e-mailing an administrator if a user account is deleted, or automatically unpublishing comments that contain certain words. By default, there are five "contexts" of events (Comments, Content, Cron, Taxonomy, and Users), but more may be added by additional modules.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Trigger module.', array('@trigger' => 'http://drupal.org/handbook/modules/trigger/')) . '
'; return $output; diff --git modules/trigger/trigger.test modules/trigger/trigger.test index 001a289..826a7ce 100644 --- modules/trigger/trigger.test +++ modules/trigger/trigger.test @@ -150,7 +150,7 @@ class TriggerCronTestCase extends DrupalWebTestCase { 'actions_label' => $action_label, 'subject' => $action_label, ); - $this->drupalPost('admin/config/system/actions/configure/' . $hash, $edit, t('Save')); + $this->drupalPost('admin/config/workflow/actions/configure/' . $hash, $edit, t('Save')); $aid = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'trigger_test_system_cron_conf_action'))->fetchField(); // $aid is likely 3 but if we add more uses for the sequences table in // core it might break, so it is easier to get the value from the database. @@ -163,7 +163,7 @@ class TriggerCronTestCase extends DrupalWebTestCase { 'actions_label' => $action_label, 'subject' => $action_label, ); - $this->drupalPost('admin/config/system/actions/configure/' . $hash, $edit, t('Save')); + $this->drupalPost('admin/config/workflow/actions/configure/' . $hash, $edit, t('Save')); $edit = array('aid' => md5($aid + 1)); $this->drupalPost('admin/structure/trigger/system', $edit, t('Assign'));