Index: openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp	17 Apr 2008 17:17:54 -0000	1.5
+++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp	8 Jul 2008 15:35:47 -0000	1.6
@@ -3,10 +3,144 @@
   <property name="context">@context;noquote@</property>
   <property name="imsld_content_frame">1</property>
 
+  <style type="text/css">.tabber{display:none;}</style>
+
+  <div class="tabber">
+
+  <div class="tabbertab">
+
+  <h3>User activity</h3>
+
   <div class="frame-header">@frame_header@</div>
   
   <br />
-  
-  <div class="centered-table">
+
+  <div style="width:95%; margin-left:auto; ">
     <listtemplate name="related_users"></listtemplate>
   </div>
+
+  </div>
+
+  <if @type@ in learning support>
+
+  <div class="tabbertab">
+
+  <h3>Complete activity</h3>
+
+  <div style="margin: 0 auto 10px auto; width: 80%;">
+    <fieldset>
+      <legend>Complete Activity</legend>
+      <formtemplate id="complete">
+
+        <div class="form-item-wrapper">
+          <div>
+            <input name="option" value="none"
+              id="complete:elements:option:none" type="radio"
+              onchange="enableFields(this)"<if @option@ eq "none"> checked</if> /> 
+            <label for="complete:elements:option:none">
+              None
+            </label>
+          </div>
+          <div >
+            <input name="option" value="choice"
+            id="complete:elements:option:choice" type="radio"
+            onchange="enableFields(this)"<if @option@ eq "choice"> checked</if> /> 
+            <label for="complete:elements:option:choice">
+              User choice
+            </label>
+          </div>
+          <div >
+            <input name="option" value="timelimit"
+            id="complete:elements:option:timelimit" type="radio"
+            onchange="enableFields(this)"<if @option@ eq timelimit> checked</if> /> 
+            <label for="complete:elements:option:timelimit">
+              Time limit
+            </label>
+            <div style="float:left; padding-right:5px; padding-left:20px;">
+              <div>
+                <label for="years">Yrs</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="years" />
+              </div> <!-- /form-widget -->
+            </div>
+            <div style="float:left; padding-right:5px;">
+              <div>
+                <label for="months">Mons</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="months" />
+              </div> <!-- /form-widget -->
+            </div>
+            <div style="float:left; padding-right:5px;">
+              <div>
+                <label for="days">Days</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="days" />
+              </div> <!-- /form-widget -->
+            </div>
+            <div style="float:left; padding-right:5px;">
+              <div>
+                <label for="hours">Hrs</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="hours" />
+              </div> <!-- /form-widget -->
+            </div>
+            <div style="float:left; padding-right:5px;">
+              <div>
+                <label for="minutes">Mins</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="minutes" />
+              </div> <!-- /form-widget -->
+            </div>
+            <div style="float:left;">
+              <div>
+                <label for="seconds">Secs</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="seconds" />
+              </div> <!-- /form-widget -->
+            </div>
+          </div>
+          <div style="clear:both;">
+            <input name="option" value="property"
+            id="complete:elements:option:property" type="radio"
+            onchange="enableFields(this)" <if
+            @option@ eq property>
+            checked</if>/> 
+            <label for="complete:elements:option:property">
+              When a property is set
+            </label>
+            <div style="float:left; padding-right:5px; padding-left:20px;">
+              <div>
+                <label for="property">Property</label>
+              </div>
+              <div>
+                <formwidget id="property" />
+              </div>
+            </div>
+            <div  style="float:none; padding-right:5px;
+              padding-left:20px; clear:both;">
+              <div>
+                <label for="value">Value</label>
+              </div> <!-- /form-label or /form-error -->
+              <div>
+                <formwidget id="value" value="@value_expression@" />
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="form-button" style="clear:both; padding-top:10px;">
+          <formwidget id="formbutton:ok">
+        </div>
+      </formtemplate>
+    </fieldset>
+        
+  </div>
+
+  </if>
+  
+  </div>
Index: openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl	17 Apr 2008 17:17:54 -0000	1.4
+++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl	8 Jul 2008 15:35:47 -0000	1.5
@@ -12,6 +12,15 @@
     {learning_object_id:integer ""}
     {service_id:integer ""}
     type:notnull
