Index: openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml,v
diff -u -r1.34.4.2 -r1.34.4.3
--- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	4 Jun 2007 14:00:04 -0000	1.34.4.2
+++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	14 Jun 2007 14:31:29 -0000	1.34.4.3
@@ -35,7 +35,9 @@
   <msg key="Confirm_New_IMS-LD">Confirm: New IMS-LD</msg>
   <msg key="Confirm_this_changes">Confirm these changes</msg>
   <msg key="Context_info">Context info</msg>
+  <msg key="Create_a_new_group">Create a new group</msg>
   <msg key="Create_New">Create New?</msg>
+  <msg key="Create_new">Create new</msg>
   <msg key="create_new_run">create new run</msg>
   <msg key="Create_role_instance">Create role instance</msg>
   <msg key="Creating_default_Run">Creating default Run...</msg>
@@ -69,6 +71,7 @@
   <msg key="go_back">go back</msg>
   <msg key="Go_to_UoL_page">Go to UoL page</msg>
   <msg key="Group_members">Group members</msg>
+  <msg key="Group_name">Group name</msg>
   <msg key="Groups">Groups in role</msg>
   <msg key="Hide">Hide</msg>
   <msg key="Hide_1">panel</msg>
@@ -168,6 +171,8 @@
   <msg key="lt_Couldnt_determine_if_">Couldn't determine if this is a well formed IMS-LD: %message%</msg>
   <msg key="lt_Creaginting_new_IMS-L">Creaginting new IMS-LD</msg>
   <msg key="lt_Create_a_new_instance">Create a new instance of a role</msg>
+  <msg key="lt_Current_Unit_of_Learn">Current Unit of Learning does not allow creation of multiple instances of this role.</msg>
+  <msg key="lt_Current_UoL_does_not_">Current UoL does not allow to include them in more than one subroles of the role.</msg>
   <msg key="lt_Dear_recepient_name_b">Dear %recepient_name% &lt;br&gt; 
                        %sender_name has% triggered this notification. Please do not replay to this email. &lt;br&gt;</msg>
   <msg key="lt_Email_Propery_Identif">Email Propery Identifier</msg>
@@ -227,6 +232,7 @@
   <msg key="lt_li_desc_no_file_assoc">&lt;li&gt; desc (no file associated) &lt;/li&gt;</msg>
   <msg key="lt_manifest_namespace_is">manifest namespace is not imscp</msg>
   <msg key="lt_Max_number_of_student">Max. number of students per group: %max_persons%</msg>
+  <msg key="lt_Members_not_allowed_n">Members $not_allowed_name are already members of other subroles of role $parent_role_name.</msg>
   <msg key="lt_Min_number_of_student">Min. number of students per group: %min_persons%</msg>
   <msg key="lt_Monitoring_One_Activi">Monitoring One Activity</msg>
   <msg key="lt_More_than_one_service">More than one service in environment %identifier%. Just one used (the first one)</msg>
@@ -236,6 +242,10 @@
   <msg key="lt_No_information_found_">No information found in the manifest file</msg>
   <msg key="lt_No_parent_folder_foun">No parent folder found</msg>
   <msg key="lt_No_parent_folder_foun_1">No parent folder found for the ims-ld in the community %community_id%. Please report this error to the administrator.</msg>
+  <msg key="lt_Number_of_members_doe">Number of members does not reach the minimum allowed number of users for this role.
+                       There must be at least $min_persons members.</msg>
+  <msg key="lt_Number_of_members_exc">Number of members exceded the allowed number for this role.
+                       You must not select more than $max_persons members.</msg>
   <msg key="lt_Number_of_Organizatio">Number of Organizations:</msg>
   <msg key="lt_On_Completion_Identif">On Completion Identifier</msg>
   <msg key="lt_Organization_Identifi">Organization Identifier</msg>
@@ -415,6 +425,7 @@
   <msg key="Runinfo_Name">Run(UoL) Name:</msg>
   <msg key="Runs">Runs (IMS-LD instances)</msg>
   <msg key="Select">select user...</msg>
+  <msg key="Select_a_group">Select a group...</msg>
   <msg key="Select_a_role">Select a role...</msg>
   <msg key="Select_a_role_1">Select a role</msg>
   <msg key="Select_role">Select role...</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/imsld-master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/lib/imsld-master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/imsld/www/activity-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.adp,v
