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.2.1 -r1.3.2.2
--- openacs-4/packages/calendar/www/navbar.adp	22 May 2008 17:40:55 -0000	1.3.2.1
+++ openacs-4/packages/calendar/www/navbar.adp	23 May 2008 09:24:29 -0000	1.3.2.2
@@ -4,10 +4,7 @@
     <td>
       <multiple name="views">
         <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.select_views_name#" >
-        </if>
+        <a href="@views.url@" title="#calendar.select_views_name#" class="cal-icons @views.text@-view" <if @views.onclick@ ne "">onclick="@views.onclick@"</if>>
         @views.name;noquote@</a></span>@views.spacer;noquote@
       </multiple>
     </td>
Index: openacs-4/packages/calendar/www/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/calendar/www/navbar.tcl	15 May 2007 20:14:21 -0000	1.2
+++ openacs-4/packages/calendar/www/navbar.tcl	23 May 2008 09:24:29 -0000	1.2.2.1
@@ -34,13 +34,12 @@
     set link "[export_vars -base $base_url {date {view day}}]&export=print"
 }
 
-multirow create views name text url icon spacer selected_p onclick
+multirow create views name text url spacer selected_p onclick
 
 multirow append views \
     "Day" \
     "day" \
     "[export_vars -base $base_url {date {view day}}]${page_num}\#calendar" \
-    "/resources/calendar/images/calendar_view_day.gif" \
     "&nbsp;&nbsp; | &nbsp;&nbsp;" \
     $day_selected_p \
     ""
@@ -49,7 +48,6 @@
     "Week" \
     "week" \
     "[export_vars -base $base_url {date {view week}}]${page_num}\#calendar" \
-    "/resources/calendar/images/calendar_view_week.gif" \
     "&nbsp;&nbsp; | &nbsp;&nbsp;" \
     $week_selected_p \
     ""
@@ -58,7 +56,6 @@
     "Month" \
     "month" \
     "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
-    "/resources/calendar/images/calendar_view_month.gif" \
     "&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" \
     $month_selected_p \
     ""
@@ -67,7 +64,6 @@
     " Calendar" \
     "calendar" \
     "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
-    "/resources/calendar/images/calendar-icon.gif" \
     "&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;" \
     $calendar_selected_p \
     ""
@@ -76,7 +72,6 @@
     " List" \
     "list" \
     "[export_vars -base $base_url {date {view list}}]${page_num}${url_stub_period_days}\#calendar" \
-    "/resources/calendar/images/list-icon.gif" \
     "&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;" \
     $list_selected_p \
     ""
@@ -85,7 +80,6 @@
     " Print" \
     "print" \
     "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print" \
-    "/resources/calendar/images/print-icon.gif" \
     "" \
     f \
     "return calOpenPrintView('[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print');"
Index: openacs-4/packages/calendar/www/resources/calendar.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/calendar/www/resources/calendar.css	15 May 2007 20:14:21 -0000	1.12
+++ openacs-4/packages/calendar/www/resources/calendar.css	23 May 2008 09:24:29 -0000	1.12.2.1
@@ -310,18 +310,44 @@
 	border:0px; 
 }
 
+a.cal-icons {
+    background-color: inherit;
+    background-position : left bottom;
+    background-repeat : no-repeat;
+    padding-left : 20px;
+}
 
+a.day-view {
+    background-image: url("/resources/calendar/images/calendar_view_day.gif");
+}
 
+a.week-view {
+    background-image: url("/resources/calendar/images/calendar_view_week.gif");
+}
 
+a.month-view {
+    background-image: url("/resources/calendar/images/calendar_view_month.gif");
+}
 
+a.calendar-view {
+    background-image: url("/resources/calendar/images/calendar-icon.gif");
+}
 
+a.list-view {
+    background-image: url("/resources/calendar/images/list-icon.gif");
+}
 
+a.print-view {
+    background-image: url("/resources/calendar/images/print-icon.gif");
+}
 
 
 
 
 
 
+
+
 /* UNUSED?*/
 
 
Index: openacs-4/packages/theme-zen/www/resources/css/highContrast.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/highContrast.css,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/theme-zen/www/resources/css/highContrast.css	21 May 2008 17:08:19 -0000	1.2.2.1
+++ openacs-4/packages/theme-zen/www/resources/css/highContrast.css	23 May 2008 09:24:29 -0000	1.2.2.2
@@ -38,7 +38,7 @@
 a:hover {
 	color: #222222;
 	text-decoration:underline;
-	background: #cccc3d;
+	background-color: #cccc3d;
 }
 
 /* END OF STANDARD TAGS */
Index: openacs-4/packages/theme-zen/www/resources/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/main.css,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/theme-zen/www/resources/css/main.css	21 May 2008 17:59:19 -0000	1.2.2.2
+++ openacs-4/packages/theme-zen/www/resources/css/main.css	23 May 2008 09:24:29 -0000	1.2.2.3
@@ -55,7 +55,7 @@
 a:hover {
   color: #235c96;
   text-decoration:underline;
-  background: #f3f1e9;
+  background-color: #f3f1e9;
 }