Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/calendar/www/cal-item-view.adp	13 Jan 2005 13:56:30 -0000	1.25
+++ openacs-4/packages/calendar/www/cal-item-view.adp	16 Aug 2006 17:52:14 -0000	1.26
@@ -9,99 +9,68 @@
 <table width="95%">
 
   <tr>
-  <td valign=top width=150>
+  <td valign="top" width="150">
   <include src="mini-calendar" base_url="view" view="day" date="@date@">
   </td>	
 
-  <td valign=top> 
+  <td valign="top"> 
   <table class="cal-table-display">
+    <caption>Calendar Event Details</caption>
     <tr>
-    <td colspan="2" class="cal-table-title">
-    Calendar Event Details:
-    </td>
+     <th class="cal-table-data-title">#calendar.Title#</th>
+     <td>@cal_item.name@</td>
     </tr>
 
     <tr>
-    <td class="cal-table-data-title">#calendar.Title#
-    </td>
-    <td >@cal_item.name@</td>
+     <th class="cal-table-data-title">#calendar.Description#:</th>
+     <td>@cal_item.description;noquote@</td>
     </tr>
 
     <tr>
-    <td class="cal-table-data-title">#calendar.Description#:
-    </td>
-    <td>@cal_item.description;noquote@
+     <th class="cal-table-data-title">#calendar.Sharing#:</th>
+     <td>@cal_item.calendar_name@</td>
     </tr>
 
     <tr>
-    <td class="cal-table-data-title">#calendar.Sharing#:
-    </td>
-    <td>@cal_item.calendar_name@
+     <th class="cal-table-data-title">#calendar.Date_1#<if @cal_item.no_time_p@ eq 0> #calendar.and_Time#</if>:</th>
+     <td><a href="./view?view=day&date=@cal_item.start_date@">@cal_item.pretty_short_start_date@</a>
+     <if @cal_item.no_time_p@ eq 0>, #calendar.from# @cal_item.start_time@ #calendar.to# @cal_item.end_time@</if></td>
     </tr>
 
-    <tr>
-    <td class="cal-table-data-title">#calendar.Date_1#
-    <if @cal_item.no_time_p@ eq 0> 
-    #calendar.and_Time#
-    </if>
-    :
-    <td>
-    <a
-    href="./view?view=day&date=@cal_item.start_date@">@cal_item.pretty_short_start_date@</a>
-    <if @cal_item.no_time_p@ eq 0>, #calendar.from# @cal_item.start_time@
-    #calendar.to# @cal_item.end_time@</if>
-    </td>
-    </tr>
-
     <if @cal_item.item_type@ not nil>
-      <tr>
-      <td class="cal-table-data-title">
-      #calendar.Type#
-      </td>
-      <td>
-      @cal_item.item_type@
-      </td>
-      </tr>
+     <tr>
+      <th class="cal-table-data-title">#calendar.Type#</th>
+      <td>@cal_item.item_type@</td>
+     </tr>
     </if>
     
     <if @cal_item.n_attachments@ gt 0>
       <tr>
-      <th align=right>
-      #calendar.Attachments#
-      </th>
+      <th class="cal-table-data-title">#calendar.Attachments#</th>
       <td>
-
+	<ul>
       <%
         foreach attachment $item_attachments {
-        template::adp_puts "<a href=\"[lindex $attachment 2]\">[lindex $attachment 1]</a> &nbsp;"
+        template::adp_puts "<li><a href=\"[lindex $attachment 2]\">[lindex $attachment 1]</a> &nbsp;\[<a href=\"[lindex $attachment 3]\">#attachments.remove#</a>\]</li>"
         }
       %>
+	</ul>
+      	@attachment_options;noquote@
       </td>
       </tr>
     </if>
 
   <tr>
-  <td colspan="2" class="cal-table-title">
-  </td>
-  </tr>
-  <tr>
     <td colspan="2">
       <if @write_p@ true>
         <a href="cal-item-new?cal_item_id=@cal_item_id@&return_url=@return_url@" class="button">#calendar.edit#</a>
         <a href="./cal-item-delete?cal_item_id=@cal_item_id@&return_url=@return_url@" class="button">#calendar.delete#</a>
-      	@attachment_options;noquote@
 	</if>
-      <p><a href="ics/@cal_item_id@.ics" class="button">#calendar.sync_with_Outlook#</a> 
+      <p><a href="ics/@cal_item_id@.ics">#calendar.sync_with_Outlook#</a>
+	<if @cal_item.recurrence_id@ not nil>(<a  href="ics/@cal_item_id@.ics?all_occurences_p=1">#calendar.all_events#</a>)</if>
     </td>
   </tr>
 
-  <if @cal_item.recurrence_id@ not nil>
-    <tr>
-    <td>
-    <a  href="ics/@cal_item_id@.ics?all_occurences_p=1" class="button">#calendar.all_events#</a>
-    </td>
-    <td>Sync all events with Outlook</td>
-    </tr>
-  </if>
+
 </table>
 </table>