Index: openacs-4/packages/calendar/www/cal-item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-item.adp	11 Feb 2002 20:53:47 -0000	1.3
+++ openacs-4/packages/calendar/www/cal-item.adp	18 Feb 2002 15:14:56 -0000	1.4
@@ -45,7 +45,7 @@
 
   <tr>
     <td valign=top align=right> 
-      <b>Start Time @start_time@</b>
+      <b>Start Time</b>
     </td>
 
     <td valign=top align=left> 
@@ -127,9 +127,10 @@
     <if @action@ eq edit>
       <tr>
         <td colspan=2>
-      	  <li> <a href="/calendar/admin/cal-item-permissions?cal_item_id=@cal_item_id@"> 
-	         Manage the audience to this calendar item
-	       </a>
+      	  <!-- Commented out by Ben (OpenACS) - this is hardwired and isn't well thought out yet
+<li> <a href="/calendar/admin/cal-item-permissions?cal_item_id=@cal_item_id@"> 
+      	         Manage the audience to this calendar item
+	       </a> -->
         </td>
       </tr>
     </if>
Index: openacs-4/packages/calendar/www/cal-options.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-options.adp	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-options.adp	18 Feb 2002 15:14:56 -0000	1.2
@@ -6,11 +6,12 @@
      	@creation-date Dec 14, 2000
      	@cvs-id $Id$
 -->
+<if @empty_p@ eq 0>
 <table>
 
   <tr>
     <td colspan=2> 
-      <b> calendar options </b>
+      <b>Calendar Views:</b>
     </td>
   </tr>
 
@@ -58,7 +59,7 @@
 
   <tr>
     <td colspan=2>
-      <input type=submit value="Toggle Calendars">
+      <input type=submit value="Toggle Calendars Viewed">
     </td>	
   </tr>
  </form>
@@ -72,34 +73,6 @@
    </tr>
 
 </table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+</if>
+<else>
+</else>
Index: openacs-4/packages/calendar/www/cal-options.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-options.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-options.tcl	18 Feb 2002 15:14:56 -0000	1.2
@@ -18,7 +18,7 @@
 
 
 } {
-
+    {action ""}
     {view day}
     {date now}
     {calendar_id:integer "-1"}
@@ -40,6 +40,15 @@
 # get a user_id
 set user_id [ad_verify_and_get_user_id]
 
+# An abort of this if we're adding or editing an item, because this 
+# then becomes more confusing than anything (ben - OpenACS)
+if {$action == "add" || $action == "edit"} {
+    set empty_p 1
+    ad_return_template
+    return
+} else {
+    set empty_p 0
+}
 
 # get a list of the calendars that the user has read access to
 # NOTE: this query would need to optimized. Its take a major