Index: rules_admin/rules_admin.module =================================================================== --- rules_admin/rules_admin.module (revision 2938) +++ rules_admin/rules_admin.module (working copy) @@ -20,10 +20,10 @@ define('RULES_ADMIN_RULE_PATH', RULES_ADMIN_PATH . function rules_help($path, $arg) { switch ($path) { case RULES_ADMIN_SET_PATH: - return '

'. t('Rule sets are similar in concept to subroutines and can be invoked by actions or manually by code or another module.') .'

'; + return '

'. t('Rule sets are similar in concept to subroutines and can be executed as actions or manually by code or another module.') .'

'; case RULES_ADMIN_TRIGGER_PATH: - return '

'. t('This is an overview about rules that are triggered by a certain event. A rule may contain conditions and actions, which are executed only when the conditions are met.') .'

'; + return '

'. t('This is an overview about all configured rules. A rule consists of an event and may contain conditions and actions. If the configured event occurs, it triggers the rule (the rule fires), which means that the conditions are evaluated and the actions are executed. Actions are executed only when the conditions are met.') .'

'; } } @@ -95,6 +95,7 @@ function rules_admin_menu() { $items[RULES_ADMIN_PATH .'/ie'] = array( 'title' => 'Import / Export', + 'description' => 'Display your rules as text or create new rules from pasted text.', 'page callback' => 'drupal_get_form', 'page arguments' => array('rules_admin_form_export'), 'access arguments' => array('administer rules'), @@ -118,6 +119,7 @@ function rules_admin_menu() { ); $items[RULES_ADMIN_PATH .'/settings'] = array( 'title' => 'Settings', + 'description' => 'Set display options, show/hide Rules messages.', 'page callback' => 'drupal_get_form', 'page arguments' => array('rules_admin_settings'), 'access arguments' => array('administer rules'), Index: rules_admin/rules_admin.sets.inc =================================================================== --- rules_admin/rules_admin.sets.inc (revision 2938) +++ rules_admin/rules_admin.sets.inc (working copy) @@ -195,7 +195,7 @@ function rules_admin_form_add_rule_set(&$form_stat '#suffix' => '', '#tree' => TRUE, '#theme' => 'rules_admin_form_arguments', - '#description' => t('You may specify some arguments, which have to be passed to the rule set when it is invoked. For each argument you have to specify a label, a certain data type and a unique machine readable name containing only alphanumeric characters, and underscores.'), + '#description' => t('You may specify some arguments, which have to be passed to the rule set when it is executed. For each argument you have to specify a certain data type, a label and a unique machine readable name containing only alphanumeric characters and underscores.'), ); foreach ($set_info['arguments'] as $name => $info) { $form['settings']['args'][$name] = _rules_admin_form_argument($name, $info); @@ -341,8 +341,8 @@ function theme_rules_admin_form_arguments($form) { $rows = array(); $headers = array( + t('Data type'), t('Label'), - t('Data type'), t('Machine readable name'), ); @@ -355,8 +355,8 @@ function theme_rules_admin_form_arguments($form) { // Build the table row. $row = array( 'data' => array( + array('data' => drupal_render($form[$key]['type']), 'class' => 'rules-argument-data-type'), array('data' => drupal_render($form[$key]['label']), 'class' => 'rules-argument-label'), - array('data' => drupal_render($form[$key]['type']), 'class' => 'rules-argument-data-type'), array('data' => drupal_render($form[$key]['name']), 'class' => 'rules-argument-name'), ), ); Index: rules_admin/rules_admin.render.inc =================================================================== --- rules_admin/rules_admin.render.inc (revision 2938) +++ rules_admin/rules_admin.render.inc (working copy) @@ -16,6 +16,13 @@ function theme_rules_admin_rule_render($element) { //add css $path = drupal_get_path('module', 'rules_admin') .'/rules_admin.css'; drupal_add_css($path, 'module', 'all', FALSE); + + // Render event headline if the rule is not in a rule set + if (strpos($element['#set'], 'event_') === 0) { + $events = rules_get_event_sets(); + $event_label = $events[$element['#set']]['label']; + $render['event_headline'] = array('#weight' => -10, '#value' => '

'. t('Event %event', array('%event' => $event_label)) .'

'); + } $render['condition_headline'] = array('#weight' => -6, '#value' => '

'. t('Conditions') .'

'); $render['conditions'] = $element['#conditions']; Index: rules_admin/rules_admin.css =================================================================== --- rules_admin/rules_admin.css (revision 2938) +++ rules_admin/rules_admin.css (working copy) @@ -30,7 +30,7 @@ div.logical-op-not { p.logical-op-add, h3.actions { margin-top: 2em; } -h3.conditions { +h3.conditions, h3.event { margin-top: 1em; } p.logical-op-add { Index: rules_admin/rules_admin.export.inc =================================================================== --- rules_admin/rules_admin.export.inc (revision 2956) +++ rules_admin/rules_admin.export.inc (working copy) @@ -120,14 +120,26 @@ function rules_admin_import_workflow_ng($import) { } /** - * Exports one ore more configurations + * Exports one or more configurations */ function rules_admin_form_export($form_state) { $form = array(); if (!isset($form_state['export'])) { $form['export'] = array('#tree' => TRUE); foreach (rules_get_items() as $name => $info) { - $items = rules_admin_get_grouped_labels(rules_get_configured_items($name)); + if ($name === 'rules') { + // filter out rules within rule sets, we only want event-triggered rules + $items = rules_get_configured_items($name); + foreach ($items as $key => $rule) { + if (strpos($rule['#set'], 'rules_') === 0) { + unset($items[$key]); + } + } + $items = rules_admin_get_grouped_labels($items); + } + else { + $items = rules_admin_get_grouped_labels(rules_get_configured_items($name)); + } if (count($items)) { $form['export'][$name] = array( '#type' => 'select',