Index: openacs-4/packages/acs-admin/lib/service-parameters.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.adp,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-admin/lib/service-parameters.adp 18 Mar 2009 20:25:35 -0000 1.3 +++ openacs-4/packages/acs-admin/lib/service-parameters.adp 8 Sep 2015 11:42:29 -0000 1.3.10.1 @@ -1 +1 @@ - + 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.7 -r1.7.12.1 --- openacs-4/packages/acs-admin/lib/service-parameters.tcl 14 May 2007 20:30:16 -0000 1.7 +++ openacs-4/packages/acs-admin/lib/service-parameters.tcl 8 Sep 2015 11:42:29 -0000 1.7.12.1 @@ -2,7 +2,6 @@ # Service parameters list # - if { ![acs_user::site_wide_admin_p] } { ad_return_forbidden \ "Permission Denied" \ Index: openacs-4/packages/acs-admin/lib/site-wide-services.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/site-wide-services.adp,v diff -u -r1.8 -r1.8.10.1 --- openacs-4/packages/acs-admin/lib/site-wide-services.adp 18 Mar 2009 20:25:35 -0000 1.8 +++ openacs-4/packages/acs-admin/lib/site-wide-services.adp 8 Sep 2015 11:42:29 -0000 1.8.10.1 @@ -1,10 +1,13 @@ Index: openacs-4/packages/acs-admin/lib/site-wide-services.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/site-wide-services.tcl,v diff -u -r1.3 -r1.3.24.1 --- openacs-4/packages/acs-admin/lib/site-wide-services.tcl 12 Sep 2003 13:45:15 -0000 1.3 +++ openacs-4/packages/acs-admin/lib/site-wide-services.tcl 8 Sep 2015 11:42:29 -0000 1.3.24.1 @@ -1,5 +1,3 @@ -set acs_admin_url [apm_package_url_from_key "acs-admin"] - -set acs_lang_admin_url "[apm_package_url_from_key "acs-lang"]admin/" - -set acs_core_docs_url [apm_package_url_from_key "acs-core-docs"] +set acs_admin_url [apm_package_url_from_key "acs-admin"] +set acs_lang_admin_url [apm_package_url_from_key "acs-lang"]admin/ +set acs_core_docs_url [apm_package_url_from_key "acs-core-docs"] Fisheye: Tag 1.6.10.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/index-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.10.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/index-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-admin/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/acs-admin/www/index.adp 3 Jul 2015 10:25:36 -0000 1.15 +++ openacs-4/packages/acs-admin/www/index.adp 8 Sep 2015 11:42:29 -0000 1.15.2.1 @@ -1,34 +1,25 @@ @page_title;literal@ -
- Developer's Admin -
+

Site-Wide Administration

-

Core Administration

+ - -

Site-Wide Package Administration

- - - -

Subsite Administration

-

Too many subsites to display: @subsite_number@

+

The following packages provide site-wide administration + facilities. These packages have either site-wide parameters (package + parameters valid for every instance of the package) or they have an + own web interface for site-wide administration (www/site-wide-admin). + + +

- - -

Subsite Administration

- - - -

Service Administration

+

Site-Wide Service Administration

+

Manage service packages and singleton packages (packages which can be mounted only once). +

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.16 -r1.16.2.1 --- openacs-4/packages/acs-admin/www/index.tcl 27 Oct 2014 16:38:51 -0000 1.16 +++ openacs-4/packages/acs-admin/www/index.tcl 8 Sep 2015 11:42:29 -0000 1.16.2.1 @@ -7,37 +7,23 @@ set page_title [ad_conn instance_name] set package_keys '[join [subsite::package_keys] ',']' -set subsite_number [db_string count_subsites {}] -if {$subsite_number > 100} { - set too_many_subsites_p 1 -} else { - set too_many_subsites_p 0 +set subsite_number [db_string count_subsites [subst { + select count(*) from apm_packages where package_key in ($package_keys) +}]] - db_multirow -extend { admin_url path_pretty } subsites subsite_admin_urls {} { - set admin_url "${node_url}admin/" - set path_pretty $instance_name - array set node [site_node::get -node_id $node_id] - set parent_id $node(parent_id) - - while { $parent_id ne "" } { - array unset node - array set node [site_node::get -node_id $parent_id] - set path_pretty "$node(instance_name) > $path_pretty" - set parent_id $node(parent_id) - } - } - multirow sort subsites path_pretty -} - db_multirow -extend { admin_url global_param_url } packages installed_packages {} { - if { [apm_package_installed_p $package_key] && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] } { + if { + [apm_package_installed_p $package_key] + && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] + } { set admin_url "package/$package_key/" } else { set admin_url "" } - if { [catch {db_1row global_params_exist {}} errmsg] || - $global_params == 0 } { - set global_param_url "" + if { [catch {db_1row global_params_exist {}} errmsg] + || $global_params == 0 + } { + set global_param_url "" } else { set return_url [ad_conn url] set global_param_url [export_vars -base /shared/parameters {package_key return_url {scope global}}] @@ -53,17 +39,27 @@ -elements { pretty_name { label "Package" + html {align left} } admin_url { label "Site-Wide Administration" link_html { title "Site-wide Administration" } link_url_col admin_url 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#} + html {align left} } } + +# +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End Index: openacs-4/packages/acs-admin/www/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.xql,v diff -u -r1.6 -r1.6.6.1 --- openacs-4/packages/acs-admin/www/index.xql 17 Oct 2010 21:06:07 -0000 1.6 +++ openacs-4/packages/acs-admin/www/index.xql 8 Sep 2015 11:42:29 -0000 1.6.6.1 @@ -1,14 +1,6 @@ - - - select count(*) - from apm_packages - where package_key in ($package_keys) - - - select package_key, Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/subsites-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/subsites-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/subsites.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/subsites.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v diff -u -r1.29 -r1.29.2.1 --- openacs-4/packages/acs-subsite/www/admin/index.adp 3 Jul 2015 10:25:44 -0000 1.29 +++ openacs-4/packages/acs-subsite/www/admin/index.adp 8 Sep 2015 11:42:29 -0000 1.29.2.1 @@ -22,16 +22,15 @@
  • #acs-subsite.Group_Types#
  • #acs-subsite.Relational_Segments#
  • #acs-subsite.Relationship_Types#
    • -
  • #acs-subsite.Host_Node_Map#
  • #acs-subsite.Object_Types#
    • +

    #acs-subsite.Core_Services#

     Index: openacs-4/packages/acs-subsite/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v diff -u -r1.19 -r1.19.6.1 --- openacs-4/packages/acs-subsite/www/admin/index.tcl 15 Apr 2011 09:50:52 -0000 1.19 +++ openacs-4/packages/acs-subsite/www/admin/index.tcl 8 Sep 2015 11:42:29 -0000 1.19.6.1 @@ -17,7 +17,7 @@ } array set this_node [site_node::get -url [ad_conn url]] -set title "$this_node(instance_name) [_ acs-subsite.Administration]" +set title "Subsite [_ acs-subsite.Administration]: $this_node(instance_name)" set acs_admin_url [apm_package_url_from_key "acs-admin"] array set acs_admin_node [site_node::get -url $acs_admin_url]