? rules-533132.patch Index: rules_admin/rules_admin.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules_admin/Attic/rules_admin.css,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 rules_admin.css --- rules_admin/rules_admin.css 28 Mar 2009 21:54:18 -0000 1.1.2.1 +++ rules_admin/rules_admin.css 3 Aug 2009 08:43:47 -0000 @@ -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 =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules_admin/Attic/rules_admin.export.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 rules_admin.export.inc --- rules_admin/rules_admin.export.inc 15 Jul 2009 16:00:00 -0000 1.1.2.6 +++ rules_admin/rules_admin.export.inc 3 Aug 2009 08:43:47 -0000 @@ -120,14 +120,21 @@ function rules_admin_import_workflow_ng( } /** - * 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)); + $items = rules_get_configured_items($name); + if ($name === 'rules') { + // Filter out rules within rule sets, we only want event-triggered, + // standalone rules. + $items = array_filter($items, 'rules_admin_is_event_rule'); + $info['label'] = t('Triggered rules'); + } + $items = rules_admin_get_grouped_labels($items); if (count($items)) { $form['export'][$name] = array( '#type' => 'select', Index: rules_admin/rules_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules_admin/Attic/rules_admin.inc,v retrieving revision 1.1.2.10 diff -u -p -r1.1.2.10 rules_admin.inc --- rules_admin/rules_admin.inc 20 Apr 2009 11:45:58 -0000 1.1.2.10 +++ rules_admin/rules_admin.inc 3 Aug 2009 08:43:47 -0000 @@ -384,3 +384,7 @@ function rules_admin_add_crumbs($crumbs) drupal_set_breadcrumb($breadcrumb); } } + +function rules_admin_is_event_rule($rule) { + return !empty($rule['#set']) && strpos($rule['#set'], 'event_') === 0; +} \ No newline at end of file Index: rules_admin/rules_admin.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules_admin/Attic/rules_admin.module,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 rules_admin.module --- rules_admin/rules_admin.module 19 Apr 2009 21:21:31 -0000 1.1.2.5 +++ rules_admin/rules_admin.module 3 Aug 2009 08:43:47 -0000 @@ -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.render.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules_admin/Attic/rules_admin.render.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 rules_admin.render.inc --- rules_admin/rules_admin.render.inc 19 Apr 2009 15:03:43 -0000 1.1.2.2 +++ rules_admin/rules_admin.render.inc 3 Aug 2009 08:43:47 -0000 @@ -16,16 +16,30 @@ function theme_rules_admin_rule_render($ //add css $path = drupal_get_path('module', 'rules_admin') .'/rules_admin.css'; drupal_add_css($path, 'module', 'all', FALSE); + + if (rules_admin_is_event_rule($element)) { + // Render event headline on event-triggered rules + $events = rules_get_event_sets(); + $event_label = $events[$element['#set']]['label']; + $render['event_headline'] = array('#weight' => -10, '#value' => '

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

'); + } + else { + // Render rule set headline + $rulesets = rules_get_rule_sets(); + $ruleset_label = $rulesets[$element['#set']]['label']; + $render['event_headline'] = array('#weight' => -10, '#value' => '

'. t('IN rule set %ruleset', array('%ruleset' => $ruleset_label)) .'

'); + } + + if (isset($element['#conditions'][0])) { + $render['condition_headline'] = array('#weight' => -6, '#value' => '

'. t('IF') .'

'); + $render['conditions'] = $element['#conditions']; + $render['conditions']['#weight'] = 0; + + /* render the conditions of the rule like an AND */ + $render['conditions'] += array('#theme' => 'rules_operation', '#label' => t('AND'), '#_root' => TRUE); + } - $render['condition_headline'] = array('#weight' => -6, '#value' => '

'. t('Conditions') .'

'); - $render['conditions'] = $element['#conditions']; - $render['conditions']['#weight'] = 0; - /* render the conditions of the rule like an AND */ - - - $render['conditions'] += array('#theme' => 'rules_operation', '#label' => t('AND'), '#_root' => TRUE); - - $render['actions_headline'] = array('#weight' => 10, '#value' => '

'. t('Actions') .'

'); + $render['actions_headline'] = array('#weight' => 10, '#value' => '

'. t('DO') .'

'); $render['actions'] = $element['#actions']; $render['actions']['#weight'] = 20; Index: rules_admin/rules_admin.sets.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules_admin/Attic/rules_admin.sets.inc,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 rules_admin.sets.inc --- rules_admin/rules_admin.sets.inc 18 May 2009 12:05:20 -0000 1.1.2.8 +++ rules_admin/rules_admin.sets.inc 3 Aug 2009 08:43:47 -0000 @@ -195,7 +195,7 @@ function rules_admin_form_add_rule_set(& '#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 invoked. 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_argument $rows = array(); $headers = array( - t('Label'), t('Data type'), + t('Label'), t('Machine readable name'), ); @@ -355,8 +355,8 @@ function theme_rules_admin_form_argument // Build the table row. $row = array( 'data' => array( - 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]['label']), 'class' => 'rules-argument-label'), array('data' => drupal_render($form[$key]['name']), 'class' => 'rules-argument-name'), ), );