Index: openacs-4/packages/beehive/www/create-edit-session2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/create-edit-session2.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/beehive/www/create-edit-session2.adp	24 Jul 2006 03:01:12 -0000	1.4
+++ openacs-4/packages/beehive/www/create-edit-session2.adp	26 Sep 2006 00:57:14 -0000	1.5
@@ -50,22 +50,18 @@
 
 
 
-<if @edit_flage@ not eq 0>
-New
-</if>
+<h1>
 #beehive.Stored_Session_Title# 
  "@technique_name@"
 )
-</h1>
 
 
 
-<br>
 <input type = "submit" value ="#beehive.Continue# ">
-<br>
-<br>
+</h1>
+
 <hr>
-<h1> #beehive.Tasks# </h1>
+
 <table cellspacing="2" cellpadding="2" border="0">
 
 
@@ -102,9 +98,6 @@
 
 
 <tr class="form-element"><td class="form-widget">
-<br>
-<b>#beehive.Administrator_Facilitator_Tasks#  </b> 
-<br>
 
 
 <u> #beehive.Managements_Tasks#  </u>
@@ -126,6 +119,23 @@
 
 <input type = "checkbox" name="t5" value ="checked" checked = "true" onclick="return deny(this);"> <font color="#FF0000">  #beehive.Session_Controlling_timer#| <a href= "/beehive/more-task?num=5"> #beehive.Tasks_more# </a> </font>
 <br>
+
+<input type = "checkbox" name="taskn.9" value ="checked"   @t9@> <font color="#333399"> #beehive.Monitoring# | <a href= "/beehive/more-task?num=9"> #beehive.Tasks_more#</a></font>
+<br>
+
+
+<input type = "checkbox" name="taskn.7" value ="checked" @t7@ > <font color="#333399"> #beehive.Tracking# | <a href= "/beehive/more-task?num=7"> #beehive.Tasks_more#</a></font>
+<br>
+<input type = "checkbox" name="taskn.8" value ="checked"   @t8@><font color="#333399">  #beehive.Facilitator_Asking# | <a href= "/beehive/more-task?num=8"> #beehive.Tasks_more#</a></font>
+<br>
+<input type = "checkbox" name="taskn.31" value ="checked"    @t31@><font color="#333399"> #beehive.Note_taking# | <a href= "/beehive/more-task?num=31"> #beehive.Tasks_more#</a> </font>
+
+
+
+<br>
+
+
+<br>
 <u> #beehive.Resources_Provision_Tasks#</u>
 <br>
 
@@ -140,7 +150,10 @@
 <br>
 <input type = "checkbox" name="taskn.13" value ="checked"   @t13@ onclick="return deny2(this);"><font color="#306754"> #beehive.Providing_info_Role#| <a href= "/beehive/more-task?num=13"> #beehive.Tasks_more#</a></font>
 <br>
+<input type = "checkbox" name="taskn.15" value ="checked"   @t15@> <font color="#306754"> #beehive.Overview#| <a href= "/beehive/more-task?num=15"> #beehive.Tasks_more#</a></font> 
 
+<br>
+
 <!--
 <u> #beehive.Staged_provision_Tasks#</u> <br>
 -->
@@ -149,19 +162,16 @@
 
 <br>
 
-<u>#beehive.Guiding_Tasks#</u>
+<u>#beehive.Feedback_Tasks#</u>
 <br>
 
-<input type = "checkbox" name="taskn.9" value ="checked"   @t9@> <font color="#333399"> #beehive.Monitoring# | <a href= "/beehive/more-task?num=9"> #beehive.Tasks_more#</a></font>
+<input type = "checkbox" name="taskn.17" value ="checked"   @t17@> <font color="#306754"> #beehive.Presenting_question# | <a href= "/beehive/more-task?num=17"> #beehive.Tasks_more#</a></font> 
 <br>
-
-
-<input type = "checkbox" name="taskn.7" value ="checked" @t7@ > <font color="#333399"> #beehive.Tracking# | <a href= "/beehive/more-task?num=7"> #beehive.Tasks_more#</a></font>
+<input type = "checkbox" name="taskn.36" value ="checked"    @t36@><font color="#306754"> #beehive.yes_no_voting#| <a href= "/beehive/more-task?num=36"> #beehive.Tasks_more#</a></font>    
 <br>
