Index: openacs-4/packages/calendar/www/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/navbar.tcl	30 Aug 2008 19:51:23 -0000	1.3
+++ openacs-4/packages/calendar/www/navbar.tcl	9 Nov 2008 23:29:22 -0000	1.4
@@ -37,49 +37,34 @@
 multirow create views name text url spacer selected_p onclick
 
 multirow append views \
-    "Day" \
+    [_ calendar.Day] \
     "day" \
     "[export_vars -base $base_url {date {view day}}]${page_num}\#calendar" \
     "   |   " \
     $day_selected_p \
     ""
 
 multirow append views \
-    "Week" \
+    [_ calendar.Week] \
     "week" \
     "[export_vars -base $base_url {date {view week}}]${page_num}\#calendar" \
     "   |   " \
     $week_selected_p \
     ""
 
 multirow append views \
-    "Month" \
+    [_ calendar.Month] \
     "month" \
     "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
     "   |      " \
     $month_selected_p \
     ""
 
 multirow append views \
-    " Calendar" \
-    "calendar" \
-    "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
-    "    |    " \
-    $calendar_selected_p \
-    ""
-
-multirow append views \
-    " List" \
+    [_ calendar.List] \
     "list" \
     "[export_vars -base $base_url {date {view list}}]${page_num}${url_stub_period_days}\#calendar" \
-    "    |    " \
+    "" \
     $list_selected_p \
     ""
 
-multirow append views \
-    " Print" \
-    "print" \
-    "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print" \
-    "" \
-    f \
-    "return calOpenPrintView('[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print');"