diff -u -r1.13.4.2 -r1.13.4.3
--- openacs-4/packages/imsld/www/activity-frame.adp	4 Jun 2007 14:00:04 -0000	1.13.4.2
+++ openacs-4/packages/imsld/www/activity-frame.adp	14 Jun 2007 14:31:29 -0000	1.13.4.3
@@ -1,13 +1,6 @@
-<!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 type="text/javascript" src="/resources/imsld/tabber.js"></script>
-<script type="text/javascript" src="/resources/imsld/dynamicselect.js"></script>
-<link rel="stylesheet" href="/resources/imsld/example.css" TYPE="text/css" MEDIA="screen">
-<link rel="stylesheet" href="/resources/imsld/example-print.css" TYPE="text/css" MEDIA="print">
-
+<master src="../lib/imsld-master">
+<property name="onload">init_activity()</property>
+<property name="header_stuff">
 <script type="text/javascript">
 
 /* Optional: Temporarily hide the "tabber" class so it does not "flash"
@@ -18,10 +11,6 @@
 </script>
 
 <style type="text/css">
-<!--
-html {margin:13px; border:15px; padding:3px;}
-body {margin:3px; border:3px; padding:5px;}
--->
 .show-hide { 
   position:absolute;
   top:0px;
@@ -38,13 +27,7 @@
   margin:0px;
 }
 </style>
-<SCRIPT>
-    function confirmValue(myform){
-        myform.submit()
-    }
-</SCRIPT>
-</head>
-<body>
+</property>
 
 <span id="addc1" class="show-hide">
 <a href="#" onClick="return _tp(false)" title="#imsld.Hide_1#" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_left.png" alt="#imsld.Hide#" title="#imsld.Hide#" border="0" align="top"/></a>
@@ -66,87 +49,12 @@
 <p class="notice">#imsld.navigate#</p>
 <iframe id="object" name="object"></iframe>
 
-</body>
-<script type="text/javascript">
-function resizeobject() {
-f = document.forms[0];
-o = document.getElementById('object');
-var bodies = document.getElementsByTagName("body");
-var body = bodies[0];
-if (document.documentElement && document.documentElement.currentStyle && typeof document.documentElement.clientWidth != "undefined" && document.documentElement.clientWidth != 0)
-{
-o.width = document.documentElement.clientWidth + 2*parseInt(document.documentElement.currentStyle.borderWidth,10) - o.style.left;
-o.height = document.documentElement.clientHeight + 2*parseInt(document.documentElement.currentStyle.borderWidth,10) - o.style.top;
-}
-else if (document.all && document.body && typeof document.body.clientWidth != "undefined")
-{
-o.width = document.body.clientWidth + 2*parseInt(document.body.currentStyle.borderWidth,10) - o.style.left;
-o.height = document.body.clientHeight + 2*parseInt(document.body.currentStyle.borderWidth,10) - o.style.top;
-}
-else if (window.innerWidth)
-{
-o.width = window.innerWidth - o.style.left - 30;
-o.height = window.innerHeight - o.style.top - 50;
-}
-else if (document.body && typeof document.body.clientWidth != "undefined")
-{
-o.width = document.body.clientWidth - o.style.left;
-o.height = document.body.clientHeight - o.style.top;
-};
 
-}
-resizeobject();
-window.onresize = resizeobject;
 
-function objecturl(url) {
-var o = document.getElementById('object');
-o.src = url;
-}
-
-</script>
-
 <script type="text/javascript">
-var as = document.getElementsByTagName("a");
-for (var i = 0; i < as.length; i++) {
-  var a = as[i];
-  a.setAttribute('target', 'object');
-}
-for (var i = 0; i < as.length; i++) {
-  if (!as[i].getAttribute('href').match(/#/i)) {
-    document.getElementById('object').src = as[i].getAttribute('href');
-    break;
-  }
-}
-</script>
-
-<script type="text/javascript">
-function _tp(a){
-   var ab=document.getElementById("addc");
-   var ac=document.getElementById("addc1");
-
-   if (a) {
-     ai=''; 
-     aj='none';
-     parent.document.getElementsByTagName("frameset")[0].cols='30%,*';
-   } else {
-     ai='none';
-     aj='';
-     parent.document.getElementsByTagName("frameset")[0].cols='0%,*';
-   }
-
-   ac.style.display=ai;
-   ab.style.display=aj;
-   
-   return false;
-}
-
-
-</script>
-
-<if @roles_template_p@ not nil>
-    <script type="text/javascript">
+<if @roles_template_p@ eq 1>
                 dynamicSelect("supported-roles", "user-roles");
-    </script>
 </if>
 
-</html>
+</script>
+
Index: openacs-4/packages/imsld/www/environment-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/environment-frame.adp,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/packages/imsld/www/environment-frame.adp	30 May 2007 08:06:17 -0000	1.4.4.1
+++ openacs-4/packages/imsld/www/environment-frame.adp	14 Jun 2007 14:31:29 -0000	1.4.4.2
@@ -1,22 +1,11 @@
-<!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">
+<master src="../lib/imsld-master">
+<property name="header_stuff">
     <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/imsld/imsld.css" media="all">
-<style type="text/css">
-ul {
-text-indent: 0px;
-}
-</style>
-</head>
-<body>
+</property>
 
 @environments;noquote@
 
-</body>
-
 <script type="text/javascript">
 var as = document.getElementsByTagName("a");
 for (var i = 0; i < as.length; i++) {
@@ -25,4 +14,5 @@
 }
 </script>
 
-</html>
+
+
Index: openacs-4/packages/imsld/www/environment-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/environment-frame.tcl,v
diff -u -r1.7.4.1 -r1.7.4.2
--- openacs-4/packages/imsld/www/environment-frame.tcl	30 May 2007 08:06:17 -0000	1.7.4.1
+++ openacs-4/packages/imsld/www/environment-frame.tcl	14 Jun 2007 14:31:29 -0000	1.7.4.2
@@ -13,13 +13,13 @@
 
 dom createDocument ul doc
 set dom_root [$doc documentElement]
-
-#set environments_node_ul [$doc createElement ul]
+$dom_root setAttribute class "mktree"
 set environments_node_li [$doc createElement li]
+$environments_node_li setAttribute class "liOpen"
 set text [$doc createTextNode "[_ imsld.Context_info]"]
 $environments_node_li appendChild $text
+
 set environments_node [$doc createElement ul]
-$environments_node setAttribute class "mktree"
 
 # FIX-ME: if the ul is empty, the browser shows the ul incorrectly   
 set text [$doc createTextNode ""]
@@ -33,9 +33,6 @@
     -dom_doc $doc
 $dom_root appendChild $environments_node_li
 
-set environments_node_li [$doc createElement li]
-$environments_node_li setAttribute class "liOpen"
-
 $environments_node_li appendChild $environments_node
 $dom_root appendChild $environments_node_li
 
Index: openacs-4/packages/imsld/www/imsld-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.adp,v
diff -u -r1.13.4.2 -r1.13.4.3
--- openacs-4/packages/imsld/www/imsld-tree.adp	4 Jun 2007 14:00:04 -0000	1.13.4.2
+++ openacs-4/packages/imsld/www/imsld-tree.adp	14 Jun 2007 14:31:29 -0000	1.13.4.3
@@ -1,18 +1,9 @@
-<!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">
+<master src="../lib/imsld-master">
+<property name="header_stuff">
     <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/imsld/imsld.css" media="all">
+</property>
 
-<SCRIPT>
-    function confirmValue(myform){
-        myform.submit()
-    }
-</SCRIPT>
-</head>
-<body>
 <a href="@community_url@" class="button" target="_top" title="#imsld.Exit#">#imsld.Exit#</a>
 <div class="role_menu">
 <form name="choose-role">
@@ -34,7 +25,6 @@
 <if @user_message@ not nil>
 @user_message@
 </if>
-</body>
 
 <script type="text/javascript">
 var as = document.getElementsByTagName("a");
@@ -55,6 +45,5 @@
   document.forms['choose-role'].elements['ok'].style.display="none"
 </SCRIPT>
 
-</html>
 
 
Index: openacs-4/packages/imsld/www/imsld-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.tcl,v
diff -u -r1.16.4.1 -r1.16.4.2
--- openacs-4/packages/imsld/www/imsld-tree.tcl	30 May 2007 08:06:17 -0000	1.16.4.1
+++ openacs-4/packages/imsld/www/imsld-tree.tcl	14 Jun 2007 14:31:29 -0000	1.16.4.2
@@ -72,7 +72,6 @@
 set user_message ""
 set next_activity_id [imsld::get_next_activity_list -run_id $run_id -user_id $user_id]
 
-
 set remaining_activities [llength [join $next_activity_id]] 
 
 if {!$remaining_activities} {
Index: openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp,v
diff -u -r1.3.4.1 -r1.3.4.2
--- openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp	30 May 2007 08:06:17 -0000	1.3.4.1
+++ openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp	14 Jun 2007 14:31:29 -0000	1.3.4.2
@@ -2,43 +2,31 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="header_stuff">
-<style  type="text/css">
-.table {
-  clear:both;
-  padding-right:20px;
+   <link rel="stylesheet" type="text/css" media="all" href="/resources/imsld/imsld.css">
+<style type="text/css">
+ul {
+  text-indent: 0px;
 }
-.row {
-  float:left;
-  display:inline;
-  margin_0px;
-  padding-right:30px;
-}
-.confirm {
-  float:left;
-  text-indent:-180px;
-  margin-top:40px;
-}
 </style>
-</property>
+  </property>
 
-
 <SCRIPT>
     function confirmValue(myform){
         myform.submit()
     }
 </SCRIPT>
 
-<div class="table">
-  <div class="row">
+<div class="one-row">
+  <div class="one-element">
    <formtemplate id="choose_role"></formtemplate>
   </div>
   <if @role@ not eq 0>
-  <div class="row">
+  <div class="one-element">
       <include src="imsld-groups">
   </div>
    </if> 
    <if @finishable@ not eq 0>
-  <div class="confirm">
+  <div class="roles-confirm">
      <formtemplate id="finish_management"></formtemplate>
   </div>
    </if>
Index: openacs-4/packages/imsld/www/admin/imsld-create-instance.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-create-instance.tcl,v
diff -u -r1.3.4.1 -r1.3.4.2
--- openacs-4/packages/imsld/www/admin/imsld-create-instance.tcl	30 May 2007 08:06:17 -0000	1.3.4.1
+++ openacs-4/packages/imsld/www/admin/imsld-create-instance.tcl	14 Jun 2007 14:31:29 -0000	1.3.4.2
@@ -22,7 +22,7 @@
 
 if { !([string eq $number_of_groups "0"] || [string eq $create_new_p  "t"] ) } {
 
-        set mensaje "<p>Current Unit of Learning does not allow creation of multiple instances of this role.</p>
+        set mensaje "<p>[_ imsld.lt_Current_Unit_of_Learn]</p>
             <a href=\"$return_url\" title=\"[_ imsld.Go_back]\">[_ imsld.Go_back]</a>"
     ad_return_complaint 1 $mensaje
     ad_script_abort
Index: openacs-4/packages/imsld/www/admin/imsld-groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-groups.tcl,v
diff -u -r1.4.4.2 -r1.4.4.3
--- openacs-4/packages/imsld/www/admin/imsld-groups.tcl	4 Jun 2007 14:00:04 -0000	1.4.4.2
+++ openacs-4/packages/imsld/www/admin/imsld-groups.tcl	14 Jun 2007 14:31:29 -0000	1.4.4.3
@@ -11,33 +11,32 @@
     {group_instance 0}
     role:optional
 }
-set lista [list [list "Select a group..." 0]]
+set lista [list [list "[_ imsld.Select_a_group]" 0]]
 set lista_aux [lindex [db_list_of_lists get_groups_list {}] 0]
 lappend lista $lista_aux
 
 
-set actions [list "Create new" [export_vars -base imsld-create-instance {imsld_id run_id role lista}] "Create a new group"]
+set actions [list "[_ imsld.Create_new]" [export_vars -base imsld-create-instance {imsld_id run_id role lista}] "[_ imsld.Create_a_new_group]"]
 
 template::list::create \
     -name role_groups \
     -multirow role_groups \
     -key role_groups \
+    -pass_properties { imsld_id run_id role } \
     -actions $actions \
     -elements {
         group_name {
-           label {Group name}
+           label {[_ imsld.Group_name]}
            link_url_col {manage_roles}
         }
         delete {
             label {}
-            display_template {@role_groups.delete;noquote@} 
+            display_template {<a href="imsld-delete-instance?imsld_id=@imsld_id@&run_id=@run_id@&role=@role@&group_id=@role_groups.group_id@" title="[_ imsld.Delete]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ imsld.Delete]" title="[_ imsld.Delete]"></a>} 
         }
     }
 
 db_multirow -extend { manage_roles delete } role_groups get_groups_list {} {
     set manage_roles [export_vars -base imsld-admin-roles {imsld_id run_id role {group_instance $group_id}}]
-    set delete "<a href=\"[export_vars -base "imsld-delete-instance" { imsld_id run_id role group_id }]\" title=\"[_ imsld.Delete]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\" alt=\"[_ imsld.Delete]\" title=\"[_ imsld.Delete]\"></a>"
-   
 }
 
 
Index: openacs-4/packages/imsld/www/admin/imsld-role-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-confirm.tcl,v
diff -u -r1.5.4.1 -r1.5.4.2
--- openacs-4/packages/imsld/www/admin/imsld-role-confirm.tcl	30 May 2007 08:06:17 -0000	1.5.4.1
+++ openacs-4/packages/imsld/www/admin/imsld-role-confirm.tcl	14 Jun 2007 14:31:29 -0000	1.5.4.2
@@ -30,16 +30,14 @@
 
 }
 if { ![string eq "" $min_persons] && ([llength $members_list] < $min_persons)} {
-        set mensaje "<p>Number of members does not reach the minimum allowed number of users for this role.
-                       There must be at least $min_persons members.</p>
+        set mensaje "<p>[_ imsld.lt_Number_of_members_doe]</p>
                        <a href=\"$return_url\" title=\"[_ imsld.Go_back]\">[_ imsld.Go_back]</a>"
         ad_return_complaint 1 $mensaje
         ad_script_abort
 }
 
 if {![string eq "" $max_persons] && ([llength $members_list] > $max_persons)} {
-        set mensaje "<p>Number of members exceded the allowed number for this role.
-                       You must not select more than $max_persons members.</p>
+        set mensaje "<p>[_ imsld.lt_Number_of_members_exc]</p>
                        <a href=\"$return_url\" title=\"[_ imsld.Go_back]\">[_ imsld.Go_back]</a>"
         ad_return_complaint 1 $mensaje
         ad_script_abort
@@ -62,8 +60,8 @@
 
 
         
-        set mensaje "<p>Members $not_allowed_name are already members of other subroles of role $parent_role_name.</p>
-                     <p>Current UoL does not allow to include them in more than one subroles of the role.</p>
+        set mensaje "<p>[_ imsld.lt_Members_not_allowed_n]</p>
+                     <p>[_ imsld.lt_Current_UoL_does_not_]</p>
                        <a href=\"$return_url\" title=\"[_ imsld.Go_back]\">[_ imsld.Go_back]</a>"
         ad_return_complaint 1 $mensaje
         ad_script_abort
Index: openacs-4/packages/imsld/www/admin/imsld-role-members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-members.adp,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/packages/imsld/www/admin/imsld-role-members.adp	30 May 2007 08:06:17 -0000	1.4.4.1
+++ openacs-4/packages/imsld/www/admin/imsld-role-members.adp	14 Jun 2007 14:31:29 -0000	1.4.4.2
@@ -1,25 +1,25 @@
-<div class="table">
- <div class="row">
+<div class="one-row">
+ <div class="one-element">
   <h1>@group_title@</h1>
  </div>
- <div class="row">
+ <div class="one-element">
       <ul>
         <li>#imsld.lt_Max_number_of_student#</li>
         <li>#imsld.lt_Min_number_of_student#</li>
      </ul>
   </div>
 </div>
 
-<div class="table">
- <div class="row">
+<div class="one-row">
+ <div class="one-element">
   <h2>#imsld.Not_members#</h2>
   <listtemplate name="asign_not_members"></listtemplate>
  </div>
- <div class="row">
+ <div class="one-element">
   <h2>#imsld.Group_members#</h2>
    <listtemplate name="asign_members"></listtemplate> 
   </div>
-  <div class="confirm">
+  <div class="roles-confirm">
   <formtemplate id="confirm"></formtemplate>
  </div>
 </div>
Index: openacs-4/packages/imsld/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.adp,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/imsld/www/admin/index.adp	30 May 2007 08:06:17 -0000	1.2.4.1
+++ openacs-4/packages/imsld/www/admin/index.adp	14 Jun 2007 14:31:29 -0000	1.2.4.2
@@ -2,19 +2,14 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="header_stuff">
-<style  type="text/css">
-.notice { 
-  font-style: italic; 
-  color: red; 
-  font-size: 9pt;
-}
-</style>
-</property>
+    <link rel="stylesheet" type="text/css" media="all" href="/resources/imsld/imsld.css" /> 
+  </property>
+
 <p><formtemplate id="upload_file_form"></formtemplate></p>
 
 <h2>#imsld.IMS-LDs_1#</h2>
-<blockquote><listtemplate name="imslds"></listtemplate></blockquote>
+<div class="indented"><listtemplate name="imslds"></listtemplate></div>
 
 <h2>#imsld.Runs#</h2>
-<blockquote><listtemplate name="imsld_runs"></listtemplate></blockquote>
+<div class="indented"><listtemplate name="imsld_runs"></listtemplate></div>
 
Index: openacs-4/packages/imsld/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.tcl,v
diff -u -r1.14.4.2 -r1.14.4.3
--- openacs-4/packages/imsld/www/admin/index.tcl	4 Jun 2007 14:00:04 -0000	1.14.4.2
+++ openacs-4/packages/imsld/www/admin/index.tcl	14 Jun 2007 14:31:29 -0000	1.14.4.3
@@ -23,7 +23,12 @@
     content::item::set_live_revision -revision_id [content::item::get_best_revision -item_id $set_imsld_id_live]
 }
 if { ![string eq "" $set_run_id_live] } {
-    db_dml make_run_live { *SQL* }
+    # if there are no users assigned to the run, we mark it as waiting, otherwise mark it active
+    if { ![llength [imsld::runtime::users_in_run -run_id $set_run_id_live]] } {
+	db_dml make_run_waiting { *SQL* }
+    } else {
+	db_dml make_run_live { *SQL* }
+    }
 }
 
 set package_id [ad_conn package_id]
@@ -47,6 +52,7 @@
     -name imslds \
     -multirow imslds \
     -key imsld_id \
+    -pass_properties { return_url } \
     -orderby_name imsld_orderby \
     -orderby { default_value imsld_title } \
     -elements {
@@ -62,12 +68,19 @@
         }
         create_run {
             label {}
-            display_template {@imslds.create_run;noquote@} 
+            display_template {<if @imslds.live_revision@ not nil>
+		<a href="run-new?run_imsld_id=@imslds.imsld_id@&return_url=@return_url@" title="[_ imsld.lt___imsldcreate_new_run]"> [_ imsld.create_new_run] </a>
+		</if>} 
         }
         delete {
             label {}
             sub_class narrow
-            display_template {@imslds.delete_template;noquote@} 
+            display_template {<if @imslds.live_revision@ nil>
+		<span class="alert">[_ imsld.Deleted]</span> <a href="index?set_imsld_id_live=@imslds.item_id@" title="[_ imsld.Make_it_live]">[_ imsld.Make_it_live]</a>
+		</if>
+		<else>
+		<a href="imsld-delete?imsld_id=@imslds.imsld_id@&return_url=@return_url@" title="[_ imsld.Delete]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ imsld.Delete]" title="[_ imsld.Delete]"></a>
+		</else>} 
             link_html { title "[_ imsld.Delete_IMS_LD]" }
         }
     }
@@ -76,17 +89,8 @@
 
 set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
 
-db_multirow -extend { delete_template create_run } imslds  get_imslds { *SQL* } {
+db_multirow -extend { delete_template create_run } imslds  get_imslds { *SQL* } {}
 
-    if { [empty_string_p $live_revision] } {
-        set delete_template "<span class=\"notice\">[_ imsld.Deleted]</span> <a href=[export_vars -base "index" { {set_imsld_id_live $item_id} }] title=\"[_ imsld.Make_it_live]\">[_ imsld.Make_it_live]</a>"
-        set create_run ""
-    } else {
-        set delete_template "<a href=\"[export_vars -base "imsld-delete" { imsld_id return_url }]\" title=\"[_ imsld.Delete]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\" alt=\"[_ imsld.Delete]\" title=\"[_ imsld.Delete]\"></a>"
-        set create_run "<a href=\"[export_vars -base "run-new" { {run_imsld_id $imsld_id} return_url }]\" title=\"[_ imsld.lt___imsldcreate_new_run]\"> [_ imsld.create_new_run] </a>"
-    }
-}
-
 set imsld_package_id [site_node_apm_integration::get_child_package_id \
                           -package_id [dotlrn_community::get_package_id $community_id] \
                           -package_key "[imsld::package_key]"]
@@ -95,6 +99,7 @@
 template::list::create \
     -name imsld_runs \
     -multirow imsld_runs \
+    -pass_properties { return_url } \
     -key run_id \
     -elements {
         imsld_title {
@@ -115,13 +120,25 @@
             orderby_desc {creation_date desc}
         }
         manage {
-            label ""
-            display_template {@imsld_runs.manage;noquote@}
+            label {}
+            display_template {<if @imsld_runs.status@ eq "active" or @imsld_runs.status@ eq "stopped">
+		<a href="imsld-view-roles?run_id=@imsld_runs.run_id@" title="[_ imsld.View_members]">[_ imsld.View_members]</a> | <a href="monitor?run_id=@imsld_runs.run_id@" title="[_ imsld.Monitor]">[_ imsld.Monitor]</a>
+		</if>
+		<else>
+		 <if @imsld_runs.status@ eq "waiting">
+		  <a href="imsld-admin-roles?run_id=@imsld_runs.run_id@" title="[_ imsld.Manage_Members]">[_ imsld.Manage_Members]</a>
+ 		 </if>
+		</else>}
         }
         delete {
             label {}
             sub_class narrow
-            display_template {@imsld_runs.delete_template;noquote@} 
+            display_template {<if @imsld_runs.status@ eq "deleted">
+		<span class="alert">[_ imsld.Deleted]</span> <a href="index?set_run_id_live=@imsld_runs.run_id@" title="[_ imsld.Make_it_live]">[_ imsld.Make_it_live]</a>
+		</if>
+		<else>
+		<a href="run-delete?run_id=@imsld_runs.run_id@&return_url=@return_url@" title="[_ imsld.Delte]"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ imsld.Delte]" title="[_ imsld.Delte]"></a>
+		</else>}
             link_html { title "[_ imsld.Delete_Run]" }
         }
     } \
@@ -134,32 +151,21 @@
 set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
 
 db_multirow -extend { manage delete_template image_path image_alt image_title } imsld_runs get_runs { *SQL* } {
-
-    set delete_template "<a href=\"[export_vars -base "run-delete" { run_id return_url }]\" title=\"[_ imsld.Delte]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\" alt=\"[_ imsld.Delte]\" title=\"[_ imsld.Delte]\"></a>"
-    
     switch $status {
-        deleted {
-            set delete_template "<span class=\"notice\">[_ imsld.Deleted]</span> <a href=[export_vars -base "index" { {set_run_id_live $run_id} }] title=\"[_ imsld.Make_it_live]\">[_ imsld.Make_it_live]</a>"
-        }
         active {
-            set delete_template "<a href=\"[export_vars -base "run-delete" { run_id return_url }]\" title=\"[_ imsld.Delete]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\" alt=\"[_ imsld.Delete]\" title=\"[_ imsld.Delete]\"></a>"
             set image_alt "[_ imsld.active]"
             set image_title "[_ imsld.active]"
             set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/active.png"
-            set manage "<a href=\"[export_vars -base "imsld-view-roles" { run_id }]\" title=\"[_ imsld.View_members]\">[_ imsld.View_members]</a> | <a href=\"[export_vars -base "monitor/" { run_id }]\" title=\"[_ imsld.Monitor]\">[_ imsld.Monitor]</a>" 
         }
         waiting {
             set image_alt "[_ imsld.waiting]"
             set image_title "[_ imsld.waiting]"
             set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/waiting.png"
-            set create_run "<a href=\"[export_vars -base "index" { {run_imsld_id $imsld_id} return_url }]\" title=\"[_ imsld.create_new_run]\"> [_ imsld.create_new_run] </a>"
-            set manage "<a href=\"[export_vars -base "imsld-admin-roles" { run_id }]\" title=\"[_ imsld.Manage_Members]\">[_ imsld.Manage_Members]</a>" 
         }
         stopped {
             set image_alt "[_ imsld.stopped]"
             set image_title "[_ imsld.stopped]"
             set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
-            set manage "<a href=\"[export_vars -base "imsld-view-roles" { run_id }]\" title=\"[_ imsld.View_members]\">[_ imsld.View_members]</a> | <a href=\"[export_vars -base "monitor/" { run_id }]\" title=\"[_ imsld.Monitor]\">[_ imsld.Monitor]</a>" 
         }
     }    
 }
Index: openacs-4/packages/imsld/www/admin/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.xql,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/imsld/www/admin/index.xql	16 May 2006 09:24:36 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/index.xql	14 Jun 2007 14:31:29 -0000	1.2.4.1
@@ -56,5 +56,15 @@
 		</querytext>
 	</fullquery>
 
+	<fullquery name="make_run_waiting">
+		<querytext>
+
+        update imsld_runs
+        set status = 'waiting'
+        where run_id = :set_run_id_live
+    
+		</querytext>
+	</fullquery>
+
 </queryset>
 
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.2.4.2 -r1.2.4.3
--- openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp	4 Jun 2007 14:00:04 -0000	1.2.4.2
+++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp	14 Jun 2007 14:31:30 -0000	1.2.4.3
@@ -1,27 +1,7 @@
-<master>
-  <property name="title">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
-<style  type="text/css">
-.show-hide { 
-  position:absolute;
-  top:0px;
-  left:0px;
-}
-</style>
-</property>
-
-<span id="addc1" class="show-hide">
-<a href="#" onClick="return _tp(false)" title="#imsld.Hide_1#" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_left.png" alt="#imsld.Hide#" title="#imsld.Hide#" border="0" align="top"/></a>
-</span>
-<span id="addc" style="display:none;" class="show-hide">
-<a href="#" onClick="return _tp(true)" title="#imsld.Show_1#" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_right.png" alt="#imsld.Show#" title="#imsld.Show#" border="0" align="top"/></a>
-</span>
-
-@list_header@
-<br /><br />
-<listtemplate name="related_users"></listtemplate>
-<br />
-
+<master src="../../../lib/imsld-master">
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="header_stuff">
 <script type="text/javascript">
 function _tp(a){
    var ab=document.getElementById("addc");
@@ -42,6 +22,26 @@
    
    return false;
 }
+</script>
+<style  type="text/css">
+.show-hide { 
+  position:relative;
+  top:0px;
+  left:0px;
+}
+</style>
+</property>
 
+<span id="addc1" class="show-hide">
+<a href="#" onClick="return _tp(false)" title="#imsld.Hide_1#" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_left.png" alt="#imsld.Hide#" title="#imsld.Hide#" border="0" align="top"/></a>
+</span>
+<span id="addc" style="display:none;" class="show-hide">
+<a href="#" onClick="return _tp(true)" title="#imsld.Show_1#" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_right.png" alt="#imsld.Show#" title="#imsld.Show#" border="0" align="top"/></a>
+</span>
 
-</script>
+@list_header@
+<br /><br />
+<listtemplate name="related_users"></listtemplate>
+<br />
+
+
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.1.4.1 -r1.1.4.2
--- openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp	30 May 2007 08:06:18 -0000	1.1.4.1
+++ openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp	14 Jun 2007 14:31:30 -0000	1.1.4.2
@@ -7,7 +7,17 @@
     <link rel="stylesheet" href="/resources/imsld/imsld.css" media="all">
 <style type="text/css">
 ul {
-text-indent: 0px;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-decoration: none;
+  text-transform: none;
+  text-indent: 0px;
+  padding: 0px;
+  margin: 0px;
+  white-space: nowrap;
 }
 </style>
 </head>
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.2.4.2 -r1.2.4.3
--- openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp	4 Jun 2007 14:00:04 -0000	1.2.4.2
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp	14 Jun 2007 14:31:30 -0000	1.2.4.3
@@ -1,30 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
+<master src="../../../lib/imsld-master">
+<property name="header_stuff">
     <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/imsld/imsld.css" media="all">
+    <link rel="stylesheet" href="/resources/theme-zen/css/main.css" media="all">
+</property>
 
-<SCRIPT>
-    function confirmValue(myform){
-        myform.submit()
-    }
-</SCRIPT>
-
-<style type="text/css">
-li {
-  padding: 5px 0px 0px 0px;
-}
-</style>
-</head>
-<body>
 <a href="@imsld_admin_url@" class="button" target="_top" title=\"#imsld.Exit#\">#imsld.Exit#</a>
 <br />
 @properties_tree;noquote@
 @html_tree;noquote@
 @aux_html_tree;noquote@
-</body>
 
 <script type="text/javascript">
 var as = document.getElementsByTagName("a");
@@ -41,4 +28,5 @@
 }
 </script>
 
-</html>
+</body>
+
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.1 -r1.1.4.1
--- openacs-4/packages/imsld/www/admin/monitor/run-info.adp	21 Dec 2006 15:20:47 -0000	1.1
+++ openacs-4/packages/imsld/www/admin/monitor/run-info.adp	14 Jun 2007 14:31:30 -0000	1.1.4.1
@@ -4,6 +4,7 @@
     <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">
 <style type="text/css">
 p {
 font: 10pt/22pt; 
Index: openacs-4/packages/imsld/www/resources/imsld.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/imsld.css,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/imsld/www/resources/imsld.css	4 Jun 2007 14:00:05 -0000	1.1.2.2
+++ openacs-4/packages/imsld/www/resources/imsld.css	14 Jun 2007 14:31:30 -0000	1.1.2.3
@@ -2,19 +2,6 @@
    General styles used in the IMS-LD package
   --------------------------------------------------*/
 
