Index: dotlrn_packages/packages/forums/catalog/forums.en_US.ISO-8859-1.xml
===================================================================
diff -u -r427b58e5b60733288b390a895dda101b208bf186 -rdaeeb8cec63bad7412fa122f9db9a7c9350ca7f2
--- dotlrn_packages/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	(.../forums.en_US.ISO-8859-1.xml)	(revision 427b58e5b60733288b390a895dda101b208bf186)
+++ dotlrn_packages/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	(.../forums.en_US.ISO-8859-1.xml)	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -197,4 +197,6 @@
   <msg key="You_can">You can</msg>
   <msg key="You_may">You may</msg>
   <msg key="Your_Note">Your Note</msg>
+  <msg key="Proceed_to_the_next_LAMS">Proceed to the next LAMS activity</msg>
+  <msg key="Next_Activity">Next Activity</msg>
 </message_catalog>
Index: dotlrn_packages/packages/forums/lib/forums/edit-lams.adp
===================================================================
diff -u
--- dotlrn_packages/packages/forums/lib/forums/edit-lams.adp	(revision 0)
+++ dotlrn_packages/packages/forums/lib/forums/edit-lams.adp	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1 @@
+<formtemplate id="forum"></formtemplate>
Index: dotlrn_packages/packages/forums/lib/forums/edit-lams.tcl
===================================================================
diff -u
--- dotlrn_packages/packages/forums/lib/forums/edit-lams.tcl	(revision 0)
+++ dotlrn_packages/packages/forums/lib/forums/edit-lams.tcl	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1,65 @@
+ad_page_contract {
+    
+    Edit a Forum
+
+    @author Ben Adida (ben@openforce.net)
+    @creation-date 2002-05-25
+    @cvs-id $Id$
+
+} {
+}
+
+set dispatch "updateContent"
+
+form create forum
+
+element create forum returnlams_url \
+        -datatype text -widget hidden -optional
+
+element create forum forum_id \
+        -label [_ forums.Forum_ID] -datatype integer -widget hidden
+
+element create forum toolContentID \
+    -label toolContentID -datatype integer -widget hidden 
+
+forums::form::forum forum
+
+if {[form is_valid forum]} {
+    template::form get_values forum returnlams_url forum_id name charter presentation_type posting_policy new_threads_p toolContentID
+
+    forum::edit -forum_id $forum_id \
+            -name $name \
+            -charter [template::util::richtext::get_property contents $charter] \
+            -presentation_type $presentation_type \
+            -posting_policy $posting_policy
+    
+    forum::posting_policy_set -posting_policy $posting_policy \
+        -forum_id $forum_id
+
+    # Users can create new threads?
+    if {$new_threads_p} {
+        forum::new_questions_allow -forum_id $forum_id
+    } else {
+        forum::new_questions_deny -forum_id $forum_id
+    }    
+
+    set extToolContentID $forum_id
+
+    ad_returnredirect [export_vars -base $returnlams_url {dispatch toolContentID extToolContentID}]
+    ad_script_abort
+}
+
+if { [form is_request forum] } {
+    element set_properties forum returnlams_url -value $returnlams_url
+    element set_properties forum forum_id -value $forum(forum_id)
+    element set_properties forum name -value $forum(name)
+    element set_properties forum charter -value [template::util::richtext create $forum(charter) "text/html"]
+    element set_properties forum presentation_type -value $forum(presentation_type)
+    element set_properties forum posting_policy -value $forum(posting_policy)
+    element set_properties forum new_threads_p -value [forum::new_questions_allowed_p -forum_id $forum(forum_id)]
+    element set_properties forum toolContentID -value $toolContentID
+}
+
+if {[exists_and_not_null alt_template]} {
+  ad_return_template $alt_template
+}
Index: dotlrn_packages/packages/forums/lib/forums/new-lams.adp
===================================================================
diff -u
--- dotlrn_packages/packages/forums/lib/forums/new-lams.adp	(revision 0)
+++ dotlrn_packages/packages/forums/lib/forums/new-lams.adp	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1 @@
+<formtemplate id="forum"></formtemplate>
Index: dotlrn_packages/packages/forums/lib/forums/new-lams.tcl
===================================================================
diff -u
--- dotlrn_packages/packages/forums/lib/forums/new-lams.tcl	(revision 0)
+++ dotlrn_packages/packages/forums/lib/forums/new-lams.tcl	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1,84 @@
+ad_page_contract {
+    
+    Create a Forum for LAMS
+
+    @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au)
+    @creation-date 2008-07-23
+    @cvs-id $Id$
+
+}
+
+if { ![info exists name] } {
+    set name {}
+}
+
+set package_id [ad_conn package_id]
+
+form create forum
+
+element create forum forum_id \
+    -label [_ forums.Forum_ID] \
+    -datatype integer \
+    -widget hidden
+
+element create forum toolContentID \
+    -label toolContentID \
+    -datatype integer \
+    -widget hidden 
+
+element create forum lamsUpdateURL \
+    -label lamsUpdateURL \
+    -datatype text \
+    -widget hidden 
+
+forums::form::forum forum
+
+if {[form is_valid forum]} {
+    template::form get_values forum \
+        forum_id name charter presentation_type posting_policy new_threads_p
+
+    set forum_id [forum::new -forum_id $forum_id \
+        -name $name \
+        -charter [template::util::richtext::get_property contents $charter] \
+        -presentation_type $presentation_type \
+        -posting_policy $posting_policy \
+        -package_id $package_id \
+    ]
+
+    forum::posting_policy_set -posting_policy $posting_policy \
+        -forum_id $forum_id
+    
+    # Users can create new threads?
+    if {$new_threads_p} {
+        forum::new_questions_allow -forum_id $forum_id
+    } else {
+        forum::new_questions_deny -forum_id $forum_id
+    }
+
+    forum::lams::is_lams -forum_id  $forum_id
+
+    set dispatch "updateContent"
+
+    # this is the format in which the tool adapter expects the
+    # forum_id to have
+    set extToolContentID $forum_id
+
+    set return_url [export_vars -base $lamsUpdateURL {dispatch extToolContentID toolContentID}]
+
+    ad_returnredirect $return_url
+    ad_script_abort
+}
+
+if { [form is_request forum] } {
+    # Pre-fetch the forum_id
+    set forum_id [db_nextval acs_object_id_seq]
+    element set_properties forum forum_id -value $forum_id
+    element set_value forum new_threads_p 1
+    element set_value forum name $name
+    element set_value forum toolContentID $toolContentID
+    element set_value forum lamsUpdateURL $lamsUpdateURL
+}
+
+if {[exists_and_not_null alt_template]} {
+  ad_return_template $alt_template
+}
Index: dotlrn_packages/packages/forums/www/admin/forum-lams-edit.adp
===================================================================
diff -u
--- dotlrn_packages/packages/forums/www/admin/forum-lams-edit.adp	(revision 0)
+++ dotlrn_packages/packages/forums/www/admin/forum-lams-edit.adp	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1,14 @@
+<master>
+<property name="title">Edit Forum: @forum.name;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="focus">forum.name</property>
+
+<if @forum.enabled_p@ eq t>
+#forums.This_forum_is# <b>#forums.enabled#</b>. #forums.You_may# <a href="forum-disable?forum_id=@forum.forum_id@">#forums.disable_it#</a>.
+</if>
+<else>
+#forums.This_forum_is# <b>#forums.disabled#</b>. #forums.You_may# <a href="forum-enable?forum_id=@forum.forum_id@">#forums.enable_it#</a>.
+</else>#forums.You_can# <a href="subscribe-others?forum_id=@forum.forum_id@">#forums.subscribe_others#</a>.
+<p>
+
+<include src="/packages/forums/lib/forums/edit-lams" &forum="forum" toolContentID="@toolContentID@" returnlams_url="@returnlams_url@">
Index: dotlrn_packages/packages/forums/www/admin/forum-lams-edit.tcl
===================================================================
diff -u
--- dotlrn_packages/packages/forums/www/admin/forum-lams-edit.tcl	(revision 0)
+++ dotlrn_packages/packages/forums/www/admin/forum-lams-edit.tcl	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1,29 @@
+ad_page_contract {
+    
+    Edit a Forum
+
+    @author Ben Adida (ben@openforce.net)
+    @creation-date 2002-05-25
+    @cvs-id $Id$
+
+} {
+    toolContentID:integer,notnull
+    forum_id:integer,notnull
+}
+
+set returnlams_url "http://192.168.111.40:8080/lams/tool/dlfrum10/authoring.do"
+set dispatch "updateContent"
+set extToolContentID $forum_id
+
+# Select the info
+set package_id [ad_conn package_id]
+forum::get -forum_id $forum_id -array forum
+
+# Proper scoping?
+if {$package_id != $forum(package_id)} {
+    ns_log Error "Forum Administration: Bad Scoping of Forum #$forum_id in Forum Editing"
+    ad_returnredirect [export_vars -base $returnlams_url {dispatch extToolContentID toolContentID}]
+    ad_script_abort
+}
+
+set context [list [_ forums.Edit_forum]]
Index: dotlrn_packages/packages/forums/www/admin/forum-lams-new.adp
===================================================================
diff -u
--- dotlrn_packages/packages/forums/www/admin/forum-lams-new.adp	(revision 0)
+++ dotlrn_packages/packages/forums/www/admin/forum-lams-new.adp	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1,6 @@
+<master>
+<property name="title">#forums.Create_New_Forum#</property>
+<property name="context">@context;noquote@</property>
+<property name="focus">forum.name</property>
+
+<include src="/packages/forums/lib/forums/new-lams" name="@name@" toolContentID="@toolContentID@" lamsUpdateURL="@lamsUpdateURL@">
Index: dotlrn_packages/packages/forums/www/admin/forum-lams-new.tcl
===================================================================
diff -u
--- dotlrn_packages/packages/forums/www/admin/forum-lams-new.tcl	(revision 0)
+++ dotlrn_packages/packages/forums/www/admin/forum-lams-new.tcl	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -0,0 +1,18 @@
+ad_page_contract {
+    
+    Create a Forum
+
+    @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au)
+    @creation-date 2008-07-23
+    @cvs-id $Id$
+
+} -query {
+    {name ""}
+    {toolContentID 0}
+    {lamsUpdateURL ""}
+}
+
+ns_log Notice "lamsUpdateURL $lamsUpdateURL"
+set context [list [_ forums.Create_New_Forum]]
+
+ad_return_template
Index: dotlrn_packages/packages/forums/www/forum-view.adp
===================================================================
diff -u -r049b622549d53690f411632d2dc9926c3b35e187 -rdaeeb8cec63bad7412fa122f9db9a7c9350ca7f2
--- dotlrn_packages/packages/forums/www/forum-view.adp	(.../forum-view.adp)	(revision 049b622549d53690f411632d2dc9926c3b35e187)
+++ dotlrn_packages/packages/forums/www/forum-view.adp	(.../forum-view.adp)	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -13,3 +13,7 @@
 </p>
 
 <include src="/packages/forums/lib/message/threads-chunk" forum_id="@forum_id@" flush_p="@flush_p@" &="permissions" moderate_p="@permissions.moderate_p@" orderby="@orderby@" &="page" admin_p="@permissions.admin_p@">
+
+<p>
+<include src="/packages/forums/lib/lams/nextactivity" forum_id="@forum_id@">
+</p>
\ No newline at end of file
Index: dotlrn_packages/packages/forums/www/forum-view.tcl
===================================================================
diff -u -r427b58e5b60733288b390a895dda101b208bf186 -rdaeeb8cec63bad7412fa122f9db9a7c9350ca7f2
--- dotlrn_packages/packages/forums/www/forum-view.tcl	(.../forum-view.tcl)	(revision 427b58e5b60733288b390a895dda101b208bf186)
+++ dotlrn_packages/packages/forums/www/forum-view.tcl	(.../forum-view.tcl)	(revision daeeb8cec63bad7412fa122f9db9a7c9350ca7f2)
@@ -11,9 +11,23 @@
     {orderby "last_child_post,desc"}
 		{flush_p 0}
     page:optional
+    {returnUrl ""}
 }
 
+ns_log Notice "AAAAAAA $forum_id"
 
+# we create a session to insert the Next Activity button
+# in this session we add the returnUrl as well as the forum_id
+if {![nsv_exists A_$forum_id [ad_conn session_id]] && $returnUrl != ""} {
+    set next_activity_url [export_vars -base exit {returnUrl}]
+    nsv_set A_$forum_id [ad_conn session_id] [list]
+    nsv_lappend A_$forum_id [ad_conn session_id] $next_activity_url
+    nsv_lappend A_$forum_id [ad_conn session_id] $forum_id
+}
+
+#ns_write "[nsv_get A_$forum_id  [ad_conn session_id]]"
+#ad_script_abort
+
 # Get forum data
 if {[catch {forum::get -forum_id $forum_id -array forum} errMsg]} {
     if {[string equal $::errorCode NOT_FOUND]} {