+    {years:integer 0}
+    {months:integer 0}
+    {days:integer 0}
+    {hours:integer 0}
+    {minutes:integer 0}
+    {seconds:integer 0}
+    {property:optional ""}
+    {value:optional ""}
+    {option ""}
 } -validate {
     non_empty_id {
         if { [string eq "" $activity_id] && [string eq "" $learning_object_id] && [string eq "" $service_id] } {
@@ -30,7 +39,7 @@
                   alt="No Portrait"/>}] \
                   user_name \
                   [list label "[_ imsld.Name]" \
-                       display_template {<a href="individual-report-frame?run_id=${run_id}&member_id=@related_users.user_id@" title="[_ imsld.lt_Users_individual_repo]">@related_users.user_name@</a>}] \
+                       display_template {<a href="individual-report-frame?run_id=${run_id}&member_id=@related_users.user_id@" onclick="return loadContent('individual-report-frame?run_id=${run_id}&member_id=@related_users.user_id@')" title="[_ imsld.lt_Users_individual_repo]">@related_users.user_name@</a>}] \
                   email \
                   [list label "[_ imsld.Email]"]]
 
@@ -324,3 +333,238 @@
     -filters { activity_id {} run_id {} type {} }
 
 
+set complete_act_id ""
+if { $type eq "learning" || $type eq "support" } {
+    db_1row activity_info "
+	select complete_act_id
+	from imsld_${type}_activitiesi
+	where activity_id = :activity_id
+    "
+}
+
+foreach {time_in_seconds time_string user_choice_p when_prop_val_is_set_xml property_ref expression_value} [list "" "" "" "" "" ""] break
+
+foreach unit {years months days hours minutes seconds} {
+    set time($unit) ""
+}
+
+set d_enabled "disabled"
+set p_enabled "disabled"
+
+if { $complete_act_id ne "" } {
+    db_0or1row complete_act {
+	select aci.time_in_seconds, aci.time_string, aci.user_choice_p, aci.when_prop_val_is_set_xml
+	from imsld_complete_actsi aci
+	where aci.item_id = :complete_act_id
+	and aci.complete_act_id = content_item__get_live_revision(:complete_act_id)
+    } 
+    
+    if { $when_prop_val_is_set_xml ne "" } {
+	dom parse $when_prop_val_is_set_xml document
+	$document documentElement when_prop_val_is_set_root
+	set wpv_is_node [$when_prop_val_is_set_root childNodes]
+	
+	set equal_value_p 0
+	# get the property value
+	set property_ref [$wpv_is_node selectNodes {*[local-name()='property-ref']}]
+	if { [llength ${property_ref}] } {
+	    set property_ref [${property_ref} getAttribute ref]
+	}
+	
+	# get the value of the referenced exression
+	set propertyvalueNode [$wpv_is_node selectNodes {*[local-name()='property-value']}]
+	
+	if { [llength ${propertyvalueNode}] } {
+	    set propertyvalueChildNode [${propertyvalueNode} childNodes]
+	    set nodeType [${propertyvalueChildNode} nodeType]
+	    set expression_value [${propertyvalueNode} text]
+	}	
+	set p_enabled "enabled"
+    }
+
+    if { $time_string ne "" } {
+	array set time [imsld::parse::convert_time_to_list -time $time_string]
+
+	foreach key [array names time] {
+	    set $key $time($key)
+	}
+	
+	set d_enabled "enabled"
+    }
+
+    if {$option ne "property"} {
+	set property ${property_ref}
+	set value ${expression_value}
+    }
+} else {
+    set option "none"
+}
+
+set properties [db_list_of_lists select_properties {
+    select ip.object_title, ip.identifier
+    from imsld_propertiesi ip, imsld_componentsi ic, imsld_imsldsi im, imsld_runs ir
+    where ir.run_id = :run_id
+    and ir.imsld_id = im.imsld_id
+    and im.item_id = ic.imsld_id
+    and ic.item_id = ip.component_id
+    order by ip.identifier
+}]
+
+
+ad_form \
+    -name complete \
+    -export {run_id activity_id type} \
+    -html { onsubmit "return submitForm(this)" } \
+    -form {
+	{ years:integer,optional
+	    { label "Year" }
+	    { html {size 2 $d_enabled $d_enabled} }
+	}
+	{ months:integer,optional
+	    { label "Months" }
+	    { html {size 2 $d_enabled $d_enabled} }
+	}
+	{ days:integer,optional
+	    { label "Days" }
+	    { html {size 2 $d_enabled $d_enabled} }
+	}
+	{ hours:integer,optional
+	    { label "Hours" }
+	    { html {size 2 $d_enabled $d_enabled} }
+	    { value $time(hours) }
+	}
+	{ minutes:integer,optional
+	    { label "Minutes" }
+	    { html {size 2 $d_enabled $d_enabled} }
+	}
+	{ seconds:integer,optional
+	    { label "Seconds" }
+	    { html {size 2 $d_enabled $d_enabled} }
+	}
+	{ property:text(select),optional
+	    { label "Property" }
+	    { options $properties }
+	    { html {$p_enabled $p_enabled} }
+	    { value ${property_ref} }
+	}
+	{ value:text,optional
+	    { label "Value" }
+	    { html {$p_enabled $p_enabled} }
+	    { value $expression_value }
+	}
+    } \
+    -on_request {
+	set option ""
+	if { $complete_act_id eq "" } {
+	    set option "none"
+	} elseif { $user_choice_p eq "t" } {
+	    set option "choice"
+	} elseif { $time_in_seconds > 0 } {
+	    set option "timelimit"
+	} elseif { $when_prop_val_is_set_xml ne "" } {
+	    set option "property"
+	}
+	
+    } \
+    -on_submit {
+	set parent_id [content::item::get_parent_folder -item_id [content::revision::item_id -revision_id $activity_id]]
+	set old_complete_act_id $complete_act_id
+	switch $option {
+	    "none" {
+		set complete_act_id ""
+	    }
+	    "choice" {
+		set complete_act_id [imsld::item_revision_new -attributes [list [list user_choice_p "t"]] \
+					 -content_type imsld_complete_act \
+					 -item_id $complete_act_id \
+					 -parent_id $parent_id]
+	    }
+	    "timelimit" {
+		set time_string [imsld::parse::convert_list_to_time \
+				     -time [list years $years months $months days $days \
+						hours $hours minutes $minutes seconds $seconds]]
+		set time_in_seconds [imsld::parse::convert_time_to_seconds -time $time_string]
+		set complete_act_id [imsld::item_revision_new -attributes [list [list time_in_seconds $time_in_seconds] \
+									       [list time_string $time_string]] \
+					 -content_type imsld_complete_act \
+					 -item_id $complete_act_id \
+					 -parent_id $parent_id]
+
+		imsld::instance::schedule_complete_time_limit \
+		    -run_id $run_id \
+		    -activity_id [content::revision::item_id -revision_id $activity_id] \
+		    -time_string $time_string
+
+	    }
+	    "property" {
+		dom createDocument when-property-value-is-set doc
+		set node [$doc documentElement]
+		set wpvis [$doc createElement "imsld:when-property-value-is-set"]
+		$wpvis setAttribute "xmlns:imsld" "http://www.imsglobal.org/xsd/imsld_v1p0"
+		
+		set pr [$doc createElement "imsld:property-ref"]
+		$pr setAttribute ref $property
+		$wpvis appendChild $pr
+		set pv [$doc createElement "imsld:property-value"]
+		set text [$doc createTextNode $value]
+		$pv appendChild $text
+		$wpvis appendChild $pv
+		
+		$node appendChild $wpvis
+		set xml [$node asXML]
+
+		set complete_act_id [imsld::item_revision_new -attributes [list [list when_prop_val_is_set_xml $xml]] \
+					 -content_type imsld_complete_act \
+					 -item_id $complete_act_id \
+					 -parent_id $parent_id]
+		
+	    }
+	}
+
+	if {$old_complete_act_id ne $complete_act_id} {
+	    if {$type eq "learning"} {
+		db_1row select_learning_activity {
+		    select identifier, component_id, activity_description_id, parameters, is_visible_p,
+		    on_completion_id, learning_objective_id, prerequisite_id, title, context_id, item_id
+		    from imsld_learning_activitiesi
+		    where activity_id = :activity_id
+		}		
+		
+		set learning_activity_id \
+		    [imsld::item_revision_new -attributes [list [list identifier $identifier] \
+							       [list component_id $component_id] \
+							       [list activity_description_id $activity_description_id] \
+							       [list parameters $parameters] \
+							       [list is_visible_p $is_visible_p] \
+							       [list complete_act_id $complete_act_id] \
+							       [list on_completion_id $on_completion_id] \
+							       [list learning_objective_id $learning_objective_id] \
+							       [list prerequisite_id $prerequisite_id]] \
+			 -content_type "imsld_learning_activity" \
+			 -item_id $item_id \
+			 -title $title \
+			 -parent_id $parent_id]
+	    } else {
+		db_1row select_learning_activity {
+		    select identifier, component_id, activity_description_id, parameters, is_visible_p,
+		    on_completion_id, item_id, title
+		    from imsld_support_activitiesi
+		    where activity_id = :activity_id
+		}
+		
+		set support_activity_id \
+		    [imsld::item_revision_new -attributes [list [list identifier $identifier] \
+							       [list component_id $component_id] \
+							       [list activity_description_id $activity_description_id] \
+							       [list parameters $parameters] \
+							       [list is_visible_p $is_visible_p] \
+							       [list complete_act_id $complete_act_id] \
+							       [list on_completion_id $on_completion_id]] \
+			 -content_type "imsld_support_activity" \
+			 -item_id $item_id \
+			 -title $title \
+			 -parent_id $parent_id]
+	    }
+	}
+	
+    }
Index: openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp	17 Apr 2008 17:17:54 -0000	1.4
+++ openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp	8 Jul 2008 15:35:47 -0000	1.5
@@ -7,10 +7,3 @@
 
   <if @environments@ not nil>@environments;noquote@</if>
 