-<input type = "checkbox" name="taskn.8" value ="checked"   @t8@><font color="#333399">  #beehive.Facilitator_Asking# | <a href= "/beehive/more-task?num=8"> #beehive.Tasks_more#</a></font>
+<input type = "checkbox" name="taskn.14" value ="checked"   @t14@ ><font color="#306754"> #beehive.Providing_Survey#</font> 
 <br>
-
-<input type = "checkbox" name="taskn.15" value ="checked"   @t15@> <font color="#306754"> #beehive.Overview#| <a href= "/beehive/more-task?num=15"> #beehive.Tasks_more#</a></font> 
+<input type = "checkbox" name="taskn.29" value ="checked"    @t29@><font color="#306754"> #beehive.Submitting_own_resolution# | <a href= "/beehive/more-task?num=29"> #beehive.Tasks_more#</a></font>   
 <br>
 <input type = "checkbox" name="taskn.34" value ="checked"   @t34@><font color="#306754"> #beehive.Debriefing# | <a href= "/beehive/more-task?num=34"> #beehive.Tasks_more#</a></font> 
 <br>
@@ -170,6 +180,7 @@
 
 
 
+
 <!--
 <u>#beehive.Assessments#</u>
 <br>
@@ -190,8 +201,7 @@
 </td>  
 
 <td class="form-widget">  
-<b>#beehive.Participant_Tasks#  </b> 
-<br>
+
 <u>#beehive.Group_level_Tasks#</u>
 <br>
 
@@ -253,14 +263,6 @@
 <input type = "checkbox" name="taskn.32" value ="checked"    @t32@><font color="#306754"> #beehive.Video_conferencing#  </font>
 
 <br>
-
-<input type = "checkbox" name="taskn.17" value ="checked"   @t17@> <font color="#306754"> #beehive.Presenting_question# | <a href= "/beehive/more-task?num=17"> #beehive.Tasks_more#</a></font> 
-<br>
-<input type = "checkbox" name="taskn.36" value ="checked"    @t36@><font color="#306754"> #beehive.yes_no_voting#| <a href= "/beehive/more-task?num=36"> #beehive.Tasks_more#</a></font>    
-<br>
-<input type = "checkbox" name="taskn.14" value ="checked"   @t14@ ><font color="#306754"> #beehive.Providing_Survey#</font> 
-<br>
-
 <input type = "checkbox" name="taskn.18" value ="checked"   @t18@> <font color="#306754">#beehive.Providing_slides#   <input type = "text" name = "sln" value ="@sln@" size="2">#beehive.Slides_number# | <a href= "/beehive/more-task?num=18"> #beehive.Tasks_more#</a> </font> 
 <br>
 
@@ -271,24 +273,20 @@
 <u>#beehive.Individual_Tasks#</u>
 <br>
 <input type = "checkbox" name="taskn.28" value ="checked"    @t28@><font color="#306754"> #beehive.Silent_thinking#| <a href= "/beehive/more-task?num=28"> #beehive.Tasks_more#</a></font> 
+
 <br>
-<input type = "checkbox" name="taskn.29" value ="checked"    @t29@><font color="#306754"> #beehive.Submitting_own_resolution# | <a href= "/beehive/more-task?num=29"> #beehive.Tasks_more#</a></font>   
+<input type = "checkbox" name="taskn.30" value ="checked"    @t30@><font color="#306754"> #beehive.self_annotating#| </font>
 
 <br>
 <input type = "checkbox" name="taskn.6" value ="checked"   @t6@> <font color="#306754"> #beehive.Internet_searching#  | <a href= "/beehive/more-task?num=6"> #beehive.Tasks_more#</a></font> 
 
 <br>
-<input type = "checkbox" name="taskn.30" value ="checked"    @t30@><font color="#306754"> #beehive.self_annotating#| </font>
 
-<br>
-<input type = "checkbox" name="taskn.31" value ="checked"    @t31@><font color="#333399"> #beehive.Note_taking# | <a href= "/beehive/more-task?num=31"> #beehive.Tasks_more#</a> </font>
 
 
-<br>
 
 
 
-
 </td> </tr>  
 
 
