Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v diff -u -r1.41 -r1.42 --- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 7 Aug 2017 23:47:46 -0000 1.41 +++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 17 Dec 2017 20:36:03 -0000 1.42 @@ -9,7 +9,7 @@ f t - + Don Baccus

Bootstraps an OpenACS installation.

2017-08-06 @@ -18,7 +18,7 @@ GPL 3 - + Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/acs-bootstrap-installer/installer.tcl 7 Aug 2017 23:47:46 -0000 1.26 +++ openacs-4/packages/acs-bootstrap-installer/installer.tcl 17 Dec 2017 20:36:03 -0000 1.27 @@ -218,21 +218,21 @@ ns_log Debug "Installer serving $path" ad_try { rp_serve_abstract_file $path - } notfound val { - install_return 404 "Not found" " - The file you've requested, doesn't exist. Please check + } trap {AD EXCEPTION notfound} {val} { + install_return 404 "Not found" "The file you've requested, doesn't exist. Please check your URL and try again." - } redirect url { + } trap {AD EXCEPTION redirect} {url} { ad_returnredirect $url - } directory dir_index { + } trap {AD EXCEPTION directory} {dir_index} { set new_file [file join $path "index.html"] if {[file exists $new_file]} { rp_serve_abstract_file $new_file - } - set new_file [file join $path "index.adp"] - if {[file exists $new_file]} { - rp_serve_abstract_file $new_file - } + } else { + set new_file [file join $path "index.adp"] + if {[file exists $new_file]} { + rp_serve_abstract_file $new_file + } + } } } } Index: openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl 7 Aug 2017 23:47:46 -0000 1.3 +++ openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl 17 Dec 2017 20:36:03 -0000 1.4 @@ -26,7 +26,7 @@ ad_conn -set language Must be used to override the document language if necessary. - To add a CSS or Javascripts to the section of the document you can + To add a CSS or JavaScript files to the section of the document you can call the corresponding template::head::add_* functions within your page. @see template::head::add_css @@ -40,7 +40,7 @@ @see template::head::add_link @see template::head::add_script - Javascript event handlers, such as onload, an be added to the tag by + JavaScript event handlers, such as onload, an be added to the tag by calling template::add_body_handler within your page. @see template::add_body_handler @@ -73,14 +73,17 @@ -lang en \ -content "OpenACS version [ad_acs_version]" -# Add standard javascript +# Add standard JavaScript # # Include core.js inclusion to the bottom of the body. template::add_body_script -type "text/javascript" -src "/resources/acs-subsite/core.js" +# Add page plugin specific code +callback subsite::page_plugin + # -# Add css for the current subsite, defaulting to the old list/form css which was +# Add CSS for the current subsite, defaulting to the old list/form CSS which was # hard-wired in previous versions of OpenACS. set cssList [parameter::get -package_id [ad_conn subsite_id] -parameter ThemeCSS -default ""]