}]
} else {
@@ -275,13 +275,13 @@
XML package specification file for this version
}]
-if { ![info exists installed_version_id] || $installed_version_id == $version_id &&
+if { ![info exists installed_version_id] || $installed_version_id == $version_id &&
$distribution_uri eq "" } {
# As long as there isn't a different installed version, and this package is being
# generated locally, allow the user to write a specification file for this version
# of the package.
append body [subst {
-
}]
}
@@ -291,7 +291,7 @@
# The distribution tarball was either (a) never generated, or (b) generated on this
# system. Allow the user to make a tarball based on files in the filesystem.
append body [subst {
-
}]
}
Index: openacs-4/packages/acs-admin/www/auth/batch-job.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/auth/batch-job.tcl 22 May 2018 15:06:10 -0000 1.16
+++ openacs-4/packages/acs-admin/www/auth/batch-job.tcl 15 Oct 2018 16:52:00 -0000 1.17
@@ -22,13 +22,13 @@
-display_buttons {} \
-form {
{authority_pretty_name:text(inform)
- {label "\#acs-admin.Authority_name\#"}
- }
+ {label "\#acs-admin.Authority_name\#"}
+ }
{job_start_time:text(inform)
- {label "\#acs-admin.Start_time\#"}
+ {label "\#acs-admin.Start_time\#"}
}
{job_end_time:text(inform)
- {label "\#acs-admin.End_time\#"}
+ {label "\#acs-admin.End_time\#"}
}
{run_time_seconds:text(inform)
{label "\#acs-admin.Running_time\#"}
@@ -38,26 +38,26 @@
{label "\#acs-admin.Interactive\#"}
}
{snapshot_p:text(inform)
- {label "\#acs-admin.Snapshot\#"}
- }
+ {label "\#acs-admin.Snapshot\#"}
+ }
{message:text(inform)
- {label "\#acs-admin.Message"}
- }
+ {label "\#acs-admin.Message"}
+ }
{creation_user:text(inform)
- {label "\#acs-admin.Creation_user\#"}
- }
+ {label "\#acs-admin.Creation_user\#"}
+ }
{doc_start_time:text(inform)
{label "\#acs-admin.Document_start_time\#"}
- }
+ }
{doc_end_time:text(inform)
- {label "\#acs-admin.Document_end_time\#"}
- }
+ {label "\#acs-admin.Document_end_time\#"}
+ }
{doc_status:text(inform)
- {label "\#acs-admin.Document_status\#"}
- }
+ {label "\#acs-admin.Document_status\#"}
+ }
{doc_message:text(inform)
- {label "\#acs-admin.Document_message\#"}
- }
+ {label "\#acs-admin.Document_message\#"}
+ }
{document_download:text(inform)
{label "\#acs-admin.Document\#"}
}
@@ -76,7 +76,7 @@
set $element_name [acs_community_member_link -user_id $batch_job($element_name)]
} else {
set $element_name [ns_quotehtml $batch_job($element_name)]
- }
+ }
}
set job_start_time [lc_time_fmt $batch_job(job_start_time) "%x %X"]
@@ -151,7 +151,7 @@
order by entry_id
" {
set entry_url [export_vars -base batch-action { entry_id }]
-
+
# Use message and element_messages to display one short message in the table
if { $message ne "" } {
set short_message $message
@@ -172,7 +172,6 @@
set user_url {}
}
-
set entry_time_pretty [lc_time_fmt $entry_time_ansi "%x %X"]
}
Index: openacs-4/packages/acs-admin/www/auth/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/index.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/auth/index.tcl 15 Sep 2017 07:01:22 -0000 1.13
+++ openacs-4/packages/acs-admin/www/auth/index.tcl 15 Oct 2018 16:52:00 -0000 1.14
@@ -62,11 +62,11 @@
-
-
+ N/A
@@ -95,17 +95,17 @@
}
sub_class narrow
- }
+ }
}
# The authority currently selected for registering users
set register_authority_id [auth::get_register_authority]
-db_multirow -extend {
- enabled_p_url
- sort_order_url_up
- sort_order_url_down
+db_multirow -extend {
+ enabled_p_url
+ sort_order_url_up
+ sort_order_url_down
delete_url
registration_url
registration_status
Index: openacs-4/tcl/zz-postload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/tcl/zz-postload.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/tcl/zz-postload.tcl 7 Aug 2017 23:48:31 -0000 1.7
+++ openacs-4/tcl/zz-postload.tcl 15 Oct 2018 16:52:00 -0000 1.8
@@ -12,7 +12,7 @@
ns_log "Notice" "Done."
# This should probably be moved to the end of bootstrap.tcl once all files are
-# weeded out of the tcl directory.
+# weeded out of the Tcl directory.
ns_log "Notice" "Executing initialization code blocks..."
foreach init_item [nsv_get ad_after_server_initialization .] {
array set init $init_item
@@ -36,7 +36,7 @@
proc __is_xql {arg} {
return [expr {[file isdirectory $arg] || [file extension $arg] eq ".xql"}]}
-# We need to load query files for the top-level stuff in www and tcl
+# We need to load query files for the top-level stuff in www and Tcl
# dirs is the list of directories to walk for xql files. Packages .xql
# files are parsed elsewhere in the bootstrap process.
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -N -r1.58 -r1.59
--- openacs-4/www/blank-master.tcl 28 Mar 2018 19:24:35 -0000 1.58
+++ openacs-4/www/blank-master.tcl 15 Oct 2018 16:52:00 -0000 1.59
@@ -1,5 +1,5 @@
ad_page_contract {
- This is the top level master template. It allows the basic parts of an HTML
+ This is the top-level master template. It allows the basic parts of an HTML
document to be set through convenient data structures without introducing
anything site specific.
@@ -16,7 +16,7 @@
@property doc(title_lang) The language of the document title, if different
from the document language.
- The document output can be customised by supplying the following variables:
+ The document output can be customized by supplying the following variables:
@property doc(type) The declared xml DOCTYPE.
@property doc(charset) The document character set.
@@ -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,26 @@
-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 css for the current subsite, defaulting to the old list/form css which was
+# Add page plugin specific code
+#
+# The check is transitional code (until the release of OpenACS 5.11 or
+# 5.12) and is just upgrading the package from earlier versions, where
+# e.g. the blank master is installed before the subsite definitions
+# for the page_plugin callback. Templates are required to be very
+# robust.
+if {[info commands ::callback::subsite::page_plugin::*] ne ""} {
+ callback subsite::page_plugin
+}
+
+#
+# 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 ""]
@@ -153,14 +165,7 @@
# page (that might require a list of the HTML IDs of all affected
# textareas).
#
-# We check whether render_widgets command exists, as during a release
-# upgrade this could be missing and would prevent any further action
-# on the system after installing new code
-if {[info proc ::template::util::richtext::render_widgets] ne ""} {
- ::template::util::richtext::render_widgets
-} else {
- ns_log warning "::template::util::richtext::render_widgets not defined. Richtext widgets won't work. Try restarting the server."
-}
+::template::util::richtext::render_widgets
#
# Get the basic content info like title and charset for the head of
@@ -233,7 +238,9 @@
document.forms[form_name].elements[element_name].focus();
};
}
- append focus_script "acs_Focus('${form_name}', '${element_name}');\n"
+ append focus_script "window.addEventListener('load', function() {
+ acs_Focus('${form_name}', '${element_name}');
+ }, false);"
template::add_body_script -script $focus_script
} else {
ns_log warning "blank-master: variable focus has invalid value '$focus'"
-
+