Index: openacs-4/packages/acs-admin/acs-admin.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v diff -u -r1.58.2.10 -r1.58.2.11 --- openacs-4/packages/acs-admin/acs-admin.info 26 Oct 2022 14:18:10 -0000 1.58.2.10 +++ openacs-4/packages/acs-admin/acs-admin.info 1 Nov 2022 16:06:51 -0000 1.58.2.11 @@ -9,7 +9,7 @@ f t - + Don Baccus An interface for Site-wide administration of an OpenACS Installation. 2021-09-15 @@ -20,10 +20,10 @@ GPL 3 - + - + Index: openacs-4/packages/acs-admin/lib/service-parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/acs-admin/lib/service-parameters.tcl 3 Nov 2018 19:42:55 -0000 1.12 +++ openacs-4/packages/acs-admin/lib/service-parameters.tcl 1 Nov 2022 16:06:52 -0000 1.12.2.1 @@ -72,22 +72,22 @@ label "\#acs-admin.Administration\#" link_url_col admin_url link_html { title "\#acs-admin.Service_administration\#" } - display_template {\#acs-admin.Administration\#} + display_template { #acs-admin.Administration#} html {align left} } sitewide_admin { label "\#acs-admin.Site-Wide_Admin\#" link_url_col sitewide_admin_url link_html { title "\#acs-admin.Service_administration\#" } - display_template {\#acs-admin.Administration\#} + display_template { #acs-admin.Administration#} hide_p {[string is false $swadmin_p]} html {align left} } parameters { label "\#acs-admin.Parameters\#" link_url_col param_url link_html { title "\#acs-admin.Service_parameters\#" } - display_template {\#acs-admin.Parameters\#} + display_template { #acs-admin.Parameters#} html {align left} } } Index: openacs-4/packages/acs-admin/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.tcl,v diff -u -r1.17.2.2 -r1.17.2.3 --- openacs-4/packages/acs-admin/www/index.tcl 3 May 2020 17:02:45 -0000 1.17.2.2 +++ openacs-4/packages/acs-admin/www/index.tcl 1 Nov 2022 16:06:52 -0000 1.17.2.3 @@ -50,16 +50,16 @@ } admin_url { label "Site-Wide Administration" - link_html { title "Site-wide Administration" } + link_html { align center title "Site-wide Administration" } link_url_col admin_url - display_template {#acs-admin.Administration#} + display_template { #acs-admin.Administration#} html {align left} } global_param_url { label "Global Parameters" link_html {title "Manage Global Parameters" } link_url_col global_param_url - display_template {#acs-admin.Parameters#} + display_template { #acs-admin.Parameters#} html {align left} } } Index: openacs-4/packages/acs-admin/www/subsites.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.tcl,v diff -u -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-admin/www/subsites.tcl 7 Apr 2022 12:53:59 -0000 1.5.2.3 +++ openacs-4/packages/acs-admin/www/subsites.tcl 1 Nov 2022 16:06:52 -0000 1.5.2.4 @@ -24,6 +24,7 @@ path_pretty node_url parameter_url + sitemap_url } subsites subsite_admin_urls [subst { select s.node_id, p.package_id @@ -40,6 +41,7 @@ set parameter_url [export_vars -base /shared/parameters {package_id {return_url "[ad_conn url]"}}] set theme [parameter::get -parameter ThemeKey -package_id $package_id] set theme_url ${admin_url}themes/ + set sitemap_url [export_vars -base /admin/site-map { {root_id $node_id} }] while { $parent_id ne "" } { set node [site_node::get -node_id $parent_id] @@ -70,26 +72,15 @@ link_url_col theme_url html {align left} } - admin_url { - label "Subsite Administration" - link_html { title "Subsite Administration" } - link_url_col admin_url - display_template {#acs-admin.Administration#} - html {align left} - } - parameter_url { - label "Parameters" - link_html {title "Manage Subsite Parameters" } - display_template {\#acs-admin.Parameters#} - link_url_col parameter_url - html {align left} - } - sitemap { - sub_class narrow + actions { + label "Actions" + html {style {white-space:nowrap;}} display_template { - + +   +   + } - link_url_eval {[export_vars -base /admin/site-map { {root_id $node_id} }]} } } } Index: openacs-4/packages/acs-admin/www/apm/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v diff -u -r1.30.2.5 -r1.30.2.6 --- openacs-4/packages/acs-admin/www/apm/index.tcl 24 Apr 2022 16:29:53 -0000 1.30.2.5 +++ openacs-4/packages/acs-admin/www/apm/index.tcl 1 Nov 2022 16:06:52 -0000 1.30.2.6 @@ -82,6 +82,7 @@ } action { label "" + html {style {white-space:nowrap;}} display_template {@packages.action_html;noquote@} } } -filters {owned_by {} supertype {} status {}} @@ -123,7 +124,7 @@ }] } } - set action_html [join $file_link_list " | "] + set action_html [join $file_link_list " "] } # The reload links make the page slow, so make them optional Index: openacs-4/packages/acs-admin/www/apm/package-instances.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-instances.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-admin/www/apm/package-instances.tcl 15 Aug 2018 16:59:53 -0000 1.4 +++ openacs-4/packages/acs-admin/www/apm/package-instances.tcl 1 Nov 2022 16:06:52 -0000 1.4.2.1 @@ -18,37 +18,50 @@ $title] set return_url [export_vars -base [ad_conn url] { package_key }] -append body

$title

    - +append body \ +

    $title

      \ + "" \ + "\n" + +set lines {} db_foreach get_version_info { select package_id, instance_name from apm_packages where package_key = :package_key order by package_id } { + ns_log notice "GOT $package_id, $instance_name " set URLs [site_node::get_url_from_object_id -object_id $package_id] + set actions "" if {[llength $URLs] > 0} { + ns_log notice "GOT $package_id, $instance_name -> URLs $URLs" + foreach url $URLs { set node_id [dict get [site_node::get -url $url] node_id] set delete_href [export_vars -base /admin/applications/application-delete { node_id return_url }] set smap_href [export_vars -base /admin/site-map { {root_id $node_id} return_url }] - append body [subst { -
    • $package_id $instance_name $url (node_id $node_id): - \[delete, - Site Map\] -
      • + set permissions_href [export_vars -base /permissions/one {{object_id $package_id}}] + set line [subst { + }] + lappend lines $line } } else { set delete_href [export_vars -base /admin/applications/application-delete { package_id return_url }] - append body [subst { -
    • $package_id $instance_name (unmounted): - \[delete\] -
      • + set line [subst { + }] - } + lappend lines $line + } } +foreach line $lines { + append body $line\n +} +append body
      Package IDInstance NameMount PointActions
      $package_id$instance_name$url + + + + $package_id$instance_name(unmounted) +
      -append body

    - ad_return_template apm # Index: openacs-4/packages/acs-admin/www/apm/version-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.adp,v diff -u -r1.3.4.2 -r1.3.4.3 --- openacs-4/packages/acs-admin/www/apm/version-view.adp 26 Oct 2022 14:18:10 -0000 1.3.4.2 +++ openacs-4/packages/acs-admin/www/apm/version-view.adp 1 Nov 2022 16:06:52 -0000 1.3.4.3 @@ -50,7 +50,8 @@
    • Files
    • Dependencies and Provides
      • -
    • Parameters
      • +
    • Parameters
      • +
    • Sitewide Admin
    • Tcl Callbacks (install, instantiate, mount)
    • Internationalization
    • @instancesHTML;noquote@
      • @@ -60,8 +61,8 @@

      Update Blueprint

      XML .info package specification file

      Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v diff -u -r1.30.2.5 -r1.30.2.6 --- openacs-4/packages/acs-admin/www/apm/version-view.tcl 26 Oct 2022 14:18:10 -0000 1.30.2.5 +++ openacs-4/packages/acs-admin/www/apm/version-view.tcl 1 Nov 2022 16:06:52 -0000 1.30.2.6 @@ -222,6 +222,14 @@ set watch_href [export_vars -base package-watch {package_key {return_url [ad_return_url]}}] set version_generate_href [export_vars -base version-generate-info {version_id}] +if {[apm_package_installed_p $package_key] + && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] +} { + set sitewide_admin_href "/acs-admin/package/$package_key/" +} else { + set sitewide_admin_href "" +} + if { ![info exists installed_version_id] || ($installed_version_id == $version_id && $distribution_uri eq "") } {