Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/departments.adp	9 Aug 2002 18:39:27 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	14 Aug 2002 19:18:50 -0000	1.17
@@ -26,12 +26,10 @@
 
   <table cellpadding="5" width="95%">
     <tr>
-      <td align="left">
-        <nobr>
-          <small>[
-            <a href="department-new?referer=@referer@">New <%= [parameter::get -parameter departments_pretty_name] %></a>
-          ]</small>
-        </nobr>
+      <td align="left" style="white-space: nowrap; font-size: x-small;">
+        [
+          <a href="department-new?referer=@referer@">New @departments_pretty_name@</a>
+        ]
       </td>
     </tr>
   </table>
@@ -41,43 +39,51 @@
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
 
     <tr>
-      <th align="left"><%= [parameter::get -parameter departments_pretty_name] %> Name</th>
+      <th align="left">@departments_pretty_name@ Name</th>
       <th align="center" width="10%">Actions</th>
     </tr>
 
-<if @departments:rowcount@ gt 0>
+    <if @departments:rowcount@ gt 0>
 
-<multiple name="departments">
+      <multiple name="departments">
 
-<if @departments.rownum@ odd>
-    <tr bgcolor="#eeeeee">
-</if>
-<else>
-    <tr bgcolor="#d9e4f9">
-</else>
-      <td align="left"><a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a></td>
-      <td align="center">
-<if @can_create@>
-        <nobr>
-          <small>[
-            <a href="class-new?department_key=@departments.department_key@&referer=department?department_key=@departments.department_key@">New <%= [parameter::get -parameter classes_pretty_name] %></a>
-          ]</small>
-        </nobr>
-</if>
-      </td>
-    </tr>
+        <if @departments.rownum@ odd>
+          <tr bgcolor="#eeeeee">
+        </if>
+        <else>
+          <tr bgcolor="#d9e4f9">
+        </else>
+        
+        <td align="left">
+          <a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a>
+        </td>
+        
+        <td align="center" style="white-space: nowrap; font-size: x-small;">
+        
+          <if @can_create@>
+            [
+              <a href="class-new?department_key=@departments.department_key@&referer=department?department_key=@departments.department_key@">New @classes_pretty_name@</a>
+            
+            <if @departments.n_classes@ eq 0>
+            |
+              <a href="department-delete?department_key=@departments.department_key@&pretty_name=@departments.pretty_name@&referer=departments">Delete</a>
+            </if>
+            ]
+          </if>
+        </td>
 
-</multiple>
+          </tr>
+      
+      </multiple>
 
-</if>
-<else>
-    <tr bgcolor="#eeeeee">
-      <td align="left" colspan="2">
-        <i>No <%= [parameter::get -parameter departments_pretty_plural] %></i>
-      </td>
-    </tr>
-</else>
-
+    </if>
+    <else>
+      <tr bgcolor="#eeeeee">
+        <td align="left" colspan="2">
+          <em>No @departments_pretty_plural@</em>
+        </td>
+      </tr>
+    </else>
   </table>
 
 <if @departments:rowcount@ gt 10>
@@ -88,7 +94,7 @@
       <td align="left">
         <nobr>
           <small>[
-            <a href="department-new?referer=@referer@">New <%= [parameter::get -parameter departments_pretty_name] %></a>
+            <a href="department-new?referer=@referer@">New @departments_pretty_name@</a>
           ]</small>
         </nobr>
       </td>
Index: openacs-4/packages/dotlrn/www/admin/departments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/departments.tcl	9 Aug 2002 18:39:27 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/departments.tcl	14 Aug 2002 19:18:50 -0000	1.8
@@ -31,6 +31,9 @@
 set context_bar [parameter::get -parameter departments_pretty_plural]
 set referer departments
 set can_create [dotlrn_class::can_create]
+set departments_pretty_name [parameter::get -parameter departments_pretty_name]
+set departments_pretty_plural [parameter::get -parameter departments_pretty_plural]
+set classes_pretty_name [parameter::get -parameter classes_pretty_name]
 
 db_multirow departments select_departments {}
 
Index: openacs-4/packages/dotlrn/www/admin/departments.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/departments.xql	1 May 2002 01:19:47 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/departments.xql	14 Aug 2002 19:18:50 -0000	1.6
@@ -5,7 +5,10 @@
     <fullquery name="select_departments">
         <querytext>
             select department_key,
-                   pretty_name
+                   pretty_name,
+                   (select count(*)
+                    from dotlrn_classes
+                    where department_key = dotlrn_departments_full.department_key) as n_classes
             from dotlrn_departments_full
             order by pretty_name,
                      department_key