Index: openacs-4/packages/calendar/www/view-print-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-print-display.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/calendar/www/view-print-display.adp	25 Mar 2018 22:13:40 -0000	1.5
+++ openacs-4/packages/calendar/www/view-print-display.adp	14 Jul 2022 15:45:01 -0000	1.5.2.1
@@ -32,3 +32,11 @@
 </if>
 </body>
 </html>
+<script type="text/javascript" <if @::__csp_nonce@ not nil> nonce="@::__csp_nonce;literal@"</if>>
+    document.querySelector('#print').addEventListener('click', function (e) {
+        window.print();
+    });
+    document.querySelector('#close').addEventListener('click', function (e) {
+        window.close();
+    });
+</script>
Index: openacs-4/packages/calendar/www/view-print-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-print-display.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/calendar/www/view-print-display.tcl	9 Feb 2020 15:30:16 -0000	1.2.2.1
+++ openacs-4/packages/calendar/www/view-print-display.tcl	14 Jul 2022 15:45:01 -0000	1.2.2.2
@@ -1,7 +1,17 @@
+ad_include_contract {
 
-template::add_event_listener -id "print" -script {window.print();}
-template::add_event_listener -id "close" -script {window.close();}
+    Displays a UI that allows to print the displayed calendar in PDF
+    format.
 
+    @param items this is a multirow that we expect to be passed by the
+                 including page. It contains the calendar items we are
+                 supposed to render.
+
+} {
+    items
+    {show_calendar_name_p:boolean true}
+}
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -r1.32.2.3 -r1.32.2.4
--- openacs-4/packages/calendar/www/view.tcl	14 Jul 2022 14:49:26 -0000	1.32.2.3
+++ openacs-4/packages/calendar/www/view.tcl	14 Jul 2022 15:45:01 -0000	1.32.2.4
@@ -12,6 +12,7 @@
     {sort_by ""}
     {start_date ""}
     {period_days:integer,notnull {[parameter::get -parameter ListView_DefaultPeriodDays -default 31]}}
+    {export:token ""}
 } -validate {
     valid_period_days  -requires { period_days } {
         # Tcl allows in for relative times just 6 digits, including the "+"
@@ -26,8 +27,6 @@
 
 set ad_conn_url [ad_conn url]
 
-set export [ns_queryget export]
-
 if {$export eq "print"} {
     set view "list"
 }