Index: openacs-4/packages/calendar/tcl/calendar-callback-hooks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-callback-hooks-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/calendar/tcl/calendar-callback-hooks-procs.tcl 8 Oct 2019 12:48:47 -0000 1.1.2.1
+++ openacs-4/packages/calendar/tcl/calendar-callback-hooks-procs.tcl 9 Feb 2020 15:30:16 -0000 1.1.2.2
@@ -19,3 +19,9 @@
Puts extra logics after calendar edit.
} -
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/calendar/tcl/calendar-compatibility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-compatibility-procs.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/calendar/tcl/calendar-compatibility-procs.tcl 29 Jun 2018 17:27:18 -0000 1.5
+++ openacs-4/packages/calendar/tcl/calendar-compatibility-procs.tcl 9 Feb 2020 15:30:16 -0000 1.5.2.1
@@ -1,41 +1,42 @@
ad_library {
- These procs are there to ensure backwards compatibility for possible
- API breakages. Once it is sure that an old proc interface is not used
- anymore it should be removed from this file. Also move unused or
+ These procs are there to ensure backwards compatibility for possible
+ API breakages. Once it is sure that an old proc interface is not used
+ anymore it should be removed from this file. Also move unused or
deprecated procs here so that we avoid cluttering up the other files.
@author Dirk Gomez (openacs@dirkgomez.de)
@creation-date Feb 19, 2004
- @cvs-id $Id$
+ @cvs-id $Id$
}
-ad_proc -deprecated calendar_have_private_p {
- {-return_id 0}
+ad_proc -deprecated calendar_have_private_p {
+ {-return_id 0}
{-calendar_id_list {}}
- party_id
+ party_id
} {
@see calendar::have_private_p
} {
calendar::have_private_p -return_id $return_id -calendar_id_list $calendar_id_list $party_id
}
-ad_proc -deprecated calendar_assign_permissions { calendar_id
- party_id
- cal_privilege
- {revoke ""}
+ad_proc -deprecated calendar_assign_permissions {
+ calendar_id
+ party_id
+ cal_privilege
+ {revoke ""}
} {
@see calendar::assign_permissions
} {
calendar::assign_permissions $calendar_id \
- $party_id \
- $cal_privilege \
- $revoke
+ $party_id \
+ $cal_privilege \
+ $revoke
}
ad_proc -deprecated calendar_create { owner_id
- private_p
- {calendar_name ""}
+ private_p
+ {calendar_name ""}
} {
@see calendar::create
} {
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.23 -r1.23.2.1
--- openacs-4/packages/calendar/www/mini-calendar.tcl 22 May 2018 16:44:55 -0000 1.23
+++ openacs-4/packages/calendar/www/mini-calendar.tcl 9 Feb 2020 15:30:16 -0000 1.23.2.1
@@ -16,7 +16,7 @@
}
{btn_ok:text(submit)
{label "[_ calendar.Go_to_date]"}
- }
+ }
{view:text(hidden)
{value "day"}
}
@@ -33,12 +33,12 @@
# Determine whether we need to pass on the period_days variable from the list view
if {$view eq "list"} {
- if {(![info exists period_days] || $period_days eq "")
- || $period_days eq [parameter::get -parameter ListView_DefaultPeriodDays -default 31]
+ if {(![info exists period_days] || $period_days eq "")
+ || $period_days eq [parameter::get -parameter ListView_DefaultPeriodDays -default 31]
} {
- set url_stub_period_days ""
+ set url_stub_period_days ""
} else {
- set url_stub_period_days "&period_days=${period_days}"
+ set url_stub_period_days "&period_days=${period_days}"
}
} else {
set url_stub_period_days ""
@@ -60,11 +60,11 @@
set active_p f
}
if {$viewname eq "list"} {
- multirow append views [lang::util::localize $message_key_array($viewname)] $viewname $active_p \
- "[export_vars -base $base_url {date {view $viewname}}]${page_num}${url_stub_period_days}"
+ multirow append views [lang::util::localize $message_key_array($viewname)] $viewname $active_p \
+ "[export_vars -base $base_url {date {view $viewname}}]${page_num}${url_stub_period_days}"
} else {
- multirow append views [lang::util::localize $message_key_array($viewname)] $viewname $active_p \
- "[export_vars -base $base_url {date {view $viewname}}]${page_num}"
+ multirow append views [lang::util::localize $message_key_array($viewname)] $viewname $active_p \
+ "[export_vars -base $base_url {date {view $viewname}}]${page_num}"
}
}
@@ -110,22 +110,22 @@
set new_row_p [expr {$i / 3}]
if {$i == $curr_month_idx} {
- set current_month_p t
+ set current_month_p t
} else {
set current_month_p f
}
set target_date [clock format \
[clock scan "[expr {$i-$curr_month_idx}] month" -base $now] -format "%Y-%m-%d"]
multirow append months $month $current_month_p $new_row_p \
"[export_vars -base $base_url {{date $target_date} view}]${page_num}${url_stub_period_days}"
-
+
}
} else {
set prev_month [clock format [clock scan "1 month ago" -base $now] -format "%Y-%m-%d"]
set next_month [clock format [clock scan "1 month" -base $now] -format "%Y-%m-%d"]
set prev_month_url "$base_url?view=$view&date=[ad_urlencode $prev_month]${page_num}${url_stub_period_days}"
set next_month_url "$base_url?view=$view&date=[ad_urlencode $next_month]${page_num}${url_stub_period_days}"
-
+
set first_day_of_week [lc_get firstdayofweek]
set week_days [lc_get abday]
set long_weekdays [lc_get day]
@@ -158,10 +158,10 @@
set active_p f
} elseif {$julian_date > $last_julian_date_in_month} {
set active_p f
- }
+ }
set ansi_date [dt_julian_to_ansi $julian_date]
set pretty_date [lc_time_fmt $ansi_date %Q]
-
+
if {$julian_date == $first_julian_date_of_month} {
set day_number 1
} elseif {$julian_date == $last_julian_date_in_month + 1} {
@@ -206,7 +206,7 @@
acs_KeypressGoto('$url#calendar',event);
});
}]
-
+
incr day_number
incr day_of_week
}
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 -r1.2.2.1
--- openacs-4/packages/calendar/www/view-print-display.tcl 7 Aug 2017 23:48:05 -0000 1.2
+++ openacs-4/packages/calendar/www/view-print-display.tcl 9 Feb 2020 15:30:16 -0000 1.2.2.1
@@ -1,3 +1,9 @@
template::add_event_listener -id "print" -script {window.print();}
template::add_event_listener -id "close" -script {window.close();}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/lib/current-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/current-messages.tcl,v
diff -u -r1.4.8.3 -r1.4.8.4
--- openacs-4/packages/chat/lib/current-messages.tcl 22 Oct 2019 07:59:19 -0000 1.4.8.3
+++ openacs-4/packages/chat/lib/current-messages.tcl 9 Feb 2020 15:30:16 -0000 1.4.8.4
@@ -17,3 +17,9 @@
set person_name "Unknown"
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/lib/transcript-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcript-view.tcl,v
diff -u -r1.5.6.1 -r1.5.6.2
--- openacs-4/packages/chat/lib/transcript-view.tcl 14 Feb 2019 16:15:01 -0000 1.5.6.1
+++ openacs-4/packages/chat/lib/transcript-view.tcl 9 Feb 2020 15:30:16 -0000 1.5.6.2
@@ -17,3 +17,9 @@
set edit_p [permission::permission_p -object_id $room_id -privilege "chat_transcript_edit"]
set edit_url [export_vars -base "transcript-edit" {transcript_id room_id}]
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/lib/transcripts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/chat/lib/transcripts.tcl 14 Feb 2019 16:15:01 -0000 1.5.2.1
+++ openacs-4/packages/chat/lib/transcripts.tcl 9 Feb 2020 15:30:16 -0000 1.5.2.2
@@ -15,7 +15,7 @@
transcript_url
delete_url
} chat_transcripts list_transcripts {
- select ct.transcript_id, ct.pretty_name, ao.creation_date
+ select ct.transcript_id, ct.pretty_name, ao.creation_date
from chat_transcripts ct, acs_objects ao
where ct.transcript_id = ao.object_id and ct.room_id = :room_id
order by ao.creation_date desc
@@ -28,7 +28,7 @@
set actions {}
if {$transcript_create_p} {
lappend actions \
- [_ chat.Create_transcript] [export_vars -base "transcript-new" {room_id}] ""
+ [_ chat.Create_transcript] [export_vars -base "transcript-new" {room_id}] ""
}
list::create \
@@ -52,10 +52,16 @@
html { align "center" }
display_template {
-
- 
-
+
+
+
}
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/apm-callback-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/chat/tcl/apm-callback-procs.tcl 13 May 2019 10:02:55 -0000 1.1.2.5
+++ openacs-4/packages/chat/tcl/apm-callback-procs.tcl 9 Feb 2020 15:30:16 -0000 1.1.2.6
@@ -13,10 +13,10 @@
Upgrade logics for the chat package
} {
apm_upgrade_logic \
- -from_version_name $from_version_name \
- -to_version_name $to_version_name \
- -spec {
- 6.0.0d3 6.0.0d4 {
+ -from_version_name $from_version_name \
+ -to_version_name $to_version_name \
+ -spec {
+ 6.0.0d3 6.0.0d4 {
ns_write "\n\nDeleting obsolete parameters"
set parameter_names {
AppletHeight
@@ -38,7 +38,7 @@
}
ns_write "\nFinished!"
}
- 6.0.0d6 6.0.0d7 {
+ 6.0.0d6 6.0.0d7 {
ns_write "
Setting rooms and transcripts package_id to context_id where missing"
set n_rows [::xo::dc dml update_package {
update acs_objects set
@@ -51,3 +51,9 @@
}
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl,v
diff -u -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl 5 Sep 2019 14:53:05 -0000 1.1.2.8
+++ openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl 9 Feb 2020 15:30:16 -0000 1.1.2.9
@@ -362,3 +362,9 @@
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl,v
diff -u -r1.1.14.2 -r1.1.14.3
--- openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl 8 Jan 2020 17:53:42 -0000 1.1.14.2
+++ openacs-4/packages/chat-portlet/tcl/chat-admin-portlet-procs.tcl 9 Feb 2020 15:34:41 -0000 1.1.14.3
@@ -92,3 +92,9 @@
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl,v
diff -u -r1.1.14.2 -r1.1.14.3
--- openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl 8 Jan 2020 17:53:42 -0000 1.1.14.2
+++ openacs-4/packages/chat-portlet/tcl/chat-portlet-procs.tcl 9 Feb 2020 15:34:41 -0000 1.1.14.3
@@ -100,3 +100,9 @@
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl,v
diff -u -r1.1.14.1 -r1.1.14.2
--- openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl 14 Feb 2019 16:15:01 -0000 1.1.14.1
+++ openacs-4/packages/chat-portlet/www/chat-admin-portlet.tcl 9 Feb 2020 15:34:41 -0000 1.1.14.2
@@ -38,3 +38,9 @@
set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl 14 Feb 2019 16:15:01 -0000 1.8.2.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl 9 Feb 2020 15:34:41 -0000 1.8.2.2
@@ -68,3 +68,9 @@
}
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/cookie-consent/tcl/callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/tcl/callback-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/cookie-consent/tcl/callback-procs.tcl 26 Apr 2019 11:45:42 -0000 1.1.2.1
+++ openacs-4/packages/cookie-consent/tcl/callback-procs.tcl 9 Feb 2020 15:34:41 -0000 1.1.2.2
@@ -14,69 +14,69 @@
# Provide hooks for installing/uninstalling the package
#
ad_proc -private after-install {} {
- #
- # Add additional parameters to acs-subsite
- #
- foreach {name description default datatype} {
- "Enabled"
- "Enable/Disable Cookie Consent for this Subsite"
- "0" "number"
+ #
+ # Add additional parameters to acs-subsite
+ #
+ foreach {name description default datatype} {
+ "Enabled"
+ "Enable/Disable Cookie Consent for this Subsite"
+ "0" "number"
- "Layout"
- "Layout of the Cookie Consent Widget; possible values: block|classic|edgeless|wire"
- "block" "string"
+ "Layout"
+ "Layout of the Cookie Consent Widget; possible values: block|classic|edgeless|wire"
+ "block" "string"
- "LearnMoreLink"
- "Link for learning more about Cookies"
- "https://cookiesandyou.com/" "string"
+ "LearnMoreLink"
+ "Link for learning more about Cookies"
+ "https://cookiesandyou.com/" "string"
- "Palette"
- "Color palette for the Cookie Consent Widget; possible values: default|oacs|honeybee|mono|neon|corporate"
- "default" "string"
+ "Palette"
+ "Color palette for the Cookie Consent Widget; possible values: default|oacs|honeybee|mono|neon|corporate"
+ "default" "string"
- "Position"
- "Position of the Cookie Consent Widget; possible values: bottom|top|pushdown|left|right"
- "pushdown" "string"
+ "Position"
+ "Position of the Cookie Consent Widget; possible values: bottom|top|pushdown|left|right"
+ "pushdown" "string"
- "DefaultPalette"
- "Default style: use the following settings, when CookieConsentPalette is set to 'default'"
- "popup {text #fff background #004570} button {text #000 background #f1d600}" "string"
+ "DefaultPalette"
+ "Default style: use the following settings, when CookieConsentPalette is set to 'default'"
+ "popup {text #fff background #004570} button {text #000 background #f1d600}" "string"
- "ExpiryDays"
- "Lifetime of the cookie"
- "365" "number"
- } {
- apm_parameter_register "CookieConsent$name" \
- $description "acs-subsite" $default $datatype "Cookie Consent"
- }
+ "ExpiryDays"
+ "Lifetime of the cookie"
+ "365" "number"
+ } {
+ apm_parameter_register "CookieConsent$name" \
+ $description "acs-subsite" $default $datatype "Cookie Consent"
+ }
}
ad_proc -private before-uninstall {} {
- #
- # Remove the package specific parameters from acs-subsite
- #
- foreach parameter {
- Enabled
- Layout
- LearnMoreLink
- Palette
- Position
- DefaultPalette
- ExpiryDays
- } {
- ns_log notice [list apm_parameter_unregister \
- -parameter "CookieConsent$parameter" \
- -package_key "acs-subsite" \
- "" ]
- ::try {
- apm_parameter_unregister \
- -parameter "CookieConsent$parameter" \
- -package_key "acs-subsite" \
- ""
- } on error {errMsg} {
- ns_log notice "apm_parameter_unregister of parameter CookieConsent$parameter lead to: $errMsg"
- }
- }
+ #
+ # Remove the package specific parameters from acs-subsite
+ #
+ foreach parameter {
+ Enabled
+ Layout
+ LearnMoreLink
+ Palette
+ Position
+ DefaultPalette
+ ExpiryDays
+ } {
+ ns_log notice [list apm_parameter_unregister \
+ -parameter "CookieConsent$parameter" \
+ -package_key "acs-subsite" \
+ "" ]
+ ::try {
+ apm_parameter_unregister \
+ -parameter "CookieConsent$parameter" \
+ -package_key "acs-subsite" \
+ ""
+ } on error {errMsg} {
+ ns_log notice "apm_parameter_unregister of parameter CookieConsent$parameter lead to: $errMsg"
+ }
+ }
}
@@ -88,9 +88,15 @@
#
ad_proc -public -callback subsite::page_plugin -impl cookie-consent {
} {
- Implementation of subsite::page_plugin for cookie-consent
+ Implementation of subsite::page_plugin for cookie-consent
} {
- ::cookieconsent::initialize_widget
+ ::cookieconsent::initialize_widget
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl 2 Aug 2018 13:05:22 -0000 1.2
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl 9 Feb 2020 15:34:41 -0000 1.2.2.1
@@ -14,3 +14,9 @@
-resource_info [::cookieconsent::resource_info]
ad_returnredirect .
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl 3 Aug 2018 09:50:08 -0000 1.6
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl 9 Feb 2020 15:34:41 -0000 1.6.2.1
@@ -11,3 +11,9 @@
set title "[dict get $resource_info resourceName] - Sitewide Admin"
set context [list $title]
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.tcl 7 Aug 2017 23:48:09 -0000 1.2
+++ openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master.tcl 9 Feb 2020 15:34:41 -0000 1.2.2.1
@@ -146,3 +146,9 @@
security::csp::require style-src maxcdn.bootstrapcdn.com
security::csp::require script-src maxcdn.bootstrapcdn.com
security::csp::require font-src maxcdn.bootstrapcdn.com
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl 7 Aug 2017 23:48:09 -0000 1.2
+++ openacs-4/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-streaming-head.tcl 9 Feb 2020 15:34:41 -0000 1.2.2.1
@@ -1,4 +1,3 @@
-
set streaming_head 1
set subsite_logo "/resources/openacs-bootstrap3-theme/images/logo_dotlrn_xs.png"
@@ -18,9 +17,7 @@
# dotLRN stuff #
###########################
-# $Id$
-
-set user_id [ad_conn user_id]
+set user_id [ad_conn user_id]
set untrusted_user_id [ad_conn untrusted_user_id]
set community_id [dotlrn_community::get_community_id]
set dotlrn_url [dotlrn::get_url]
@@ -42,7 +39,7 @@
}
if { [ad_conn package_key] ne [dotlrn::package_key] } {
- # Peter M: We are in a package (an application) that may or may not be under a dotlrn instance
+ # Peter M: We are in a package (an application) that may or may not be under a dotlrn instance
# (i.e. in a news instance of a class)
# and we want all links in the navbar to be active so the user can return easily to the class homepage
# or to the My Space page
@@ -60,15 +57,15 @@
set youarehere "[_ theme-zen.MySpace]"
}
- set extra_spaces "![\"\"](\"/resources/dotlrn/spacer.gif\")
"
+ set extra_spaces ""
set dotlrn_navbar [zen::portal_navbar]
set dotlrn_subnavbar [zen::portal_subnavbar \
- -user_id $user_id \
- -control_panel_text $control_panel_text \
- -pre_html "$extra_spaces" \
- -post_html $extra_spaces \
- -link_all $link_all
- ]
+ -user_id $user_id \
+ -control_panel_text $control_panel_text \
+ -pre_html "$extra_spaces" \
+ -post_html $extra_spaces \
+ -link_all $link_all
+ ]
} else {
set dotlrn_navbar ""
set dotlrn_subnavbar ""
@@ -91,8 +88,8 @@
if {![info exists context_bar]} { set context_bar [ad_context_bar] }
# clean out title and context bar for index page.
-if {[ad_conn url] eq "/" || [string match /index* [ad_conn url]] || [ad_conn url] eq "/community/"} {
- set context_bar {}
+if {[ad_conn url] eq "/" || [string match /index* [ad_conn url]] || [ad_conn url] eq "/community/"} {
+ set context_bar {}
set notitle 1
}
@@ -113,7 +110,7 @@
&& [ad_graphics_site_available_p]
} {
template::multirow append attribute background \
- [parameter::get -package_id $pkg_id -parameter background -default "/graphics/bg.gif"]
+ [parameter::get -package_id $pkg_id -parameter background -default "/graphics/bg.gif"]
}
# User messages
@@ -127,3 +124,9 @@
security::csp::require style-src maxcdn.bootstrapcdn.com
security::csp::require script-src maxcdn.bootstrapcdn.com
security::csp::require font-src maxcdn.bootstrapcdn.com
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/dotlrn-bootstrap3-theme/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/tcl/apm-callback-procs.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/tcl/apm-callback-procs.tcl 7 Aug 2017 23:48:09 -0000 1.2
+++ openacs-4/packages/dotlrn-bootstrap3-theme/tcl/apm-callback-procs.tcl 9 Feb 2020 15:34:41 -0000 1.2.2.1
@@ -153,3 +153,9 @@
subsite::delete_subsite_theme -key dotlrn_bootstrap3
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/dotlrn-bootstrap3-theme/tcl/theme-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/tcl/theme-procs.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-bootstrap3-theme/tcl/theme-procs.tcl 7 Aug 2017 23:48:09 -0000 1.2
+++ openacs-4/packages/dotlrn-bootstrap3-theme/tcl/theme-procs.tcl 9 Feb 2020 15:34:41 -0000 1.2.2.1
@@ -1,7 +1,7 @@
ad_library {
Provides a simple API theme interactions
-
+
@author Gustaf Neumann
@creation-date 05 July 2015
}
@@ -13,14 +13,14 @@
} {
Implementation of the theme_changed callback which is called, whenever a theme is changed
-
+
@param subsite_id subsite, of which the theme was changed
@param old_theme the name of the old theme
@param new_theme the name of the new theme
-} {
-
+} {
+
dotlrn_bootstrap3_theme::portal_page_parameter_update -new_theme $new_theme
-
+
}
ad_proc -public dotlrn_bootstrap3_theme::portal_page_parameter_update {
@@ -29,138 +29,138 @@
Set parameters depending on new activated theme
} {
# ns_log notice "-----PROC CALLED"
-
+
set package_id [site_node::get_element -url /dotlrn -element package_id]
-
+
if {$new_theme eq "dotlrn_bootstrap3"} {
db_transaction {
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter class_instance_pages_csv \
- -value "#dotlrn.class_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.class_page_file_storage_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter club_pages_csv \
- -value "#dotlrn.club_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.club_page_people_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter subcomm_pages_csv \
- -value "#dotlrn.subcomm_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.subcomm_page_file_storage_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter user_portal_pages_csv \
- -value "#dotlrn.user_portal_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.user_portal_page_file_storage_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter admin_layout_name \
- -value "#dotlrn-bootstrap3-theme.bootstrap-2column#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter non_member_layout_name \
- -value "#dotlrn-bootstrap3-theme.bootstrap-2column#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter DefaultMaster_p \
- -value "/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter DefaultSiteTemplate \
- -value "#dotlrn-bootstrap3-theme.bootstrap3-theme#"
-
- parameter::set_from_package_key \
- -package_key new-portal \
- -parameter default_theme_name \
- -value "#dotlrn-bootstrap3-theme.bootstrap3-theme#"
-
- parameter::set_from_package_key \
- -package_key new-portal \
- -parameter default_layout \
- -value "#dotlrn-bootstrap3-theme.bootstrap-2column#"
- }
-
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter class_instance_pages_csv \
+ -value "#dotlrn.class_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.class_page_file_storage_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter club_pages_csv \
+ -value "#dotlrn.club_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.club_page_people_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter subcomm_pages_csv \
+ -value "#dotlrn.subcomm_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.subcomm_page_file_storage_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter user_portal_pages_csv \
+ -value "#dotlrn.user_portal_page_home_title#,#dotlrn-bootstrap3-theme.bootstrap-2column#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#dotlrn-bootstrap3-theme.bootstrap-1column#,#dotlrn.user_portal_page_file_storage_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter admin_layout_name \
+ -value "#dotlrn-bootstrap3-theme.bootstrap-2column#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter non_member_layout_name \
+ -value "#dotlrn-bootstrap3-theme.bootstrap-2column#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter DefaultMaster_p \
+ -value "/packages/dotlrn-bootstrap3-theme/resources/masters/dotlrn-master"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter DefaultSiteTemplate \
+ -value "#dotlrn-bootstrap3-theme.bootstrap3-theme#"
+
+ parameter::set_from_package_key \
+ -package_key new-portal \
+ -parameter default_theme_name \
+ -value "#dotlrn-bootstrap3-theme.bootstrap3-theme#"
+
+ parameter::set_from_package_key \
+ -package_key new-portal \
+ -parameter default_layout \
+ -value "#dotlrn-bootstrap3-theme.bootstrap-2column#"
+ }
+
} elseif {$new_theme eq "dotlrn_zen"} {
db_transaction {
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter class_instance_pages_csv \
- -value "#dotlrn.class_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_file_storage_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter club_pages_csv \
- -value "#dotlrn.club_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_people_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter subcomm_pages_csv \
- -value "#dotlrn.subcomm_page_home_title,#theme-zen.Zen_thin_thick#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_file_storage_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter user_portal_pages_csv \
- -value "#dotlrn.user_portal_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_file_storage_accesskey#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter admin_layout_name \
- -value "#theme-zen.Zen_2_column#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter non_member_layout_name \
- -value "#theme-zen.Zen_2_column#"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter DefaultMaster_p \
- -value "/packages/theme-zen/lib/lrn-master"
-
- parameter::set_default \
- -package_key dotlrn \
- -parameter DefaultSiteTemplate \
- -value "#theme-zen.Zen_Theme#"
-
- parameter::set_from_package_key \
- -package_key new-portal \
- -parameter default_theme_name \
- -value "#theme-zen.Zen_Theme#"
-
- parameter::set_from_package_key \
- -package_key new-portal \
- -parameter default_layout \
- -value "#theme-zen.Zen_2_column#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter class_instance_pages_csv \
+ -value "#dotlrn.class_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_file_storage_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter club_pages_csv \
+ -value "#dotlrn.club_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_people_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter subcomm_pages_csv \
+ -value "#dotlrn.subcomm_page_home_title,#theme-zen.Zen_thin_thick#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_file_storage_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter user_portal_pages_csv \
+ -value "#dotlrn.user_portal_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_file_storage_accesskey#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter admin_layout_name \
+ -value "#theme-zen.Zen_2_column#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter non_member_layout_name \
+ -value "#theme-zen.Zen_2_column#"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter DefaultMaster_p \
+ -value "/packages/theme-zen/lib/lrn-master"
+
+ parameter::set_default \
+ -package_key dotlrn \
+ -parameter DefaultSiteTemplate \
+ -value "#theme-zen.Zen_Theme#"
+
+ parameter::set_from_package_key \
+ -package_key new-portal \
+ -parameter default_theme_name \
+ -value "#theme-zen.Zen_Theme#"
+
+ parameter::set_from_package_key \
+ -package_key new-portal \
+ -parameter default_layout \
+ -value "#theme-zen.Zen_2_column#"
}
}
-
+
if {$new_theme eq "dotlrn_bootstrap3" || $new_theme eq "dotlrn_zen"} {
set site_template_name [db_string get_site_template_name {}]
set site_template_id [db_string select_st_id {}]
-
+
# for communities
parameter::set_value -package_id $package_id \
-parameter "CommDefaultSiteTemplate_p" \
-value $site_template_id
-
+
# for users
parameter::set_value -package_id $package_id \
-parameter "UserDefaultSiteTemplate_p" \
-value $site_template_id
-
+
# Theme switching: theme of portlet design
# Note that dotlrn uses same name for theme name and subsite name !
db_1row get_theme {}
db_dml update_theme {}
# ns_log notice "---THEME: DONE"
-
+
# Layout switching: Layout of portal page e.g. 2-column, 1-column etc
if {$new_theme eq "dotlrn_bootstrap3"} {
set layout_blueprint ZenToBootstrapMap
@@ -169,7 +169,7 @@
}
# ns_log notice "PARAMETER: <[parameter::get_from_package_key -package_key dotlrn-bootstrap3-theme -parameter $layout_blueprint]>"
-
+
db_transaction {
foreach {old new} [parameter::get_from_package_key -package_key dotlrn-bootstrap3-theme -parameter $layout_blueprint] {
db_1row get_old {}
@@ -178,13 +178,19 @@
# ns_log notice "NEW: $new"
db_dml update_layouts {}
# ns_log notice "---LAYOUT: DONE"
-
+
}
} on_error {
ns_log notice "$errmsg"
}
}
-
+
# ns_log notice "---PROC FINISHED"
-
+
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/dotlrn-chat/tcl/dotlrn-chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-chat/tcl/dotlrn-chat-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/dotlrn-chat/tcl/dotlrn-chat-procs.tcl 29 Jun 2018 17:27:19 -0000 1.4
+++ openacs-4/packages/dotlrn-chat/tcl/dotlrn-chat-procs.tcl 9 Feb 2020 15:39:58 -0000 1.4.2.1
@@ -220,3 +220,9 @@
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl 17 Apr 2019 11:16:15 -0000 1.1.2.3
+++ openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl 9 Feb 2020 15:39:58 -0000 1.1.2.4
@@ -7,93 +7,99 @@
namespace eval file_storage::test {
ad_proc ::file_storage::test::create_new_folder {
- -last_request:required
- folder_name
- folder_description
+ -last_request:required
+ folder_name
+ folder_description
} {
- Create a new folder via Web UI.
+ Create a new folder via Web UI.
} {
- #
- # Create a new folder based on the current page, which is from
- # a file-storage instance
- #
- set d [acs::test::follow_link -last_request $last_request -label {New Folder}]
- acs::test::reply_has_status_code $d 200
+ #
+ # Create a new folder based on the current page, which is from
+ # a file-storage instance
+ #
+ set d [acs::test::follow_link -last_request $last_request -label {New Folder}]
+ acs::test::reply_has_status_code $d 200
- set response [dict get $d body]
- set form [acs::test::get_form $response {//form[@id='folder-ae']}]
- aa_true "create form was returned" {[llength $form] > 2}
+ set response [dict get $d body]
+ set form [acs::test::get_form $response {//form[@id='folder-ae']}]
+ aa_true "create form was returned" {[llength $form] > 2}
- set d [::acs::test::form_reply \
- -last_request $d \
- -form $form \
- -update [subst {
- folder_name "$folder_name"
- description "$folder_description"
- }]]
- acs::test::reply_has_status_code $d 302
- set location [::xowiki::test::get_url_from_location $d]
+ set d [::acs::test::form_reply \
+ -last_request $d \
+ -form $form \
+ -update [subst {
+ folder_name "$folder_name"
+ description "$folder_description"
+ }]]
+ acs::test::reply_has_status_code $d 302
+ set location [::xowiki::test::get_url_from_location $d]
- if { [string match "*/\?folder_id*" $location] } {
- set d [acs::test::http -last_request $d $location]
- acs::test::reply_contains $d $folder_name
- } else {
- aa_error "file_storage::test::create_new_folder failed, bad response url : $location"
- }
+ if { [string match "*/\?folder_id*" $location] } {
+ set d [acs::test::http -last_request $d $location]
+ acs::test::reply_contains $d $folder_name
+ } else {
+ aa_error "file_storage::test::create_new_folder failed, bad response url : $location"
+ }
- return $d
+ return $d
}
ad_proc ::file_storage::test::edit_folder {
- -last_request:required
- folder_name
+ -last_request:required
+ folder_name
} {
- Create a new folder via Web UI.
+ Create a new folder via Web UI.
} {
- #
- # Create a new folder based on the current page, which is from
- # a file-storage instance
- #
- set d [acs::test::follow_link -last_request $last_request -label {Edit Folder}]
- acs::test::reply_has_status_code $d 200
+ #
+ # Create a new folder based on the current page, which is from
+ # a file-storage instance
+ #
+ set d [acs::test::follow_link -last_request $last_request -label {Edit Folder}]
+ acs::test::reply_has_status_code $d 200
- set response [dict get $d body]
- set form [acs::test::get_form $response {//form[@id='folder-edit']}]
- aa_true "edit form was returned" {[llength $form] > 2}
- set d [::acs::test::form_reply \
- -last_request $d \
- -form $form \
- -update [subst {
- folder_name "$folder_name"
- }]]
- acs::test::reply_has_status_code $d 302
- set location [::xowiki::test::get_url_from_location $d]
+ set response [dict get $d body]
+ set form [acs::test::get_form $response {//form[@id='folder-edit']}]
+ aa_true "edit form was returned" {[llength $form] > 2}
+ set d [::acs::test::form_reply \
+ -last_request $d \
+ -form $form \
+ -update [subst {
+ folder_name "$folder_name"
+ }]]
+ acs::test::reply_has_status_code $d 302
+ set location [::xowiki::test::get_url_from_location $d]
- if { [string match "*/\?folder_id*" $location] } {
- set d [acs::test::http -last_request $d $location]
- acs::test::reply_contains $d $folder_name
- } else {
- aa_error "file_storage::test::create_new_folder failed, bad response url : $location"
- }
+ if { [string match "*/\?folder_id*" $location] } {
+ set d [acs::test::http -last_request $d $location]
+ acs::test::reply_contains $d $folder_name
+ } else {
+ aa_error "file_storage::test::create_new_folder failed, bad response url : $location"
+ }
- return $d
+ return $d
}
ad_proc ::file_storage::test::delete_current_folder {
- -last_request:required
+ -last_request:required
} {
- Delete the current folder via Web UI.
+ Delete the current folder via Web UI.
} {
- #
- # Delete the current folder
- #
- set d [acs::test::follow_link -last_request $last_request -label {Delete this folder}]
- acs::test::reply_has_status_code $d 200
- set form [acs::test::get_form [dict get $d body] {//form[@id='folder-delete']}]
- aa_true "delete form was returned" {[llength $form] > 2}
+ #
+ # Delete the current folder
+ #
+ set d [acs::test::follow_link -last_request $last_request -label {Delete this folder}]
+ acs::test::reply_has_status_code $d 200
+ set form [acs::test::get_form [dict get $d body] {//form[@id='folder-delete']}]
+ aa_true "delete form was returned" {[llength $form] > 2}
- set d [::acs::test::form_reply -last_request $d -form $form]
- acs::test::reply_has_status_code $d 302
- return $d
+ set d [::acs::test::form_reply -last_request $d -form $form]
+ acs::test::reply_has_status_code $d 302
+ return $d
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/forums/tcl/test/webtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/test/webtest-procs.tcl,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/packages/forums/tcl/test/webtest-procs.tcl 10 Apr 2019 08:50:14 -0000 1.2.2.3
+++ openacs-4/packages/forums/tcl/test/webtest-procs.tcl 9 Feb 2020 15:39:58 -0000 1.2.2.4
@@ -8,274 +8,280 @@
namespace eval forums::test {
ad_proc -private new {
- {-presentation_type flat}
- {-posting_policy open}
- {-user_id 0}
- name
+ {-presentation_type flat}
+ {-posting_policy open}
+ {-user_id 0}
+ name
} {
- Create a new forum via the web interface.
+ Create a new forum via the web interface.
} {
- # Get the forums admin page url
- #
- set forums_page [aa_get_first_url -package_key forums]
+ # Get the forums admin page url
+ #
+ set forums_page [aa_get_first_url -package_key forums]
- #
- # Get Data and check status code
- #
- set d [acs::test::http -user_id $user_id $forums_page/admin/forum-new]
- aa_equals "Status code valid" [dict get $d status] 200
+ #
+ # Get Data and check status code
+ #
+ set d [acs::test::http -user_id $user_id $forums_page/admin/forum-new]
+ aa_equals "Status code valid" [dict get $d status] 200
- #
- # Get the form specific data (action, method and provided form-fields)
- #
- set form_data [::acs::test::get_form [dict get $d body] {//form[@id="forum"]}]
+ #
+ # Get the form specific data (action, method and provided form-fields)
+ #
+ set form_data [::acs::test::get_form [dict get $d body] {//form[@id="forum"]}]
- #
- # Fill in a few values into the form
- #
- set d [::acs::test::form_reply \
- -last_request $d \
- -url [dict get $form_data @action] \
- -update [subst {
- name "$name"
- charter "bla [ad_generate_random_string] bla [ad_generate_random_string]"
- charter.format text/plain
- presentation_type $presentation_type
- posting_policy $posting_policy
- }] \
- [dict get $form_data fields]]
- set reply [dict get $d body]
+ #
+ # Fill in a few values into the form
+ #
+ set d [::acs::test::form_reply \
+ -last_request $d \
+ -url [dict get $form_data @action] \
+ -update [subst {
+ name "$name"
+ charter "bla [ad_generate_random_string] bla [ad_generate_random_string]"
+ charter.format text/plain
+ presentation_type $presentation_type
+ posting_policy $posting_policy
+ }] \
+ [dict get $form_data fields]]
+ set reply [dict get $d body]
- #
- # Check, if the form was correctly validated.
- #
- acs::test::reply_contains_no $d form-error
- aa_equals "Status code valid" [dict get $d status] 302
+ #
+ # Check, if the form was correctly validated.
+ #
+ acs::test::reply_contains_no $d form-error
+ aa_equals "Status code valid" [dict get $d status] 302
- dict set d payload forum_id [dict get $form_data fields forum_id]
-
- return $d
+ dict set d payload forum_id [dict get $form_data fields forum_id]
+
+ return $d
}
ad_proc -private view {
- {-last_request ""}
- {-forum_id 0}
- {-name ""}
+ {-last_request ""}
+ {-forum_id 0}
+ {-name ""}
} {
- View a forum via the web interface.
+ View a forum via the web interface.
} {
- set forums_page [aa_get_first_url -package_key forums]
+ set forums_page [aa_get_first_url -package_key forums]
set d $last_request
- if {$name ne ""} {
- #
- # Call to the forums page
- #
- set d [::acs::test::http -last_request $d $forums_page]
- aa_equals "Status code valid" [dict get $d status] 200
+ if {$name ne ""} {
+ #
+ # Call to the forums page
+ #
+ set d [::acs::test::http -last_request $d $forums_page]
+ aa_equals "Status code valid" [dict get $d status] 200
- #
- # Follow the link with the provided link label
- #
- set d [::acs::test::follow_link \
- -last_request $d \
- -base $forums_page \
- -label $name]
- aa_equals "Status code valid" [dict get $d status] 200
- }
+ #
+ # Follow the link with the provided link label
+ #
+ set d [::acs::test::follow_link \
+ -last_request $d \
+ -base $forums_page \
+ -label $name]
+ aa_equals "Status code valid" [dict get $d status] 200
+ }
- #
- # Check via the forum_id, when provided
- #
- if {$forum_id != 0} {
- aa_log "check via forum_id"
- set d [::acs::test::http \
- -last_request $d \
- $forums_page/forum-view?forum_id=$forum_id]
- aa_equals "Status code valid" [dict get $d status] 200
- }
- return $d
+ #
+ # Check via the forum_id, when provided
+ #
+ if {$forum_id != 0} {
+ aa_log "check via forum_id"
+ set d [::acs::test::http \
+ -last_request $d \
+ $forums_page/forum-view?forum_id=$forum_id]
+ aa_equals "Status code valid" [dict get $d status] 200
+ }
+ return $d
}
ad_proc -private edit {
- {-last_request:required}
- {-forum_id 0}
+ {-last_request:required}
+ {-forum_id 0}
} {
- Edit a forum via the web interface.
+ Edit a forum via the web interface.
} {
- set forums_page [aa_get_first_url -package_key forums]
+ set forums_page [aa_get_first_url -package_key forums]
- set d [acs::test::http \
- -last_request $last_request \
- $forums_page/admin/forum-edit?forum_id=$forum_id]
- aa_equals "Status code valid" [dict get $d status] 200
+ set d [acs::test::http \
+ -last_request $last_request \
+ $forums_page/admin/forum-edit?forum_id=$forum_id]
+ aa_equals "Status code valid" [dict get $d status] 200
- #
- # Get the form specific data (action, method and provided form-fields)
- #
- set form_data [::acs::test::get_form [dict get $d body] {//form[@id="forum"]}]
+ #
+ # Get the form specific data (action, method and provided form-fields)
+ #
+ set form_data [::acs::test::get_form [dict get $d body] {//form[@id="forum"]}]
- #
- # Fill in a few values into the form
- #
- set old_name [dict get $form_data fields name]
- set old_charter [dict get $form_data fields name]
- set new_name "Edited $old_name"
- set new_charter "Edited $old_charter"
- set d [::acs::test::form_reply \
- -last_request $d \
- -url [dict get $form_data @action] \
- -update [subst {
- name "$new_name"
- charter "$new_charter"
- }] \
- [dict get $form_data fields]]
-
- if {[acs::test::reply_contains_no $d form-error]} {
- set d [acs::test::http -last_request $d $forums_page]
- acs::test::reply_contains -prefix "Overview page" $d $new_name
- acs::test::reply_contains -prefix "Overview page" $d $new_charter
- }
+ #
+ # Fill in a few values into the form
+ #
+ set old_name [dict get $form_data fields name]
+ set old_charter [dict get $form_data fields name]
+ set new_name "Edited $old_name"
+ set new_charter "Edited $old_charter"
+ set d [::acs::test::form_reply \
+ -last_request $d \
+ -url [dict get $form_data @action] \
+ -update [subst {
+ name "$new_name"
+ charter "$new_charter"
+ }] \
+ [dict get $form_data fields]]
+
+ if {[acs::test::reply_contains_no $d form-error]} {
+ set d [acs::test::http -last_request $d $forums_page]
+ acs::test::reply_contains -prefix "Overview page" $d $new_name
+ acs::test::reply_contains -prefix "Overview page" $d $new_charter
+ }
}
ad_proc -private new_postings {
- {-last_request ""}
- {-forum_id 0}
+ {-last_request ""}
+ {-forum_id 0}
} {
- Add a posting to the provided forum via the web interface.
+ Add a posting to the provided forum via the web interface.
- @return message_id
+ @return message_id
} {
- set message_id 0
- set forums_page [aa_get_first_url -package_key forums]
+ set message_id 0
+ set forums_page [aa_get_first_url -package_key forums]
- set d [acs::test::http \
- -last_request $last_request \
- $forums_page/message-post?forum_id=$forum_id]
- aa_equals "Edit Message: Status code valid" [dict get $d status] 200
+ set d [acs::test::http \
+ -last_request $last_request \
+ $forums_page/message-post?forum_id=$forum_id]
+ aa_equals "Edit Message: Status code valid" [dict get $d status] 200
- #
- # Get form data from
- #
- set form_data [::acs::test::get_form [dict get $d body] {//form[@id="message"]}]
- aa_true "Found form on reply page" {[llength $form_data] > 0}
+ #
+ # Get form data from
+ #
+ set form_data [::acs::test::get_form [dict get $d body] {//form[@id="message"]}]
+ aa_true "Found form on reply page" {[llength $form_data] > 0}
- #
- # Build reply
- #
- set subject "subject [ad_generate_random_string]"
- set message_body "body [ad_generate_random_string 20]"
+ #
+ # Build reply
+ #
+ set subject "subject [ad_generate_random_string]"
+ set message_body "body [ad_generate_random_string 20]"
- set d [::acs::test::form_reply \
- -last_request $last_request \
- -url [dict get $form_data @action] \
- -update [subst {
- subject "$subject"
- message_body "$message_body"
- message_body.format text/plain
- }] \
- [dict get $form_data fields]]
+ set d [::acs::test::form_reply \
+ -last_request $last_request \
+ -url [dict get $form_data @action] \
+ -update [subst {
+ subject "$subject"
+ message_body "$message_body"
+ message_body.format text/plain
+ }] \
+ [dict get $form_data fields]]
- acs::test::reply_contains_no $d form-error
- aa_equals "Updated message: Status code valid" [dict get $d status] 302
+ acs::test::reply_contains_no $d form-error
+ aa_equals "Updated message: Status code valid" [dict get $d status] 302
- aa_log [dict get $form_data fields]
- set message_id [dict get $form_data fields message_id]
+ aa_log [dict get $form_data fields]
+ set message_id [dict get $form_data fields message_id]
- #
- # Check on the forums overview page, if we find the new subject
- #
- set d [acs::test::http -last_request $d $forums_page/forum-view?forum_id=$forum_id]
- aa_equals "View Forum: Status code valid" [dict get $d status] 200
+ #
+ # Check on the forums overview page, if we find the new subject
+ #
+ set d [acs::test::http -last_request $d $forums_page/forum-view?forum_id=$forum_id]
+ aa_equals "View Forum: Status code valid" [dict get $d status] 200
- acs::test::reply_contains $d $subject
+ acs::test::reply_contains $d $subject
- #
- # Check on the forums view page, if we find the new subject and the new body
- #
- set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
- aa_equals "View Message: Status code valid" [dict get $d status] 200
+ #
+ # Check on the forums view page, if we find the new subject and the new body
+ #
+ set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
+ aa_equals "View Message: Status code valid" [dict get $d status] 200
- acs::test::reply_contains $d $subject
- acs::test::reply_contains $d $message_body
+ acs::test::reply_contains $d $subject
+ acs::test::reply_contains $d $message_body
- #
- # Post a reply to the last message
- #
- set d [acs::test::http -last_request $d $forums_page/message-post?parent_id=$message_id]
- set form_data [::acs::test::get_form [dict get $d body] {//form[@id="message"]}]
- aa_true "Found form on edit page for posting reply" {[llength $form_data] > 0}
- set reply_message_id [dict get $form_data fields message_id]
+ #
+ # Post a reply to the last message
+ #
+ set d [acs::test::http -last_request $d $forums_page/message-post?parent_id=$message_id]
+ set form_data [::acs::test::get_form [dict get $d body] {//form[@id="message"]}]
+ aa_true "Found form on edit page for posting reply" {[llength $form_data] > 0}
+ set reply_message_id [dict get $form_data fields message_id]
- set d [::acs::test::form_reply \
- -last_request $d \
- -url [dict get $form_data @action] \
- -update [subst {
- message_body "REPLY $message_body"
- message_body.format text/plain
- }] \
- [dict get $form_data fields]]
- acs::test::reply_contains_no $d form-error
- aa_equals "Entered forums reply: Status code valid" [dict get $d status] 302
+ set d [::acs::test::form_reply \
+ -last_request $d \
+ -url [dict get $form_data @action] \
+ -update [subst {
+ message_body "REPLY $message_body"
+ message_body.format text/plain
+ }] \
+ [dict get $form_data fields]]
+ acs::test::reply_contains_no $d form-error
+ aa_equals "Entered forums reply: Status code valid" [dict get $d status] 302
- #
- # The reply should show up on the forums thread page
- #
- set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
- aa_equals "Message overview: Status code valid" [dict get $d status] 200
- acs::test::reply_contains $d "REPLY $message_body"
+ #
+ # The reply should show up on the forums thread page
+ #
+ set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
+ aa_equals "Message overview: Status code valid" [dict get $d status] 200
+ acs::test::reply_contains $d "REPLY $message_body"
- #
- # Edit the reply
- #
- set d [acs::test::http -last_request $d $forums_page/moderate/message-edit?message_id=$reply_message_id]
- set form_data [::acs::test::get_form [dict get $d body] {//form[@id="message"]}]
- aa_true "Found form on edit page for editing reply" {[llength $form_data] > 0}
- set old_reply_message_body [dict get $form_data fields message_body]
- set new_reply_message_body "$old_reply_message_body EDITED"
- aa_true "old message_body contains REPLY" [string match "*REPLY*" $old_reply_message_body]
+ #
+ # Edit the reply
+ #
+ set d [acs::test::http -last_request $d $forums_page/moderate/message-edit?message_id=$reply_message_id]
+ set form_data [::acs::test::get_form [dict get $d body] {//form[@id="message"]}]
+ aa_true "Found form on edit page for editing reply" {[llength $form_data] > 0}
+ set old_reply_message_body [dict get $form_data fields message_body]
+ set new_reply_message_body "$old_reply_message_body EDITED"
+ aa_true "old message_body contains REPLY" [string match "*REPLY*" $old_reply_message_body]
- set d [::acs::test::form_reply \
- -last_request $d \
- -url [dict get $form_data @action] \
- -update [subst {
- message_body "$new_reply_message_body"
- }] \
- [dict get $form_data fields]]
- acs::test::reply_contains_no $d form-error
- aa_equals "Entered forums reply: Status code valid" [dict get $d status] 302
+ set d [::acs::test::form_reply \
+ -last_request $d \
+ -url [dict get $form_data @action] \
+ -update [subst {
+ message_body "$new_reply_message_body"
+ }] \
+ [dict get $form_data fields]]
+ acs::test::reply_contains_no $d form-error
+ aa_equals "Entered forums reply: Status code valid" [dict get $d status] 302
- #
- # The edited reply should show up on the forums thread page
- #
- set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
- aa_equals "Message overview: Status code valid" [dict get $d status] 200
- acs::test::reply_contains $d "$new_reply_message_body"
+ #
+ # The edited reply should show up on the forums thread page
+ #
+ set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
+ aa_equals "Message overview: Status code valid" [dict get $d status] 200
+ acs::test::reply_contains $d "$new_reply_message_body"
- #
- # Delete the reply
- #
+ #
+ # Delete the reply
+ #
set request [export_vars -sign -base ${forums_page}/moderate/message-delete {{message_id $reply_message_id}}]
- set d [acs::test::http -last_request $d $request]
- aa_equals "Message overview: Status code valid" [dict get $d status] 200
- acs::test::reply_contains $d message-delete?confirm_p
+ set d [acs::test::http -last_request $d $request]
+ aa_equals "Message overview: Status code valid" [dict get $d status] 200
+ acs::test::reply_contains $d message-delete?confirm_p
- set d [::acs::test::follow_link \
- -last_request $d \
- -base $forums_page/moderate \
- -label Yes]
- aa_equals "Message overview: Status code valid" [dict get $d status] 302
+ set d [::acs::test::follow_link \
+ -last_request $d \
+ -base $forums_page/moderate \
+ -label Yes]
+ aa_equals "Message overview: Status code valid" [dict get $d status] 302
- #
- # The edited reply should no show up up on the forums thread page
- #
- set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
- aa_equals "Message overview: Status code valid" [dict get $d status] 200
- acs::test::reply_contains_no $d "$new_reply_message_body"
+ #
+ # The edited reply should no show up up on the forums thread page
+ #
+ set d [acs::test::http -last_request $d $forums_page/message-view?message_id=$message_id]
+ aa_equals "Message overview: Status code valid" [dict get $d status] 200
+ acs::test::reply_contains_no $d "$new_reply_message_body"
- return $message_id
+ return $message_id
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/intermedia-driver/tcl/intermedia-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/intermedia-driver/tcl/intermedia-init.tcl,v
diff -u -r1.2 -r1.2.12.1
--- openacs-4/packages/intermedia-driver/tcl/intermedia-init.tcl 7 Jun 2008 20:29:00 -0000 1.2
+++ openacs-4/packages/intermedia-driver/tcl/intermedia-init.tcl 9 Feb 2020 15:39:58 -0000 1.2.12.1
@@ -10,3 +10,9 @@
}
ad_schedule_proc -thread t 14400 db_exec_plsql optimize_intermedia_index {begin Ctx_Ddl.Optimize_Index ('swi_index','FAST'); end;}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/new-portal/tcl/portal-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-init.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/new-portal/tcl/portal-init.tcl 22 May 2018 13:22:23 -0000 1.3
+++ openacs-4/packages/new-portal/tcl/portal-init.tcl 9 Feb 2020 15:39:58 -0000 1.3.2.1
@@ -1,4 +1,3 @@
-
#
### Portal immutable properties
#
@@ -11,3 +10,9 @@
set ::portal::automount_point "portal"
###
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End: