Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/calendar/www/view.adp	27 Oct 2014 16:41:09 -0000	1.37
+++ openacs-4/packages/calendar/www/view.adp	14 Jul 2015 22:36:43 -0000	1.38
@@ -1,14 +1,14 @@
 <master>
 <property name="doc(title)">#calendar.Calendars#</property>
 
-<include src="/packages/calendar/www/navbar" view="@view@" base_url="@ad_conn_url@" date="@date@">
+<include src="/packages/calendar/www/navbar" view="@view;literal@" base_url="@ad_conn_url;literal@" date="@date;literal@">
 
   <div id="viewadp-mini-calendar">
     <if @view@ eq "list">
-      <include src="mini-calendar" base_url="view" view="@view@" date="@date@" period_days="@period_days@">
+      <include src="mini-calendar" base_url="view" view="@view;literal@" date="@date;literal@" period_days="@period_days;literal@">
     </if>
     <else>
-      <include src="mini-calendar" base_url="view" view="@view@" date="@date@">
+      <include src="mini-calendar" base_url="view" view="@view;literal@" date="@date;literal@">
     </else>
     <p>
     <a href="@add_item_url@" title="#calendar.Add_Item#" class="button">#calendar.Add_Item#</a>
@@ -28,40 +28,40 @@
     <if @view@ eq "list">
       <include src="view-list-display"
         portlet_p="0"
-        start_date="@start_date@"
-        return_url="@return_url@"
-        end_date="@end_date@"
-        date="@date@"
-        period_days="@period_days@"
-        sort_by="@sort_by@"
-        show_calendar_name_p="@show_calendar_name_p@"
-        export="@export@"> 
+        start_date="@start_date;literal@"
+        return_url="@return_url;literal@"
+        end_date="@end_date;literal@"
+        date="@date;literal@"
+        period_days="@period_days;literal@"
+        sort_by="@sort_by;literal@"
+        show_calendar_name_p="@show_calendar_name_p;literal@"
+        export="@export;literal@"> 
     </if>
 
     <if @view@ eq "day">
       <include src="view-one-day-display"
-        date="@date@" 
+        date="@date;literal@" 
         start_display_hour="7"
         end_display_hour="22"
-        return_url="@return_url@"
+        return_url="@return_url;literal@"
         calendar_url=""
-        show_calendar_name_p="@show_calendar_name_p@">
+        show_calendar_name_p="@show_calendar_name_p;literal@">
     </if>
     
     <if @view@ eq "week">
       <include src="view-week-display"
-        date="@date@"
-        return_url="@return_url@"
+        date="@date;literal@"
+        return_url="@return_url;literal@"
         calendar_url=""
-        show_calendar_name_p="@show_calendar_name_p@">
+        show_calendar_name_p="@show_calendar_name_p;literal@">
     </if>
     
     
     <if @view@ eq "month">
       <include src="view-month-display"
-        date="@date@"
-        return_url="@return_url@"
+        date="@date;literal@"
+        return_url="@return_url;literal@"
         calendar_url=""
-        show_calendar_name_p="@show_calendar_name_p@">
+        show_calendar_name_p="@show_calendar_name_p;literal@">
     </if>
    </div>