Index: openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp	3 Aug 2005 08:30:10 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/lib/cal-view.adp	3 Aug 2005 09:11:19 -0000	1.5
@@ -12,11 +12,11 @@
 </STYLE>
 <table cellpadding="3" cellspacing="3">
   <tr>
-    <td class="list-filter-pane-big" valign="top" width=20%>
+    <td class="list-filter-pane-big" valign="top" width="20%">
         <listfilters name="course_list" style="course-filters"></listfilters>
     </td>
     <td valign="top">
-	<p><a href=".?view=calendar&date=@date@" class="button">View All</a></p>
+	<if @show_view_all@ eq "1" ><p><a href=".?view=calendar&date=@date@" class="button">View All</a></p></if>
 <include src="view-month-display" calendar_id_list="@calendar_id_list@" item_template="@item_template@" next_month_template="@next_month_template@" prev_month_template="@prev_month_template@" date="@date@" add_p="f" link_day_p="f">
     </td>
   </tr>
Index: openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl	3 Aug 2005 08:30:10 -0000	1.5
+++ openacs-4/packages/dotlrn-ecommerce/lib/cal-view.tcl	3 Aug 2005 09:11:19 -0000	1.6
@@ -5,8 +5,12 @@
     @creation-date   11-02-2005
 
 } {
+    course_type_f:optional
     category_f:optional
     uncat_f:optional
+    grade_f:optional
+    terms_f:optional
+    zone_f:optional
     instructor:optional
     { level "" }
     { date "" }
@@ -213,6 +217,15 @@
     values { {List ""} }
 }]
 
+#ns_log notice " *** $grade_f ***"
+
+if { [exists_and_not_null course_type_f] || [exists_and_not_null grade_f] || [exists_and_not_null terms_f] || [exists_and_not_null zone_f]|| [exists_and_not_null instructor] } {
+	set show_view_all "1"
+} else {
+	set show_view_all "0"
+}
+
+
 set cc_package_id [apm_package_id_from_key "dotlrn-catalog"]
 set admin_p [permission::permission_p -object_id $cc_package_id -privilege "admin"]
 template::list::create \
Index: openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp	3 Aug 2005 07:11:37 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/lib/view-month-display.adp	3 Aug 2005 09:11:19 -0000	1.5
@@ -1,20 +1,13 @@
-<table cellpaddin=2 cellspacing=2 border=0>
-	<tr>
-		<td bgcolor="#1958B7">&nbsp;&nbsp;</td><td>Before 12pm</td>
-		<td bgcolor="#E7911E">&nbsp;&nbsp;</td><td>Between 12pm and 5pm</td>
-		<td bgcolor="#A7C3FE">&nbsp;&nbsp;</td><td>After 5pm</td>
-	</tr>
-</table> 
 <table class="cal-table-display" cellpadding="0" cellspacing="0" border="0" width="99%">
   <tr>
-    <td class="cal-month-title-text" colspan="7">
+    <td class="cal-month-title-text" colspan="7" align="center">
       <a href="@previous_month_url;noquote@"><img border=0 src="<%=[dt_left_arrow]%>" alt="back one month"></a>
       @month_string@ @year@
       <a href="@next_month_url;noquote@"><img border=0 src="<%=[dt_right_arrow]%>" alt="forward one month"></a>
     </td>
   </tr>
   <tr>
-    <td>
+    <td align="center">
 
       <table class="cal-month-table" cellpadding="2" cellspacing="2" border="5">
         <tbody>
@@ -68,7 +61,13 @@
     </td>
   </tr>
 </table>
+<table cellpaddin=2 cellspacing=2 border=0>
+	<tr>
+		<td bgcolor="#1958B7">&nbsp;&nbsp;</td><td>Before 12pm</td>
+		<td bgcolor="#E7911E">&nbsp;&nbsp;</td><td>Between 12pm and 5pm</td>
+		<td bgcolor="#A7C3FE">&nbsp;&nbsp;</td><td>After 5pm</td>
+	</tr>
+</table> 
 
 
 
-