Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	24 Oct 2008 19:34:38 -0000	1.33
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	9 Nov 2008 19:22:08 -0000	1.34
@@ -18,81 +18,73 @@
 
 %>
 
-<master>
-<property name="&doc">doc</property>
-<property name="context">@context@</property>
+  <master>
+    <property name="&doc">doc</property>
+    <property name="context">@context@</property>
 
-<h1>#dotlrn.AddDrop_Memberships#</h1>
+    <h1>#dotlrn.AddDrop_Memberships#</h1>
 
-<p>
-  <small>
-    <a href="#current" title="#dotlrn.goto_current_clubs#">#dotlrn.lt_Current_clubs_pretty_#</a>
-    |
-    <a href="#join_classes" title="#dotlrn.goto_join_class#">#dotlrn.lt_Join_a_class_instance#</a>
-    |
-    <a href="#join_clubs" title="#dotlrn.goto_join_clubs#">#dotlrn.lt_Join_a_clubs_pretty_n#</a>
-  </small>
-</p>
+    <p>
+      <small>
+        <a href="#current" title="#dotlrn.goto_current_clubs#">#dotlrn.lt_Current_clubs_pretty_#</a>
+        |
+        <a href="#join_classes" title="#dotlrn.goto_join_class#">#dotlrn.lt_Join_a_class_instance#</a>
+        |
+        <a href="#join_clubs" title="#dotlrn.goto_join_clubs#">#dotlrn.lt_Join_a_clubs_pretty_n#</a>
+      </small>
+    </p>
 
-<if @n_member_classes@ gt 0 or @member_clubs:rowcount@ gt 0>
-  <hr>
-  <h2><a name="current">#dotlrn.lt_Your_Current_Membersh#</a></h2>
+    <if @n_member_classes@ gt 0 or @member_clubs:rowcount@ gt 0>
+      <hr>
+      <h2><a name="current">#dotlrn.lt_Your_Current_Membersh#</a></h2>
 
-<if @n_member_classes@ gt 0>
-<formtemplate id="member_form">
-          @departments_pretty_name@:&nbsp;<formwidget id="member_department_key">
-          #dotlrn.Term#&nbsp;<formwidget id="member_term_id">
-</formtemplate>
-</if>
+      <if @n_member_classes@ gt 0>
+        <formtemplate id="member_form" class="inline-form">
+          <div>@departments_pretty_name@:&nbsp;<formwidget id="member_department_key"></div>
+          <div>#dotlrn.Term#&nbsp;<formwidget id="member_term_id"></div>
+        </formtemplate>
+      </if>
 
-<if @member_classes:rowcount@ gt 0>
-<listtemplate name="member_classes"></listtemplate>
-</if>
-<else>
-  <small>#dotlrn.No_classes#</small>
-</else>
+      <if @member_classes:rowcount@ gt 0>
+        <listtemplate name="member_classes"></listtemplate>
+      </if>
+      <else>
+        <p><small>#dotlrn.No_classes#</small></p>
+      </else>
+  
+      <if @member_clubs:rowcount@ gt 0>
+        <listtemplate name="member_clubs"></listtemplate>
+      </if>
+      <else>
+        <p><small>#dotlrn.no_clubs#</small></p>
+      </else>
+    </if>
 
-</if>
+    <if @n_non_member_classes@ gt 0 or @non_member_clubs:rowcount@ gt 0>
+      <hr>
+      <h2><a name="join_class">#dotlrn.Join_A_Group#</a></h2>
 
-<if @member_clubs:rowcount@ gt 0>
-<listtemplate name="member_clubs"></listtemplate>
-</if>
-<else>
-  <p><small>#dotlrn.no_clubs#</small></p>
-</else>
+      <if @n_non_member_classes@ gt 0>
+        <formtemplate id="non_member_form" class="inline-form">
+          <div>@departments_pretty_name@:&nbsp;<formwidget id="non_member_department_key"></div>
+          <div>#dotlrn.Term#&nbsp;<formwidget id="non_member_term_id"></div>
+        </formtemplate>
 
-</if>
+        <a name="join_classes"></a>
+        <if @non_member_classes:rowcount@ gt 0>
+          <listtemplate name="non_member_classes"></listtemplate>
+        </if>
+        <else>
+          <p><small>#dotlrn.No_classes#</small></p>
+        </else>
 
-<if @n_non_member_classes@ gt 0 or @non_member_clubs:rowcount@ gt 0>
-<hr>
+      </if>
 
