Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/dotlrn/www/admin/class.adp	13 Dec 2002 16:06:33 -0000	1.30
+++ openacs-4/packages/dotlrn/www/admin/class.adp	13 Jan 2005 13:57:21 -0000	1.31
@@ -1,130 +1,105 @@
 <%
 
-    #
-    #  Copyright (C) 2001, 2002 MIT
-    #
-    #  This file is part of dotLRN.
-    #
-    #  dotLRN is free software; you can redistribute it and/or modify it under the
-    #  terms of the GNU General Public License as published by the Free Software
-    #  Foundation; either version 2 of the License, or (at your option) any later
-    #  version.
-    #
-    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
-    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    #  details.
-    #
+  #
+  #  Copyright (C) 2001, 2002 MIT
+  #
+  #  This file is part of dotLRN.
+  #
+  #  dotLRN is free software; you can redistribute it and/or modify it under the
+  #  terms of the GNU General Public License as published by the Free Software
+  #  Foundation; either version 2 of the License, or (at your option) any later
+  #  version.
+  #
+  #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+  #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  #  details.
+  #
 
-%>
+  %>
 
-<master src="dotlrn-admin-master">
-<property name="title">@pretty_name@</property>
-<property name="context_bar">@context_bar@</property>
+  <master src="dotlrn-admin-master">
+    <property name="title">@pretty_name@</property>
+    <property name="context_bar">@context_bar@</property>
 
-<ul>
+    <ul>
 
-  <li>
-    #dotlrn.description#:
-<if @description@ not nil>
-    @description@
-</if>
-<else>
-    &lt;#dotlrn.no_description#&gt;
-</else>
-  </li>
+      <li>
+	#dotlrn.description#:
+	<if @description@ not nil>
+	  @description@
+	</if>
+	<else>
+	  &lt;#dotlrn.no_description#&gt;
+	</else>
+      </li>
 
-  <br>
+      <br>
 
-  <li>
-    <a href="class-edit?class_key=@class_key@&referer=@referer@">#dotlrn.edit_subject_properties#</a>
-  </li>
+	<li>
+	  <a href="class-edit?class_key=@class_key@&referer=@referer@">#dotlrn.edit_subject_properties#</a>
+	</li>
 
-</ul>
+    </ul>
 
-<br>
+    <center>
 
-<center>
+      <if @can_instantiate@>
+	<table cellpadding="5" width="95%">
+	  <tr>
+	    <td align="left">
+	      <nobr>
+		<small>[
+		  <a href="class-instance-new?class_key=@class_key@">#dotlrn.new_class_instance#</a>
+		  ]</small>
+	      </nobr>
+	    </td>
+	  </tr>
+	</table>
 
-<if @can_instantiate@>
-  <table cellpadding="5" width="95%">
-    <tr>
-      <td align="left">
-        <nobr>
-          <small>[
-            <a href="class-instance-new?class_key=@class_key@">#dotlrn.new_class_instance#</a>
-          ]</small>
-        </nobr>
-      </td>
-    </tr>
-  </table>
+	<br>
+      </if>
+      <else>
+	<include src="need-term-note">
+      </else>
 
-  <br>
-</if>
-<else>
-<include src="need-term-note">
-</else>
+      <table bgcolor="#cccccc" cellpadding="5" width="95%">
+	<tr bgcolor="#eeeeee">
+	  <th align="left" width="50%">
+	    <formtemplate id="term_form">
+	      #dotlrn.term#:&nbsp;<formwidget id="term_id">
+	    </formtemplate>
+	  </th>
+	</tr>
+      </table>
 
-  <table bgcolor="#cccccc" cellpadding="5" width="95%">
-    <tr bgcolor="#eeeeee">
-      <th align="left" width="50%">
-  <formtemplate id="term_form">
-        #dotlrn.term#:&nbsp;<formwidget id="term_id">
-  </formtemplate>
-      </th>
-    </tr>
-  </table>
+      <br>
 
-  <br>
+	  <form action="class" method="GET">
+	    Search classes  with : 
+	    <input name="keyword" onfocus="if(this.value=='Please type a keyword')this.value='';" onblur="if(this.value=='')this.value='Please type a keyword';" value="Please type a keyword" />
+            <input type="hidden" name="class_key" value="@class_key@" />
+            <input type="hidden" name="term_id" value="@term_id@" />
+	    <input type="submit" value="Go" />
+	  </form>
 
-  <table bgcolor="#cccccc" cellpadding="5" width="95%">
-    <tr>
-      <th align="left" width="15%">#dotlrn.term#</th>
-      <th align="left">
-        #dotlrn.class_name_header#
-      </th>
-      <th align="center" width="5%">#dotlrn.members#</th>
-      <th align="center" width="10%">#dotlrn.actions#</th>
-    </tr>
+	<if @class_instances:rowcount@ gt 0>
+	  <listtemplate name="class_instances"></listtemplate>
 
-<if @class_instances:rowcount@ gt 0>
+	</if>
+	<else>
+	  <table>
+	    <tr bgcolor="#eeeeee">
+	      <td align="left" colspan="4">
+		<i>#dotlrn.no_class_instances#</i>
+	      </td>
+	    </tr>
+	  </table>
+	</else>
 
-<multiple name="class_instances">
+    </center>
 
-<if @class_instances.rownum@ odd>
-    <tr bgcolor="#eeeeee">
-</if>
-<else>
-    <tr bgcolor="#d9e4f9">
-</else>
-      <td align="left"><a href="term?term_id=@class_instances.term_id@">@class_instances.term_name@&nbsp;@class_instances.term_year@</a></td>
-      <td align="left"><a href="@class_instances.url@">@class_instances.pretty_name@</a></td>
-      <td align="center">@class_instances.n_members@</td>
-      <td align="center">
-        <nobr>
-        <small>
-           <a href="@class_instances.url@one-community-admin">#dotlrn.administer_link#</a> 
-        </small>
-        </nobr>
-      </td>
-    </tr>
 
-</multiple>
 
-</if>
-<else>
-    <tr bgcolor="#eeeeee">
-      <td align="left" colspan="4">
-        <i>#dotlrn.no_class_instances#</i>
-      </td>
-    </tr>
-</else>
 
-  </table>
 
-</center>
-
-
-
-
-