-  <script type="text/javascript">
-    var as = document.getElementsByTagName("a");
-    for (var i = 0; i < as.length; i++) {
-      var a = as[i];
-      a.setAttribute('target', 'content');
-    }
-  </script>
Index: openacs-4/packages/imsld/www/admin/monitor/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/www/admin/monitor/index.adp	17 Apr 2008 17:17:54 -0000	1.3
+++ openacs-4/packages/imsld/www/admin/monitor/index.adp	8 Jul 2008 15:35:47 -0000	1.4
@@ -1,18 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
-   "http://www.w3.org/TR/html4/frameset.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+            "http://www.w3.org/TR/html4/strict.dtd">
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>@course_name@</title>
-  </head>
+    <style type="text/css">
+      div#tree {
+        top:6%;
+        height:47%;
+      }
+      
+      div#environment {
+        top:53%;
+        height:46%;
+      }
+      
+      div#content {
+        top:6%;
+        height:93%;
+      }
+      
+    </style>
 
-  <frameset rows="%20,*">
-    <frame src="run-info?run_id=@run_id@" name="run-info" title="run-info">
-    <frameset id="right-column" cols="30%,*">
-      <frameset rows="70%,*">
-      <frame src="monitor-tree?run_id=@run_id@" name="toc" title="toc">
-      <frame src="" name="environment">
-    </frameset>  
-    <frame src="" name="content" title="content">
-  </frameset>
+  </head>
+  <body> 
+    <div id="runinfo" class="frame">
+        <include src="run-info" />
+    </div>
+    <div id="tree" class="frame">
+        <include src="monitor-tree" />
+    </div>
+    <div id="environment" class="frame">
+      <if @activity_id@ not nil>
+        <include src="environment-frame" />
+      </if>
+    </div>
+    <div id="content" class="frame">
+      <if @type@ not nil>
+        <include src="properties-frame" />
+      </if>
+    </div>
+  </body>
 </html>