-  <h2><a name="join_class">#dotlrn.Join_A_Group#</a></h2>
-
-<if @n_non_member_classes@ gt 0>
-<formtemplate id="non_member_form">
-          @departments_pretty_name@:&nbsp;<formwidget id="non_member_department_key">
-          #dotlrn.Term#&nbsp;<formwidget id="non_member_term_id">
-</formtemplate>
-
-<a name="join_classes"><p></a>
-<if @non_member_classes:rowcount@ gt 0>
-<listtemplate name="non_member_classes"></listtemplate>
-</if>
-<else>
-  <small>#dotlrn.No_classes#</small>
-</else>
-
-</if>
-
-<a name="join_clubs"><p></a>
-<if @non_member_clubs:rowcount@ gt 0>
-<listtemplate name="non_member_clubs"></listtemplate>
-</if>
-<else>
-  <p><small>#dotlrn.no_clubs#</small></p>
-</else>
-
-</if>
-
-
-
+      <a name="join_clubs"></a>
+      <if @non_member_clubs:rowcount@ gt 0>
+        <listtemplate name="non_member_clubs"></listtemplate>
+      </if>
+      <else>
+        <p><small>#dotlrn.no_clubs#</small></p>
+      </else>
+    </if>
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	24 Oct 2008 19:34:38 -0000	1.15
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	9 Nov 2008 19:22:08 -0000	1.16
@@ -134,34 +134,34 @@
 
 template::list::create -name member_classes -multirow member_classes -pass_properties { show_drop_button_p referer } -html {width 100%} -elements {
     name {
-        html {align left width 55%}
+        html {align left style "width:55%"}
         label "[_ dotlrn.class_instances_pretty_name]"
-	display_template {
-	    <a href="@member_classes.url@" title="\#dotlrn.goto_member_classes_pretty_name\#">@member_classes.pretty_name@</a>
-	}
+        display_template {
+            <a href="@member_classes.url@" title="\#dotlrn.goto_member_classes_pretty_name\#">@member_classes.pretty_name@</a>
+        }
     }
     term {
-	html {width 20%}
+        html {style "width:20%"}
         label "\#dotlrn.Term\#"
-	display_template {@member_classes.term_name@ @member_classes.term_year@}
+        display_template {@member_classes.term_name@ @member_classes.term_year@}
     }
     role {
-	html {width 20%}
+        html {style "width:20%"}
         label "\#dotlrn.Role\#"
     }
     actions {
         label "\#dotlrn.Actions\#"
-        html {align right width 5%}
-	display_template {
-	    <if @member_classes.member_state@ eq "needs approval">
-	    \[<small> #dotlrn.Pending_Approval# </small>\]
-	    </if>
-	    <else>
-	     <if @show_drop_button_p@ eq 1>
-	      <small><include src="/packages/dotlrn/www/deregister-link" url="@member_classes.url@deregister" referer=@referer@></small>
-	     </if>
+        html {align right style "width:5%"}
+        display_template {
+            <if @member_classes.member_state@ eq "needs approval">
+            \[<small> #dotlrn.Pending_Approval# </small>\]
+            </if>
+            <else>
+            <if @show_drop_button_p@ eq 1>
+            <small><include src="/packages/dotlrn/www/deregister-link" url="@member_classes.url@deregister" referer=@referer@></small>
+            </if>
             </else>
-	}
+        }
     }
 }
 
@@ -171,28 +171,28 @@
 
 template::list::create -name member_clubs -multirow member_clubs -pass_properties { show_drop_button_p referer } -html {width 100%} -elements {
     name {
-        html {align left width 75%}
+        html {align left style "width:75%"}
         label "[_ dotlrn.clubs_pretty_name]"
         display_template {
-	    <a href="@member_clubs.url@" title="\#dotlrn.goto_member_clubs_pretty_name\#">@member_clubs.pretty_name@</a>
+            <a href="@member_clubs.url@" title="\#dotlrn.goto_member_clubs_pretty_name\#">@member_clubs.pretty_name@</a>
         }
     }
     role {
         label "\#dotlrn.Role\#"
-	html {width 20%}
+        html {style "width:20%"}
     }
     actions {
         label "\#dotlrn.Actions\#"
-        html {align right width 5%}
+        html {align right style "width:5%"}
         display_template {
-	    <if @member_clubs.member_state@ eq "needs approval">
-	     \[<small> \#dotlrn.Pending_Approval\# </small>\]
-	    </if>
-	    <else>
-	     <if @show_drop_button_p@ eq 1>
-              <small><include src="/packages/dotlrn/www/deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small></td>
-             </if>
-	    </else>
+            <if @member_clubs.member_state@ eq "needs approval">
+            \[<small> \#dotlrn.Pending_Approval\# </small>\]
+            </if>
+            <else>
+            <if @show_drop_button_p@ eq 1>
+            <small><include src="/packages/dotlrn/www/deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small>
+            </if>
+            </else>
         }
     }
 }
@@ -257,90 +257,90 @@
 
 template::list::create -name non_member_classes -multirow non_member_classes -pass_properties { show_drop_button_p referer swa_p} -html {width 100%} -elements {
     name {
-        html {align left width 30%}
+        html {align left style "width:30%"}
         label "[_ dotlrn.classes_pretty_name]"
         display_template {
-	    <if @non_member_classes.join_policy@ eq "open">
-              <if @swa_p@ eq 1><a href="@non_member_classes.url@" title="\\#dotlrn.goto_non_member_classes\\#">@non_member_classes.pretty_name@</a></if>
-              <else>@non_member_classes.pretty_name@</else>
-	    </if>
-	    <else>
-	    @non_member_classes.pretty_name@
-	    </else>
+            <if @non_member_classes.join_policy@ eq "open">
+            <if @swa_p@ eq 1><a href="@non_member_classes.url@" title="\\#dotlrn.goto_non_member_classes\\#">@non_member_classes.pretty_name@</a></if>
+            <else>@non_member_classes.pretty_name@</else>
+            </if>
+            <else>
+            @non_member_classes.pretty_name@
+            </else>
         }
     }
-    descrption {
-        html {align left width 30%}
+    description {
+        html {align left style "width:30%"}
         label "\#dotlrn.Description\#"
-	display_template {@non_member_classes.description;noquote@}
+        display_template {@non_member_classes.description;noquote@}
     }
     term {
         label "\#dotlrn.Term\#"
-	display_template {@non_member_classes.term_name@ @non_member_classes.term_year@}
+        display_template {@non_member_classes.term_name@ @non_member_classes.term_year@}
     }
     start_date {
-	html {align right}
+        html {align right}
         label "\#dotlrn.Start_date\#"
-	display_template {@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@}
+        display_template {@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@}
     }
     actions {
         label "\#dotlrn.Actions\#"
-        html {align right width 5%}
+        html {align right style "width:5%"}
         display_template {
-	    <if @non_member_classes.join_policy@ eq "open">
-	    <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_classes.community_id@" referer=@referer@></small>
-	    </if>
-	    <else>
-	    <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small>
-	    </else>
+            <if @non_member_classes.join_policy@ eq "open">
+            <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_classes.community_id@" referer=@referer@></small>
+            </if>
+            <else>
+            <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small>
+            </else>
         }
     }
 }
 
 db_multirow non_member_classes $non_member_query {} {
-    regsub -all {<p>} $description {<br />} description
+    regsub -all {<p>} $description {<br>} description
 }
 
 template::list::create -name non_member_clubs -multirow non_member_clubs -pass_properties { show_drop_button_p referer swa_p} -html {width 100%} -elements {
     name {
-        html {align left width 30%}
+        html {align left style "width:30%"}
         label "[_ dotlrn.clubs_pretty_name]"
         display_template {
             <if @non_member_clubs.join_policy@ eq "open">
-              <if @swa_p@ eq 1><a href="@non_member_clubs.url@" title="\\#dotlrn.goto_non_member_clubs\\#">@non_member_clubs.pretty_name@</a></if>
-              <else>@non_member_clubs.pretty_name@</else>
+            <if @swa_p@ eq 1><a href="@non_member_clubs.url@" title="\\#dotlrn.goto_non_member_clubs\\#">@non_member_clubs.pretty_name@</a></if>
+            <else>@non_member_clubs.pretty_name@</else>
             </if>
             <else>
             @non_member_clubs.pretty_name@
             </else>
         }
     }
-    descrption {
-        html {align left width 30%}
+    description {
+        html {align left style "width:30%"}
         label "\#dotlrn.Description\#"
         display_template {@non_member_clubs.description;noquote@}
     }
     start_date {
-	html {align right}
+        html {align right}
         label "\#dotlrn.Start_date\#"
         display_template {@non_member_clubs.active_start_date@ - @non_member_clubs.active_end_date@}
     }
     actions {
         label "\#dotlrn.Actions\#"
-        html {align right width 5%}
+        html {align right style "width:5%"}
         display_template {
             <if @non_member_clubs.join_policy@ eq "open">
             <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small>
             </if>
             <else>
-            <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership">
+            <small><include src="/packages/dotlrn/www/register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small>
             </else>
         }
     }
 }
 
 db_multirow non_member_clubs select_non_member_clubs {} {
-    regsub -all {<p>} $description {<br />} description
+    regsub -all {<p>} $description {<br>} description
 }