Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl,v
diff -u -r1.7 -r1.7.4.1
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	8 Aug 2006 21:26:18 -0000	1.7
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	27 May 2008 15:44:52 -0000	1.7.4.1
@@ -28,7 +28,7 @@
                 set checked_html ""
         }
 
-        set dow_string "$dow_string <INPUT TYPE=checkbox name=days_of_week value=[lindex $dow 1] $checked_html id=\"cal_item:elements:interval_type:days_of_week\" >[lindex $dow 0] &nbsp;\n"
+    set dow_string "$dow_string <INPUT TYPE=checkbox name=days_of_week value=[lindex $dow 1] $checked_html id=\"cal_item:elements:interval_type:days_of_week:[lindex $dow 1]\" >[lindex $dow 0] &nbsp;\n"
 }
 
 set recurrance_options [list \
@@ -56,11 +56,10 @@
 
     {recur_until:date
         {label "[_ calendar.lt_Repeat_this_event_unt]"}
-	{format "YYYY MM DD"}
-	{html {id sel1}}
-	{after_html {<input type="button" style="height:23px; width:23px; background: url('/resources/acs-templating/calendar.gif');" onclick ="return showCalendarWithDateWidget('sel1', 'y-m-d');" /> \[<b>[_ calendar.y-m-d]</b>\] 
-        } }
-
+        {format "YYYY MM DD"}
+        {after_html {<input type="button" style="height:23px; width:23px; background: url('/resources/acs-templating/calendar.gif');" onclick ="return showCalendarWithDateWidget('recur_until', 'y-m-d');"> \[<b>[_ calendar.y-m-d]</b>\]} 
+        }
+        
     }
 
     {submit:text(submit) {label "[_ calendar.Add_Recurrence]"}}
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	17 Dec 2007 14:10:37 -0000	1.14
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	27 May 2008 15:44:52 -0000	1.14.2.1
@@ -2,53 +2,57 @@
     <property name="title">#calendar.Calendar_Item_Delete#: @cal_item.name;noquote@</property>
     <property name="context">#calendar.Delete#</property>
 
-    <table>
+    <div id="viewadp-mini-calendar">
+      <include src="mini-calendar" base_url="view" view="day" date="@date@">
+    </div>	
 
-      <tr>
-        <td valign=top>
-          <include src="mini-calendar" base_url="view" view="day" date="@date@">
-        </td>	
+    <div id="viewadp-cal-table" class="margin-form margin-form-div">
 
-        <td valign=top> 
-          <table>
-            <tr>
-              <th align=right>#calendar.Title#</th>
-              <td>@cal_item.name@</td>
-            </tr>
-            <if @cal_item.item_type@ not nil>
-              <tr>
-                <th align=right>#calendar.Type#</th>
-                <td>@cal_item.item_type@</td>
-              </tr>
-            </if>
-            <tr>
-              <th align=right>
-                #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>
-              <th align=right>#calendar.Description#</th>
-              <td>@cal_item.description@</td>
-            </tr>
-          </table>
-          <if @cal_item.recurrence_id@ not nil>
-            <p><b>#calendar.lt_This_is_a_repeating_e#</b>#calendar._You_may_choose_to#</p>
-            <ul>
-              <li> <a href="cal-item-delete?cal_item_id=@cal_item_id@&confirm_p=1">#calendar.lt_delete_only_this_inst#</a></li>
-              <li> <a href="cal-item-delete-all-occurrences?recurrence_id=@cal_item.recurrence_id@">#calendar.lt_delete_all_occurrence#</a></li>
-            </ul>
-          </if>
-          <else>
-            <p align=center>#calendar.lt_Are_you_sure_you_want_1#</p>
-            <p align=center>
-              <a href="cal-item-delete?cal_item_id=@cal_item_id@&confirm_p=1" title="#calendar.yes_delete_it#" class="button">#calendar.yes_delete_it#</a>
-              <a href="cal-item-view?cal_item_id=@cal_item_id@" title="#calendar.no_keep_it#" class="button">#calendar.no_keep_it#</a>
-            </p>
-          </else>
-        </td>
-      </tr>
-    </table>
+      <div class="form-item-wrapper">
+        <div class="form-label"><strong>#calendar.Title#</strong></div>
+        <div class="form-widget">@cal_item.name@</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>
+
+      <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_url@">@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>
+      <div class="form-item-wrapper">
+        <div class="form-label"><strong>#calendar.Description#</strong></div>
+        <div class="form-widget">@cal_item.description@</div>
+      </div>
+
+      <div class="form-button">
+        <if @cal_item.recurrence_id@ not nil>
+          <p>
+            <strong>#calendar.lt_This_is_a_repeating_e#</strong>
+            #calendar._You_may_choose_to#
+          </p>
+          <p>
+            <a href="@delete_one@" class="button">#calendar.lt_delete_only_this_inst#</a>
+            <a href="@delete_all@" class="button">#calendar.lt_delete_all_occurrence#</a>
+        </if>
+        <else>
+          <p>#calendar.lt_Are_you_sure_you_want_1#</p>
+          <p>
+            <a href="@delete_confirm@" title="#calendar.yes_delete_it#" class="button">#calendar.yes_delete_it#</a>
+            <a href="@delete_cancel@" title="#calendar.no_keep_it#" class="button">#calendar.no_keep_it#</a>
+          </p>
+        </else>
+      </div>
+    </div>
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	22 May 2008 11:34:32 -0000	1.10.2.1
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	27 May 2008 15:44:52 -0000	1.10.2.2
@@ -26,4 +26,15 @@
 template::head::add_css -href "/resources/calendar/calendar.css" -media all
 template::head::add_css -alternate -href "/resources/calendar/calendar-hc.css" -title "highContrast"
 
+
+set view_url [export_vars -base "view" {{view day} {date $cal_item(start_date)}}]
+
+if {  $cal_item(recurrence_id) ne "" } {
+    set delete_one [export_vars -base "cal-item-delete" {cal_item_id {confirm_p 1}}]
+    set delete_all [export_vars -base "cal-item-delete-all-occurrences" {{recurrence_id $cal_item(recurrence_id)}}]
+} else {
+    set delete_confirm [export_vars -base "cal-item-delete" {cal_item_id {confirm_p 1}}]
+    set delete_cancel [export_vars -base "cal-item-view" {cal_item_id}]
+}
+
 ad_return_template