-ul {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 12px;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-decoration: none;
-  text-transform: none;
-  text-indent: -15px;
-  padding: 0px 0px 5px 0px;
-  margin: 0px;
-  white-space: nowrap;
-}
 div.role_menu {
   text-align: right;
   font-size: 80%;
@@ -23,29 +10,26 @@
   top: 0px;
   right: 0px;
 } 
-a.button  {
-  text-align: center;
-  border: 3px outset #00b;
-  background-color: #007; 
-  color: #fff;
-  font-weight: bold;
-  font-size: 10px;
-  text-decoration: none;
-  padding: 0px;      
-  margin: 0px;
-  top: 0px;
-  left: 0px;
+
+.indented {  
+  margin-left:20px;
 }
-a.button:hover  {
-  color: #fff;
-  background-color: #00d;
-  border: 3px inset #00b;
-}
 
-.button {	
-  display: block; 
-  position: fixed;
+.one-row {
+  clear:both;
+  padding-right:20px;
 }
+.one-element {
+  float:left;
+  display:inline;
+  margin:0px;
+  padding-right:30px;
+}
+.roles-confirm {
+  float:left;
+  text-indent:-180px;
+  margin-top:40px;
+}
 
 a.finish {
   font-size:9px;
@@ -67,14 +51,26 @@
   border-right-width:6px;
 }
 a.finish:hover  {
-  color: #fff;
+  color:#FFFFFF;
   background-color:#1858B8;
   border-style:double;
 }
-
 .finish { 
   padding:0px;
   margin:0px;
 }
 
+ul {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-decoration: none;
+  text-transform: none;
+  text-indent: -15px;
+  padding: 0px 0px 5px 0px;
+  margin: 0px;
+  white-space: nowrap;
+}
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/resources/imsld.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/imsld/www/resources/tabber.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/tabber.js,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/imsld/www/resources/tabber.js	5 Apr 2006 18:39:58 -0000	1.1
+++ openacs-4/packages/imsld/www/resources/tabber.js	14 Jun 2007 14:31:30 -0000	1.1.4.1
@@ -471,7 +471,6 @@
 
 
 /* Run tabberAutomaticOnload() unless the "manualStartup" option was specified */
-
 if (typeof tabberOptions == 'undefined') {
 
     tabberAutomaticOnLoad();
@@ -482,4 +481,4 @@
     tabberAutomaticOnLoad(tabberOptions);
   }
 
-}
+}