Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -r1.21 -r1.21.2.1
--- openacs-4/packages/calendar/www/mini-calendar.adp	3 Jan 2008 18:15:23 -0000	1.21
+++ openacs-4/packages/calendar/www/mini-calendar.adp	22 May 2008 17:40:54 -0000	1.21.2.1
@@ -98,4 +98,3 @@
 
   <formtemplate id="go-to-date"></formtemplate>
 
-
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/calendar/www/mini-calendar.tcl	13 Aug 2007 06:06:33 -0000	1.18
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	22 May 2008 17:40:55 -0000	1.18.2.1
@@ -8,16 +8,15 @@
 
 ad_form -name go-to-date -method get -has_submit 1 -action $base_url  -export [lappend list_of_vars page_num] -html {class inline-form} -form {
     {date:text,nospell,optional
-	{label ""}
-	{html {size 10}}
-	{after-html "<br>[_ acs-datetime.Date_as_YYYYMMDD]"}
+        {label "[_ acs-datetime.Date]"}
+        {html {size 10}}
     }
     {btn_ok:text(submit)
         {label "[_ calendar.Go_to_date]"}
     } 
     {view:text(hidden)
-	{label ""}
-	{value "day"}
+        {label ""}
+        {value "day"}
     }
 } -on_submit { }
 
Index: openacs-4/packages/calendar/www/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/calendar/www/navbar.adp	13 Aug 2007 06:37:57 -0000	1.3
+++ openacs-4/packages/calendar/www/navbar.adp	22 May 2008 17:40:55 -0000	1.3.2.1
@@ -6,7 +6,7 @@
         <span<if @views.selected_p@ true> class="active"</if>>
         <a href="@views.url@" title="#calendar.select_views_name#" <if @views.onclick@ ne "">onclick="@views.onclick@"</if>>
         <if @views.icon@ ne "">
-          <img src="@views.icon@" class="topnavbar-icon" alt="#calendar.view#" >
+          <img src="@views.icon@" class="topnavbar-icon" alt="#calendar.select_views_name#" >
         </if>
         @views.name;noquote@</a></span>@views.spacer;noquote@
       </multiple>
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.33 -r1.33.2.1
--- openacs-4/packages/calendar/www/view.adp	3 Jan 2008 18:15:23 -0000	1.33
+++ openacs-4/packages/calendar/www/view.adp	22 May 2008 17:40:55 -0000	1.33.2.1
@@ -11,19 +11,17 @@
       <include src="mini-calendar" base_url="view" view="@view@" date="@date@">
     </else>
     <p>
-    <a href="@add_item_url@" title="#calendar.Add_Item#"><img style="border: 0; text-align: left" src="/resources/acs-subsite/add.gif" alt="">#calendar.Add_Item#</a>
+    <a href="@add_item_url@" title="#calendar.Add_Item#" class="button">#calendar.Add_Item#</a>
+    <if @admin_p@ true>
+      <a href="admin/" title="#calendar.lt_Calendar_Administrati#" class="button">#calendar.lt_Calendar_Administrati#</a>
+    </if>
     </p>
   
     <p>
     <if @calendar_personal_p@ false>
 	    @notification_chunk;noquote@
     </if>
     </p>
-    <p>
-    <if @admin_p@ true>
-      <a href="admin/" title="#calendar.lt_Calendar_Administrati#">#calendar.lt_Calendar_Administrati#</a>
-    </if>
-    </p>
   
     <p>
     <include src="cal-options">	
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v
diff -u -r1.28 -r1.28.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	3 Jan 2008 18:16:48 -0000	1.28
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	22 May 2008 17:40:55 -0000	1.28.2.1
@@ -35,13 +35,14 @@
           date="@date@" 
           page_num="@page_num@">
  
+       <p>
 		<if @create_p@> 
 			<a href="@add_item_url@" title="#calendar-portlet.Add_an_item#" class="button">#calendar-portlet.Add_an_item#</a>
 		</if>
 		<if @admin_p@>
 			<a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@" title="#calendar-portlet.Manage_Item_Types#" class="button">#calendar-portlet.Manage_Item_Types#</a>
 		</if>
-
+       </p>
       </td>
 
       <td valign=top>