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.28 -r1.28.2.1
--- openacs-4/packages/calendar/www/cal-item-view.adp	15 Dec 2006 22:45:20 -0000	1.28
+++ openacs-4/packages/calendar/www/cal-item-view.adp	9 Feb 2007 16:07:38 -0000	1.28.2.1
@@ -6,6 +6,10 @@
 </property>
 <property name="displayed_object_id">@cal_item_id@</property>
 
+
+
+
+
 <table width="95%">
 
   <tr>
@@ -14,62 +18,86 @@
   </td>	
 
   <td valign="top"> 
-  <table class="cal-table-display">
-    <caption>Calendar Event Details</caption>
-    <tr>
-     <th class="cal-table-data-title">#calendar.Title#</th>
-     <td>@cal_item.name@</td>
-    </tr>
+	
+	<div class="margin-form margin-form-div">
+		
+		<h1>Calendar Event Details</h1>
+		
+		<div class="form-item-wrapper">
+			<div class="form-label">
+				<strong>#calendar.Title#</strong>
+			</div>
+			<div class="form-widget">                  
+				@cal_item.name@
+			</div>	  
+		</div>
+		<div class="form-item-wrapper">
+			<div class="form-label">
+				<strong>#calendar.Description#:</strong>
+			</div>
 
-    <tr>
-     <th class="cal-table-data-title">#calendar.Description#:</th>
-     <td>@cal_item.description;noquote@</td>
-    </tr>
-
-    <tr>
-     <th class="cal-table-data-title">#calendar.Sharing#:</th>
-     <td>@cal_item.calendar_name@</td>
-    </tr>
-
-    <tr>
-     <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>
-
-    <if @cal_item.item_type@ not nil>
-     <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 class="cal-table-data-title">#calendar.Attachments#</th>
-      <td>
-	<ul>
-      <%
-        foreach attachment $item_attachments {
-        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">
-      <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>
-	</if>
-      <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>
-
-
+			<div class="form-widget">                  
+				@cal_item.description;noquote@
+			</div>  
+		</div>
+		<div class="form-item-wrapper">
+			<div class="form-label">
+				<strong>#calendar.Sharing#:</strong>
+			</div>
+			<div class="form-widget">                  
+				@cal_item.calendar_name@
+			</div>  
+		</div>
+		<div class="form-item-wrapper">
+			<div class="form-label">
+				<strong>#calendar.Date_1#<if @cal_item.no_time_p@ eq 0> #calendar.and_Time#</if>:</strong>
+			</div>
+			<div class="form-widget">                  
+				<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>
+			</div>  
+		</div>
+		
+		<if @cal_item.item_type@ not nil>
+			<div class="form-item-wrapper">
+				<div class="form-label">
+					<strong>#calendar.Type#</strong>
+				</div>
+				<div class="form-widget">                  
+					@cal_item.item_type@
+				</div>  
+			</div>
+		</if>
+		
+		<if @cal_item.n_attachments@ gt 0>
+			<div class="form-item-wrapper">
+				<div class="form-label">
+					<strong>#calendar.Attachments#</strong>
+				</div>
+				<div class="form-widget">                  
+					<ul>
+						<%
+						foreach attachment $item_attachments {
+							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@ -->
+				</div>  
+			</div>
+		</if>
+		
+		<div class="form-button">
+			<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@ 
+			 	<a href="ics/@cal_item_id@.ics" class="button">#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>
+		
+			</if>
+		</div>
+		
+		
+	</div>
 </table>
-</table>