Index: openacs-4/packages/rules/www/add-action.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-action.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/rules/www/add-action.tcl	16 Dec 2004 18:44:41 -0000	1.4
+++ openacs-4/packages/rules/www/add-action.tcl	17 Dec 2004 16:29:42 -0000	1.5
@@ -27,17 +27,15 @@
 }
 
 
-set actions { {"add user to" 1} {"add to list of" 2} {"add user to the system" 3}}
+set actions { {"Add Automatically" 1} {"Add to waiting list" 2} }
 set results [list]
-if { $default_action != 3 } {
 db_foreach communities { *SQL* } {
     lappend results [list $pretty_name $community_id]
 } 
-} else {
-    lappend  results [list "System" -1]
-}
+    lappend  results [list "to website" -1]
 
 
+
 form create add_action
 
 element create add_action rule_id\
@@ -50,7 +48,6 @@
      -widget select\
      -label "Action"\
      -options $actions\
-     -html { onChange getAction()}\
      -value $default_action
     
 element create add_action group_id\
Index: openacs-4/packages/rules/www/one-rule.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/one-rule.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/rules/www/one-rule.tcl	10 Dec 2004 17:34:27 -0000	1.7
+++ openacs-4/packages/rules/www/one-rule.tcl	17 Dec 2004 16:29:42 -0000	1.8
@@ -125,14 +125,11 @@
 	label "Action"
 	display_template {
 	    <if @rule_actions.action_type@ eq "1">
-	     Add user to
+	     Add Automatically
 	    </if>
 	    <if @rule_actions.action_type@ eq "2">
-	     Add to list for
+	     Add to waiting list
 	    </if>
-            <if @rule_actions.action_type@ eq "3">
-              Add user to the System
-            </if>
 	}
 
 	
@@ -144,15 +141,21 @@
             <%
 	    db_multirow communities communities {select community_id,pretty_name from dotlrn_communities_all}
             %>     <if @rule_actions.group_id@ eq -1>
-                   <option value=@rule_actions.group_id@>System
+                   <option value=@rule_actions.group_id@>to website
+	           <multiple name="communities">
+                   <option value=@communities.community_id@>@communities.pretty_name@
+                   </multiple>
                    </if>
                    <else>
                    <option value=@rule_actions.group_id@>@rule_actions.name@
                    <multiple name="communities">
+                   <if @rule_actions.group_id@ ne @communities.community_id@>
                    <option value=@communities.community_id@>@communities.pretty_name@
+                   </if>
                    </multiple>
+                   <option value=-1>to website
                    </select>
-                   </else>
+	          </else>
 	}