Index: openacs-4/packages/beehive/www/create-edit-session5.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/create-edit-session5.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/beehive/www/create-edit-session5.tcl	10 Jul 2006 02:21:10 -0000	1.3
+++ openacs-4/packages/beehive/www/create-edit-session5.tcl	26 Sep 2006 00:57:14 -0000	1.4
@@ -114,7 +114,7 @@
 
 if { $t28 == "checked" } {
     ad_form -extend -name activity_entery_form1 -form {
-	{individualtext:text(textarea)
+	{individualtext:text(textarea),optional
             
 	    {html {  cols 60  rows 10}}
 	    {label "#beehive.individual_Info#"}
Index: openacs-4/packages/beehive/www/create-edit-session6.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/create-edit-session6.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/beehive/www/create-edit-session6.adp	24 Jul 2006 03:01:13 -0000	1.4
+++ openacs-4/packages/beehive/www/create-edit-session6.adp	26 Sep 2006 00:57:14 -0000	1.5
@@ -13,21 +13,26 @@
 tooli = iii*4 + 8;
 var st = eval("document.form1.elements[tooli].selectedIndex");
 var toolname = eval("document.form1.elements[tooli].options[st].text");
-if (toolname == "Slides" || toolname == "Debriefing" || toolname == "Evaluation"  || toolname == "Overview"  ) {
+if ( toolname == "Debriefing-EntireSession" || toolname == "Evaluation-EntireSession"  || toolname == "audioOverview-EntireSession"  ) {
 var fa = "facilitator";
 eval("document.form1.elements[tri].options[0].value" + "=fa" );
 eval("document.form1.elements[tri].options[0].text" + "=fa" );
 
 }
 
-if (toolname == "InternetSearch" || toolname == "IndividualWriting" || toolname == "IdeasVoting" || toolname == "YesNo" || toolname == "OwnResolution"  || toolname == "SilentThinking" || toolname == "DynamicLink"   || toolname == "IdeasDiscussion" || toolname == "SessionInfo" || toolname == "GroupInfo" || toolname == "RoleInfo" || toolname == "Survey" || toolname == "SmallGroupAnnotating"|| toolname == "LargeGroupAnnotating" || toolname == "QA" || toolname == "IndividualAnnotating") {
+
+if (toolname == "IndividualImageDrawing-None" || toolname == "InternetSearch-None" || toolname == "IndividualTextWriting-None"  || toolname == "IdeasDiscussion-SmallGroup" || toolname == "IdeasVoting-SmallGroup"  || toolname == "IdeasPosting-SmallGroup"  ||  toolname == "DownloadFile-EntireSession"    || toolname == "textInfo-EntireSession" || toolname == "textInfo-SmallGroup" || toolname == "textInfo-Role" || toolname == "Survey-EntireSession"  || toolname == "QA-EntireSession" || toolname == "YesNo-EntireSession"  ) {
 var fa = "all";
 eval("document.form1.elements[tri].options[0].value" + "=fa" );
 eval("document.form1.elements[tri].options[0].text" + "=fa" );
 
 }
 
 
+
+
+
+
 }
 
 
Index: openacs-4/packages/beehive/www/create-edit-session6.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/create-edit-session6.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/beehive/www/create-edit-session6.tcl	10 Jul 2006 02:21:10 -0000	1.3
+++ openacs-4/packages/beehive/www/create-edit-session6.tcl	26 Sep 2006 00:57:14 -0000	1.4
@@ -69,103 +69,103 @@
 template::multirow foreach info {
       
       if {$t18 == "checked" } {
-      	set tools [linsert $tools end "Slides"]
+      	set tools [linsert $tools end "Slides-EntireSession"]
       }
       if {$t22 == "checked" } {
-      	set tools [linsert $tools end "SmallGroupDisscussion"]
+      	set tools [linsert $tools end "Disscussion-SmallGroup"]
       }
      if {$t23 == "checked" } {
-      	set tools [linsert $tools end "LargeGroupDisscussion"]
+      	set tools [linsert $tools end "Disscussion-EntireSession"]
       }
      if {$t24 == "checked" } {
-      	set tools [linsert $tools end "RolesDisscussion"]
+      	set tools [linsert $tools end "Disscussion-Roles"]
       }
       
       
       if {$t26 == "checked" } {
-      	set tools [linsert $tools end "IdeasPosting"]
+      	set tools [linsert $tools end "IdeasPosting-SmallGroup"]
       } 
 	if {$t38 == "checked" } {
-      	set tools [linsert $tools end "IdeasDiscussion"]
+      	set tools [linsert $tools end "IdeasDiscussion-SmallGroup"]
       }
       if {$t35 == "checked" } {
-      	set tools [linsert $tools end "IdeasVoting"]
+      	set tools [linsert $tools end "IdeasVoting-SmallGroup"]
       }
       if {$t27 == "checked" } {
-      	set tools [linsert $tools end "IceBreaking"]
+      	set tools [linsert $tools end "IceBreaking-SmallGroup"]
       } 
       if {$t37 == "checked" } {
-      	set tools [linsert $tools end "SmallGroupSharedText"]
+      	set tools [linsert $tools end "SharedText-SmallGroup"]
       }
       if {$t10 == "checked" } {
-      	set tools [linsert $tools end "LargeGroupSharedText"]
+      	set tools [linsert $tools end "SharedText-EntireSession"]
       }
       
       if {$t20 == "checked" } {
-      	set tools [linsert $tools end "SmallGroupImageAnnotation"]
+      	set tools [linsert $tools end "ImageDrawingAnnotating-SmallGroup"]
       } 
       if {$t11 == "checked" } {
-      	set tools [linsert $tools end "LargeGroupImageAnnotation"]
+      	set tools [linsert $tools end "ImageDrawingAnnotating-EntireSession"]
       }
       if {$t2 == "checked" } {
-      	set tools [linsert $tools end "SmallGrouptextDiscussion"]
+      	set tools [linsert $tools end "textDiscussingAnnotating-SmallGroup"]
       } 
       if {$t3 == "checked" } {
-      	set tools [linsert $tools end "LargeGrouptextDiscussion"]
+      	set tools [linsert $tools end "textDiscussingAnnotating-EntireSession"]
       }
           
       if {$t32 == "checked" } {
-      	set tools [linsert $tools end "Conferencing"]
+      	set tools [linsert $tools end "Conferencing-EntireSession"]
       } 
 
       if {$t34 == "checked" } {
-      	set tools [linsert $tools end "Debriefing"]
+      	set tools [linsert $tools end "Debriefing-EntireSession"]
       }     
       
       if {$t19 == "checked" } {
-      	set tools [linsert $tools end "Evaluation"]
+      	set tools [linsert $tools end "Evaluation-EntireSession"]
       } 
      if {$t30 == "checked" } {
-      	set tools [linsert $tools end "Summarizing"]
+      	set tools [linsert $tools end "Summarizing-EntireSession"]
       }
       
       if {$t36 == "checked" } {
-      	set tools [linsert $tools end "YesNo"]
+      	set tools [linsert $tools end "YesNo-EntireSession"]
       }  
         
       if {$t17 == "checked" } {
-      	set tools [linsert $tools end "QA"]
+      	set tools [linsert $tools end "QA-EntireSession"]
       }  
 	if {$t14 == "checked" } {
-      	set tools [linsert $tools end "Survey"]
+      	set tools [linsert $tools end "Survey-EntireSession"]
       } 
       if {$t12 == "checked" } {
-      	set tools [linsert $tools end "SessionInfo"]
+      	set tools [linsert $tools end "textInfo-EntireSession"]
       } 
       if {$t4 == "checked" } {
-      	set tools [linsert $tools end "GroupInfo"]
+      	set tools [linsert $tools end "textInfo-SmallGroup"]
       }
       if {$t13 == "checked" } {
-      	set tools [linsert $tools end "RoleInfo"]
+      	set tools [linsert $tools end "textInfo-Role"]
       } 
       if {$t15 == "checked" } {
-      	set tools [linsert $tools end "Overview"]
+      	set tools [linsert $tools end "audioOverview-EntireSession"]
       }  
       if {$t33 == "checked" } {
-      	set tools [linsert $tools end "DownloadFile"]
+      	set tools [linsert $tools end "DownloadFile-EntireSession"]
       }  
        
       if {$t29 == "checked" } {
-      	set tools [linsert $tools end "OwnResolution"]
+      	set tools [linsert $tools end "OwnResolution-EntireSession"]
       } 
       if {$t28 == "checked" } {
-      	set tools [linsert $tools end "SilentThinking"]
+      	set tools [linsert $tools end "IndividualTextWriting-None"]
       }
       if {$t30 == "checked" } {
-      	set tools [linsert $tools end "IndividualAnnotating"]
+      	set tools [linsert $tools end "IndividualImageDrawing-None"]
       } 
       if {$t6 == "checked" } {
-      	set tools [linsert $tools end "InternetSearch"]
+      	set tools [linsert $tools end "InternetSearch-None"]
       }
       
 
Index: openacs-4/packages/beehive/www/create-edit-session7.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/create-edit-session7.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/beehive/www/create-edit-session7.tcl	10 Jul 2006 02:21:10 -0000	1.3
+++ openacs-4/packages/beehive/www/create-edit-session7.tcl	26 Sep 2006 00:57:14 -0000	1.4
@@ -313,7 +313,7 @@
 
 for {set i 0} {$i < [llength $toolsl]} {incr i} { 
 	set envt [linsert $envt end "1"]
-	if {[lindex  $toolsl $i] == "IdeasPosting" } {
+	if {[lindex  $toolsl $i] == "IdeasPosting-SmallGroup" } {
       		set tools [linsert $tools end "chat"]
       		set chat  [linsert $chat end "text"]
       		set chat  [linsert $chat end "free"]         
@@ -331,7 +331,7 @@
           		set chat  [linsert $chat end "no"] 
       		}
 	}
-	if {[lindex  $toolsl $i] == "SmallGroupDisscussion" } {
+	if {[lindex  $toolsl $i] == "Disscussion-SmallGroup" } {
       		set tools [linsert $tools end "chat"]
      		 if {$addv1 == "checked" } {
       			set chat  [linsert $chat end "text-and-audio-and-video"]
@@ -358,7 +358,7 @@
       
 	}
 
-	if {[lindex  $toolsl $i] == "LargeGroupDisscussion" } {
+	if {[lindex  $toolsl $i] == "Disscussion-EntireSession" } {
       		set tools [linsert $tools end "chat"]
       		if {$addv2 == "checked" } {
       			set chat  [linsert $chat end "text-and-audio-and-video"] 
@@ -384,7 +384,7 @@
           		set chat  [linsert $chat end "no"] 
       		}
 	}
-	if {[lindex  $toolsl $i] == "RolesDisscussion" } {
+	if {[lindex  $toolsl $i] == "Disscussion-Roles" } {
       		set tools [linsert $tools end "chat"]
       		if {$addv3 == "checked" } {
       			set chat  [linsert $chat end "text-and-audio-and-video"]
@@ -407,12 +407,12 @@
 	}
 
 
-	if {[lindex  $toolsl $i] == "IndividualWriting" } {
+	if {[lindex  $toolsl $i] == "IndividualTextWriting-None" } {
      		 set tools [linsert $tools end "individualwriting"]
            
 	}
 
-	if {[lindex  $toolsl $i] == "Summarizing" } {
+	if {[lindex  $toolsl $i] == "Summarizing-EntireSession" } {
      		set tools [linsert $tools end "chat"]
       		set chat  [linsert $chat end "text"]
       		set chat  [linsert $chat end "turn"]   
@@ -421,11 +421,11 @@
       		set chat  [linsert $chat end "group"] 
       		set chat  [linsert $chat end "no"]      
 	}
-		if {[lindex  $toolsl $i] == "IceBreaking" } {
+		if {[lindex  $toolsl $i] == "IceBreaking-SmallGroup" } {
       		set tools [linsert $tools end "icebreaking"]
       		  
 	}
-	if {[lindex  $toolsl $i] == "Evaluation" } {
+	if {[lindex  $toolsl $i] == "Evaluation-EntireSession" } {
       		set tools [linsert $tools end "chat"]
       		set chat  [linsert $chat end "text"]
       		set chat  [linsert $chat end "turn"]   
@@ -434,7 +434,7 @@
       		set chat  [linsert $chat end "no"]
                 set chat  [linsert $chat end "no"]      
 	}
-	if {[lindex  $toolsl $i] == "Debriefing" } {
+	if {[lindex  $toolsl $i] == "Debriefing-EntireSession" } {
       		set tools [linsert $tools end "chat"]
       		set chat  [linsert $chat end "text-and-audio"]
       		set chat  [linsert $chat end "turn"]   
@@ -444,7 +444,7 @@
       		set chat  [linsert $chat end "no"]     
 	}
         
-	if {[lindex  $toolsl $i] == "IdeasVoting" } {
+	if {[lindex  $toolsl $i] == "IdeasVoting-SmallGroup" } {
       		set tools [linsert $tools end "vote"]
       		set vote  [linsert $vote end "idea"]
       		set vote  [linsert $vote end "idea Voting"] 
@@ -453,97 +453,90 @@
          	 	set vote  [linsert $vote end "none"]
 	}
 
-	if {[lindex  $toolsl $i] == "InternetSearch" } {
+	if {[lindex  $toolsl $i] == "InternetSearch-None" } {
       		set tools [linsert $tools end "internetsearch"]
      
 	}
-        if {[lindex  $toolsl $i] == "Conferencing" } {
+        if {[lindex  $toolsl $i] == "Conferencing-EntireSession" } {
       		set tools [linsert $tools end "Conferencing"]
      
 	}
 
-	if {[lindex  $toolsl $i] == "OwnResolution" } {
+	if {[lindex  $toolsl $i] == "OwnResolution-EntireSession" } {
       		set tools [linsert $tools end "ownresolution"]
 	}
 
-	if {[lindex  $toolsl $i] == "QA" } {
+	if {[lindex  $toolsl $i] == "QA-EntireSession" } {
       		set tools [linsert $tools end "qa"]
 	}
-	if {[lindex  $toolsl $i] == "SmallGroupSharedText" } {
+	if {[lindex  $toolsl $i] == "SharedText-SmallGroup" } {
       		set tools [linsert $tools end "smallgroupsharedtext"]
                 set smallgroupsharedtext  [linsert $smallgroupsharedtext end $smallsharedtext]    
 	}
-        if {[lindex  $toolsl $i] == "LargeGroupSharedText" } {
+        if {[lindex  $toolsl $i] == "SharedText-EntireSession" } {
       		set tools [linsert $tools end "largegroupsharedtext"]
                 set largegroupsharedtext  [linsert $largegroupsharedtext end $largesharedtext]    
 	}
-	if {[lindex  $toolsl $i] == "SessionInfo" } {
+	if {[lindex  $toolsl $i] == "textInfo-EntireSession" } {
       		set tools [linsert $tools end "SessionInfo"]
                 set SessionInfo  [linsert $SessionInfo end $sessioninfo]    
 	}
-        if {[lindex  $toolsl $i] == "GroupInfo" } {
+        if {[lindex  $toolsl $i] == "textInfo-SmallGroup" } {
       		set tools [linsert $tools end "GroupInfo"]
                 set GroupInfo  [linsert $GroupInfo end $groupinfo]    
 	}
-        if {[lindex  $toolsl $i] == "RoleInfo" } {
+        if {[lindex  $toolsl $i] == "textInfo-Role" } {
       		set tools [linsert $tools end "RoleInfo"]
                 set RoleInfo  [linsert $RoleInfo end $roleinfo]    
 	}
-        if {[lindex  $toolsl $i] == "Survey" } {
+        if {[lindex  $toolsl $i] == "Survey-EntireSession" } {
       		set tools [linsert $tools end "Survey"]
                 set Survey  [linsert $Survey end $ideasnumber] 
                 set Survey  [linsert $Survey end $ideastext]    
 	}
 
-	if {[lindex  $toolsl $i] == "IdeasDiscussion" } {
+	if {[lindex  $toolsl $i] == "IdeasDiscussion-SmallGroup" } {
       		set tools [linsert $tools end "ideasdiscussion"]   
 	}
-	if {[lindex  $toolsl $i] == "DownloadFile" } {
+	if {[lindex  $toolsl $i] == "DownloadFile-EntireSession" } {
       		set tools [linsert $tools end "dynamiclink"]
       		set dynamiclink  [linsert $dynamiclink end $el]    
 	}
- 	if {[lindex  $toolsl $i] == "SilentThinking" } {
-      		set tools [linsert $tools end "silentthinking"] 
-                set SilentThinking  [linsert $SilentThinking end $individualtext]   
-	}
+ 	
         
-        if {[lindex  $toolsl $i] == "SmallGroupImageAnnotation" } {
+        if {[lindex  $toolsl $i] == "ImageDrawingAnnotating-SmallGroup" } {
       		set tools [linsert $tools end "smallgroupwhiteboard"]    
 	}
-        if {[lindex  $toolsl $i] == "LargeGroupImageAnnotation" } {
+        if {[lindex  $toolsl $i] == "ImageDrawingAnnotating-EntireSession" } {
       		set tools [linsert $tools end "largegroupwhiteboard"]    
 	}
 
-        if {[lindex  $toolsl $i] == "SmallGrouptextDiscussion" } {
+        if {[lindex  $toolsl $i] == "textDiscussingAnnotating-SmallGroup" } {
       		set tools [linsert $tools end "smallgrouptext"]  
                  set smallgrouptext  [linsert $smallgrouptext end $smallannotatedtext]   
 	}
-        if {[lindex  $toolsl $i] == "LargeGrouptextDiscussion" } {
+        if {[lindex  $toolsl $i] == "textDiscussingAnnotating-EntireSession" } {
       		set tools [linsert $tools end "largegrouptext"]
                 set largegrouptext  [linsert $largegrouptext end $largeannotatedtext]    
 	}
-        if {[lindex  $toolsl $i] == "IndividualAnnotating" } {
+        if {[lindex  $toolsl $i] == "IndividualImageDrawing-None" } {
       		set tools [linsert $tools end "individualtext"]    
 	}
-	if {[lindex  $toolsl $i] == "Overview" } {
+	if {[lindex  $toolsl $i] == "audioOverview-EntireSession" } {
       		set tools [linsert $tools end "overview"]
 	}
-        if {[lindex  $toolsl $i] == "Slides" } {
+        if {[lindex  $toolsl $i] == "Slides-EntireSession" } {
       		set tools [linsert $tools end "slides"]
 	}
-	if {[lindex  $toolsl $i] == "YesNo" } {
+	if {[lindex  $toolsl $i] == "YesNo-EntireSession" } {
       		set tools [linsert $tools end "vote"]
       		set vote  [linsert $vote end "yesno"]
       		set vote  [linsert $vote end "Answer the above question by clicking on the yes/no buttons below"] 
                 set vote  [linsert $vote end "none"] 
           	set vote  [linsert $vote end   "none"]
          	set vote  [linsert $vote end "none"]
 
-	}
-	if {[lindex  $toolsl $i] == "MultipleChoice" } {
-      		set tools [linsert $tools end "vote"]
-      		set vote  [linsert $vote end "MultipleChoice"]   
-	}     
+	}   
 
 	if {[lindex  $toolsl $i] == "repeat" } {
       		set tools [linsert $tools end "repeat"]  
Index: openacs-4/packages/beehive/www/import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/import.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/beehive/www/import.adp	10 Jul 2006 02:21:10 -0000	1.3
+++ openacs-4/packages/beehive/www/import.adp	26 Sep 2006 00:57:14 -0000	1.4
@@ -6,7 +6,7 @@
 <u1>
 <table cellspacing="2" cellpadding="2" border="1">
 <tr class="form-element">
-<td> <b>Pattern information </b></td> <td></td><td><b>Uses</b></td><td></td></tr>
+<td> <b>Pattern information </b></td> <td></td><td></td><td><b>Uses</b></td></tr>
 <multiple name="pattern"> 
 <tr>
 <td><a href="@url@more-pattern?technique_num=@pattern.num@ "> @pattern.techniqe@  <if @pattern.name@ not eq "default">
@@ -16,16 +16,17 @@
 
 
 <td>  <a href="@url@create-edit-session?technique_num=@pattern.num@&group=@group@"> Create session </a> </td>
-<td>
- @pattern.uses@
-</td>
 <td>  
 <if @pattern.num@  eq 3 or  @pattern.num@  eq 4 or @pattern.num@  eq 11 or @pattern.num@  eq 13 or @pattern.num@  eq 5 or @pattern.num@  eq 1 or @pattern.num@  eq 15 or @pattern.num@  eq 6 or @pattern.num@  eq 12 or @pattern.num@  eq 7 or @pattern.num@  eq 10 or @pattern.num@  eq 14 >
 <a href="@url@more-simulations?num=@pattern.num@"> View Simulation </a>
 </if>
  </td>
 <td>
+ @pattern.uses@
+</td>
 
+
+
 </tr>
 </multiple>
 
Index: openacs-4/packages/beehive/www/flash/collaboration.fla
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/flash/collaboration.fla,v
diff -u -N -r1.4 -r1.5
Binary files differ
Index: openacs-4/packages/beehive/www/flash/collaboration.swf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/flash/collaboration.swf,v
diff -u -N -r1.4 -r1.5
Binary files differ
Index: openacs-4/packages/beehive/www/simulation/Sim_collaboration.fla
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/simulation/Sim_collaboration.fla,v
diff -u -N -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/beehive/www/simulation/Sim_collaboration.swf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/beehive/www/simulation/Sim_collaboration.swf,v
diff -u -N -r1.1 -r1.2
Binary files differ