Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v
diff -u -r1.28.2.5 -r1.28.2.6
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	10 Mar 2007 19:44:45 -0000	1.28.2.5
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	16 Mar 2007 13:20:10 -0000	1.28.2.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="calendar" package_version="2.1.0b6" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="calendar" package_version="2.1.0b7" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_You_may_choose_to">. You may choose to:</msg>
   <msg key="Add">Add</msg>
@@ -22,6 +22,7 @@
   <msg key="Calendar">Calendar</msg>
   <msg key="Calendar_Add_Item">Calendar: Add Item</msg>
   <msg key="Calendar_Edit_Item">Calendar: Edit Item</msg>
+  <msg key="calendar_event_details">Calendar Event Details</msg>
   <msg key="Calendar_Item">Calendar Item</msg>
   <msg key="Calendar_Item_Delete">Calendar Item Delete</msg>
   <msg key="Calendar_Item_Types">Calendar Item Types</msg>
@@ -69,6 +70,7 @@
   <msg key="Go_to_monthsname">Go to %months.name%</msg>
   <msg key="Go_to_year_next_year">Go to year %next_year%</msg>
   <msg key="Go_to_year_prev_year">Go to year %prev_year%</msg>
+  <msg key="goto_cal_item_start_date">Go to %cal_item.pretty_short_start_date%</msg>
   <msg key="goto_day_items_day_number">Go to day %items.day_number%</msg>
   <msg key="goto_days_day_number">Go to day %days.day_number%</msg>
   <msg key="goto_items_event_name">Go to %items.event_name%</msg>
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.11.12.1 -r1.11.12.2
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	16 Mar 2007 13:05:00 -0000	1.11.12.1
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	16 Mar 2007 13:20:10 -0000	1.11.12.2
@@ -15,10 +15,15 @@
         <td valign=top> 
           <table>
             <tr>
-              <td colspan=2>
-                <blockquote>@cal_item.description@</blockquote>
-              </td>
+              <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>:
@@ -29,31 +34,24 @@
               </td>
             </tr>
             <tr>
-              <th align=right>#calendar.Title#</th>
-              <td>@cal_item.name@</td>
+              <th align=right>#calendar.Description#</th>
+              <td>@cal_item.description@</td>
             </tr>
-            <if @cal_item.item_type@ not nil>
-              <tr>
-                <th align=right>#calendar.Type#</th>
-                <td>@cal_item.item_type@</td>
-              </tr>
-            </if>
           </table>
-          <p>
-            <if @cal_item.recurrence_id@ not nil>
-              <b>#calendar.lt_This_is_a_repeating_e#</b>#calendar._You_may_choose_to#
-              <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>
-              #calendar.lt_Are_you_sure_you_want_1#
-              <ul>
-                <li> <a href="cal-item-delete?cal_item_id=@cal_item_id@&confirm_p=1">#calendar.yes_delete_it#</a></li>
-                <li> <a href="cal-item-view?cal_item_id=@cal_item_id@">#calendar.no_keep_it#</a></li>
-              </ul>
-            </else>
+          <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>
Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/calendar/www/cal-item-new.adp	26 Aug 2006 00:50:19 -0000	1.17
+++ openacs-4/packages/calendar/www/cal-item-new.adp	16 Mar 2007 13:20:10 -0000	1.17.2.1
@@ -15,7 +15,7 @@
 </property>
 
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
     function disableTime(form_name) {
           <multiple name="time_format_elms">
             document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = true;
@@ -51,7 +51,7 @@
   </div>
 
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
   // TimePChanged();
   @js;noquote@
 </script>
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.31.2.1 -r1.31.2.2
--- openacs-4/packages/calendar/www/cal-item-new.tcl	9 Feb 2007 16:07:38 -0000	1.31.2.1
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	16 Mar 2007 13:20:10 -0000	1.31.2.2
@@ -65,9 +65,8 @@
     }
     {date:date
         {label "[_ calendar.Date_1]"}
-	{format "YYYY MM DD"}
-        {html {id date} } 
-	{after_html {<input type="button" style="height:23px; width:23px; background: url('/resources/acs-templating/calendar.gif');" onclick ="return showCalendarWithDateWidget('date', '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('date', 'y-m-d');" /> \[<b>[_ calendar.y-m-d]</b>\]} } }
     {time_p:text(radio)     
         {label "&nbsp;"}
         {html {onClick "javascript:TimePChanged(this);"}} 
@@ -87,7 +86,7 @@
 
     {description:text(textarea),optional
         {label "[_ calendar.Description]"}
-        {html {cols 45 rows 10 wrap soft} maxlength 255}
+        {html {cols 45 rows 10}}
     }
     {calendar_id:integer(radio)
         {label "[_ calendar.Sharing]"}
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.2.1 -r1.28.2.2
--- openacs-4/packages/calendar/www/cal-item-view.adp	9 Feb 2007 16:07:38 -0000	1.28.2.1
+++ openacs-4/packages/calendar/www/cal-item-view.adp	16 Mar 2007 13:20:10 -0000	1.28.2.2
@@ -21,7 +21,7 @@
 	
 	<div class="margin-form margin-form-div">
 		
-		<h1>Calendar Event Details</h1>
+		<h1>#calendar.calendar_event_details#</h1>
 		
 		<div class="form-item-wrapper">
 			<div class="form-label">
@@ -53,7 +53,7 @@
 				<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>
+				<a href="@goto_date_url@" title="#calendar.goto_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>
@@ -89,11 +89,11 @@
 		
 		<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>
+		        <a href="@cal_item_new_url@" title="#calendar.edit#" class="button">#calendar.edit#</a>
+		        <a href="@cal_item_delete_url@" title="#calendar.delete#" 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>
+			 	<a href="ics/@cal_item_id@.ics" title="#calendar.sync_with_Outlook#" 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" title="#calendar.all_events#">#calendar.all_events#</a>)</if>
 		
 			</if>
 		</div>
Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/calendar/www/cal-item-view.tcl	26 Aug 2006 00:50:19 -0000	1.18
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	16 Mar 2007 13:20:10 -0000	1.18.2.1
@@ -43,5 +43,10 @@
 set show_synch_p [parameter::get -package_id $package_id -parameter ShowSynchP -default 1]
 set cal_item(description) [ad_html_text_convert -from text/enhanced -to text/html $cal_item(description)]
 
+# actions URLs
+set goto_date_url [export_vars -base "./view" {{view day} {date $cal_item(start_date)}}]
+set cal_item_new_url [export_vars -base "cal-item-new" {cal_item_id return_url}]
+set cal_item_delete_url [export_vars -base "cal-item-delete" {cal_item_id return_url}]
+
 ad_return_template