Index: openacs-4/packages/imsld/www/admin/monitor/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/monitor/index.tcl	17 Apr 2008 17:17:54 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/monitor/index.tcl	8 Jul 2008 15:35:47 -0000	1.3
@@ -9,6 +9,7 @@
     @cvs-id $Id$
 } {
     run_id:integer,notnull
+    {type ""}
 } -properties {
 } -validate {
 } -errors {
Index: openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl	17 Apr 2008 17:17:54 -0000	1.4
+++ openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl	8 Jul 2008 15:35:47 -0000	1.5
@@ -58,7 +58,7 @@
 set elements [list user_name \
                   [list label "[_ imsld.Activity_Name]" \
                        display_template \
-		       {<a href="activity-frame?run_id=$run_id&type=@related_activities.type@&activity_id=@related_activities.related_id@" title="[_ imsld.Activity_report]">@related_activities.activity_name@</a>}] \
+		       {<a href="activity-frame?run_id=$run_id&type=@related_activities.type@&activity_id=@related_activities.related_id@" onclick="return loadContent('activity-frame?run_id=$run_id&type=@related_activities.type@&activity_id=@related_activities.related_id@')" title="[_ imsld.Activity_report]">@related_activities.activity_name@</a>}] \
                   type \
                   [list label "[_ imsld.Activity_Type]"] \
                   started_time \
Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp	17 Apr 2008 17:17:54 -0000	1.5
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp	8 Jul 2008 15:35:47 -0000	1.6
@@ -5,7 +5,7 @@
 
   <div class="float-left">
     <a href="@imsld_admin_url@" class="button" target="_top" 
-      title="#imsld.Exit_Monitor#">#imsld.Exit_Monitor#</a>
+      title="#imsld.Exit_Cockpit#">#imsld.Exit_Cockpit#</a>
   </div>
   <div class="frame-header">#imsld.Activities#</div>
   
@@ -19,19 +19,3 @@
   
   @aux_html_tree;noquote@
   
-  <!-- Script needed to show environments in the proper frame -->
-  <script type="text/javascript">
-    var as = document.getElementsByTagName("a");
-    for (var i = 0; i < as.length; i++) {
-      var a = as[i];
-      for( var x = 0; x < a.attributes.length; x++ ) {
-        if( a.attributes[x].nodeName.toLowerCase() == 'href' ) {
-          if ( a.attributes[x].nodeValue.match(/activity-frame/) ) {
-            var enviromenturl = a.attributes[x].nodeValue.replace(/activity-frame/, "environment-frame");
-            a.setAttribute('onClick',"parent.environment.location='" + enviromenturl + "'");
-          }
-        }
-      } 
-    }
-  </script>
-
Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl	17 Apr 2008 17:17:54 -0000	1.5
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl	8 Jul 2008 15:35:47 -0000	1.6
@@ -68,10 +68,24 @@
 set a_node [$doc createElement a]
 $a_node setAttribute href \
     "[export_vars -base "individual-report-frame" -url {run_id}]"
-$a_node setAttribute target "content"
+$a_node setAttribute onclick \
+    "return loadContent('[export_vars -base "individual-report-frame" -url {run_id}]')"
 $a_node appendChild [$doc createTextNode "[_ imsld.User_activity_reports]"]
 $li_node appendChild $a_node
 
+# # method properties
+# set li_node [$doc createElement li]
+# $dom_root appendChild $li_node
+# $li_node setAttribute class "liBullet"
+
+# set a_node [$doc createElement a]
+# $a_node setAttribute href \
+#     "[export_vars -base "properties-frame" -url {run_id}]"
+# $a_node setAttribute onclick \
+#     "return loadContent('[export_vars -base "properties-frame" -url {run_id}]')"
+# $a_node appendChild [$doc createTextNode "Method properties"]
+# $li_node appendChild $a_node
+
 set user_activity [$dom_root asXML]
 
 # Create the activity tree
Index: openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl	17 Apr 2008 17:17:54 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl	8 Jul 2008 15:35:47 -0000	1.3
@@ -13,7 +13,7 @@
     {user_id:integer ""}
     type:notnull
 } -validate {
-    valid_type {
+    valid_type -requires {type} {
         if { ![string eq "loc" $type] && ![string eq "locpers" $type] && ![string eq "globpers" $type] && ![string eq "locrole" $type] && ![string eq "glob" $type] } {
             ad_complain "[_ imsld.lt_Invalid_property_type]"
         }
@@ -254,6 +254,7 @@
     set url_prefix [ns_conn url]
     regexp (.*)/ $url_prefix url_prefix
     $form_node setAttribute action "${url_prefix}../../properties-value-set"
+    $form_node setAttribute onsubmit "return submitForm(this)"
     $form_node setAttribute method "post"
 
     if { ![string eq "" $select_node] } {
@@ -290,7 +291,7 @@
     set return_url_node [$dom_doc createElement "input"]
     $return_url_node setAttribute name "return_url"
     $return_url_node setAttribute type "hidden"
-    $return_url_node setAttribute value "[ad_conn url]?[ad_conn query]"
+    $return_url_node setAttribute value "admin/monitor/index?[ad_conn query]"
     $form_node appendChild $return_url_node
 
     # adding the submit button
Index: openacs-4/packages/imsld/www/admin/monitor/run-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/run-info.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/monitor/run-info.adp	17 Apr 2008 17:17:54 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/monitor/run-info.adp	8 Jul 2008 15:35:47 -0000	1.3
@@ -1,38 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-	"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <script src="/resources/acs-templating/mktree.js" 
-	language="javascript"></script>
-    <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
     <link rel="stylesheet" href="/resources/theme-zen/css/main.css" media="all">
+    <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
     <style type="text/css">
-      p {
+      p.runtime {
         font-family:Verdana, Arial, Helvetica, sans-serif;
         text-align:center;  
         font-size: 11px;
         color: #ffffff;
         margin: 0px;
         padding: 0px 0px 0px 0px;
       }
-      body {
+      div.runtime {
         margin: 0px;
         padding: 0px 0px 0px 0px;
         top: 0px;
         background-color: #0000FF;
       }
     </style>
-  </head>
-  <body>
-    <p>
+
+    <div class="runtime">
+    <p class="runtime">
       #imsld.Runinfo_Name# 
       <i>@imsld_title@</i> #imsld._Assigned_users# 
       <i>@number_of_members@</i> #imsld._Creation_Date# 
       <i>@creation_date@</i> #imsld._Status_The_run_is# 
       <i><b>@status@</b></i> #imsld.since# 
       <i>@status_date@</i>
     </p>
-  </body>
-</html>
-
+    </div>