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.12.2 -r1.7.12.3
--- openacs-4/packages/acs-admin/lib/service-parameters.tcl	10 Sep 2015 08:21:00 -0000	1.7.12.2
+++ openacs-4/packages/acs-admin/lib/service-parameters.tcl	12 Sep 2015 11:01:22 -0000	1.7.12.3
@@ -39,32 +39,37 @@
     -multirow packages \
     -elements {
         instance_name {
-            label {#acs-admin.Service#}
+            label {\#acs-admin.Service#}
+            html {align left}
         }
         www {
             label "\#acs-admin.Pages\#"
             link_url_col url
             link_html { title "\#acs-admin.Visit_service_pages\#" }
             display_template {<if @packages.url@ not nil>\#acs-admin.Pages\#</if>}
+            html {align left}
         }
         admin {
             label "\#acs-admin.Administration\#"
             link_url_col admin_url
             link_html { title "\#acs-admin.Service_administration\#" }
             display_template {<if @packages.admin_url@ not nil>\#acs-admin.Administration\#</if>}
+            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 {<if @packages.sitewide_admin_url@ not nil>\#acs-admin.Administration\#</if>}
             hide_p {[ad_decode $swadmin_p 1 0 1]}
+            html {align left}
         }
         parameters {
             label "\#acs-admin.Parameters\#"
             link_url_col param_url
             link_html { title "\#acs-admin.Service_parameters\#" }
             display_template {<if @packages.param_url@ not nil>\#acs-admin.Parameters\#</if>}
+            html {align left}
         }
     }
 
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.10.3 -r1.8.10.4
--- openacs-4/packages/acs-admin/lib/site-wide-services.adp	11 Sep 2015 09:07:19 -0000	1.8.10.3
+++ openacs-4/packages/acs-admin/lib/site-wide-services.adp	12 Sep 2015 11:01:22 -0000	1.8.10.4
@@ -1,7 +1,7 @@
 <ul>
   <li><a href="@acs_admin_url@users">Users</a>
   <li><a href="subsites">Subsites</a> (@nr_subsites@)</li>
-  <li><a href="@acs_admin_url@install">Install Packages</a>
+  <li><a href="@acs_admin_url@install">Install OpenACS Packages</a>
   <li><a href="developer">Developer Tools</a>
   <if @acs_lang_admin_url@ not nil>
     <li><a href="@acs_lang_admin_url@">Internationalization/Localization</a>
Index: openacs-4/packages/acs-admin/www/apm/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.adp,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-admin/www/apm/index.adp	11 Sep 2015 08:37:10 -0000	1.4.2.1
+++ openacs-4/packages/acs-admin/www/apm/index.adp	12 Sep 2015 11:01:22 -0000	1.4.2.2
@@ -16,8 +16,7 @@
 <ul>
 <li><a href="package-add">Create a new package.</a>
 <li><a href="write-all-specs">Write new specification files for all installed, locally generated packages.</a>
-<li><a href="package-load">Load a new package from a URL or local directory.</a>
-<li><a href="packages-install">Install or update packages from local file system.</a>
+<li><a href="/acs-admin/install">Install packages.</a>
 </ul>
 
 @watches_html;noquote@
Index: openacs-4/packages/acs-admin/www/install/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/index.adp,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-admin/www/install/index.adp	4 Sep 2015 08:34:24 -0000	1.9.2.1
+++ openacs-4/packages/acs-admin/www/install/index.adp	12 Sep 2015 11:01:22 -0000	1.9.2.2
@@ -4,13 +4,36 @@
 
 <h1>@page_title@</h1>
 
-<listtemplate name="install" style="table-2third"></listtemplate>
+<ul>
+<li><h3>Install from Repository</h3>
 
-<h2>Installed Packages</h2>
+<p>Download and install/upgrade packages from the <a href="http://openacs.org/repository/">OpenACS.org repository</a>.
+<br>When using this option, the existing code of the currently installed packages is moved
+away <br>and replaced by the chosen packages from the OpenACS respository.
 
-The following packages are currently installed on your system:
+<p><a href="http://openacs.org/acs-admin/@remote_install_url@" class="button">Install</a> or
+<a href="http://openacs.org/acs-admin/@remote_upgrade_url@" class="button">upgrade</a> from repository.</p>
 
-<listfilters name="packages" style="inline-filters"></listfilters>
+<li><h3>Install from Local File System</h3>
 
-<listtemplate name="packages" style="table-2third"></listtemplate>
+<p>Install/upgrade packages from the local file system (@local_path@).
+<br>Use this if your site has
+custom code or your packages are kept in a local code repository.
+<a href="/doc/upgrade-openacs-files">Help</a>.</p>
 
+<p><a href="@local_install_url@" class="button">Install or upgrade</a>
+from the local file system.</p>
+
+<li><h3>Install from URL or Local Path</h3>
+<p>Load a single package an archive stored an a non-standard place on
+your local file system or from an URL.</p>
+<p><a href="/acs-admin/apm/package-load" class="button">Load</a> from URL or Local Path</p>
+</ul>
+<hr>
+<h3>Package Manager</h3>
+<ul>
+<li>
+<a href="/acs-admin/apm/">Manage Installed Packages</a>
+</li>
+</ul>
+
Index: openacs-4/packages/acs-admin/www/install/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/index.tcl,v
diff -u -r1.8.2.5 -r1.8.2.6
--- openacs-4/packages/acs-admin/www/install/index.tcl	11 Sep 2015 08:37:11 -0000	1.8.2.5
+++ openacs-4/packages/acs-admin/www/install/index.tcl	12 Sep 2015 11:01:22 -0000	1.8.2.6
@@ -4,10 +4,11 @@
     package_type:optional
 }
 
-set page_title "Install Packages"
+set page_title "Install OpenACS Packages"
 set context [list $page_title]
 
 set local_install_url "[ad_conn package_url]/apm/packages-install"
+set local_path $::acs::rootdir/packages
 
 set repository_url "http://openacs.org/repository/"
 set head_channel [lindex [apm_get_repository_channels $repository_url] 0]
@@ -16,85 +17,84 @@
 set remote_install_url [export_vars -base "install" { repository_url channel current_channel head_channel }]
 set remote_upgrade_url [export_vars -base "install" { { upgrade_p 1 } repository_url channel current_channel head_channel}]
 
-template::multirow create install repository local
+# template::multirow create install repository local
+#
+# multirow append install \
+#     {Download and install/upgrade automatically from <a href="http://openacs.org/repository/">OpenACS.org repository</a>} \
+#     {Install/upgrade from local files.  Use this if your site has custom code or is in a local CVS repository.
+# 	<a href="/doc/upgrade">Help</a>}
+#
+# multirow append install \
+#     [subst { <a href="$remote_install_url" class="button">Install</a> or
+# 	<a href="$remote_upgrade_url" class="button">upgrade</a> from repository.}] \
+#     [subst  {<a href="$local_install_url" class="button">Install or upgrade</a> from local file system.}]
+#
+# template::list::create \
+#     -name install \
+#     -multirow install \
+#     -elements {
+#         repository {
+#             label "Install from Repository"
+# 	    display_template @install.repository;noquote@
+#         }
+#         local {
+#             label "Install from Local Files"
+# 	    display_template @install.local;noquote@
+#         }
+#     }
+#
+#
+#
+# template::list::create \
+#     -name packages \
+#     -multirow packages \
+#     -elements {
+#         pretty_name {
+#             label "Package"
+# 	    html {align left}
+#         }
+#         version_name {
+#             label "Version"
+# 	    html {align left}
+#         }
+#         package_type_pretty {
+#             label "Type"
+#             hide_p 1
+#         }
+#     } -filters {
+#         package_type {
+#             label "Type"
+#             default_value apm_application
+#             where_clause {
+#                 t.package_type = :package_type
+#             }
+#             values {
+#                 {Application apm_application}
+#                 {Service apm_service}
+#             }
+#         }
+#     }
+#
+# db_multirow -extend { package_type_pretty } packages packages "
+#     select v.version_id, 
+#            v.package_key, 
+#            t.pretty_name, 
+#            t.package_type,
+#            v.version_name
+#     from   apm_package_versions v, 
+#            apm_package_types t
+#     where  t.package_key = v.package_key
+#     and    v.enabled_p = 't'
+#     and    v.installed_p = 't'
+#     [template::list::filter_where_clauses -and -name packages]
+#     order  by t.package_type, t.pretty_name
+# " {
+#     set package_type_pretty [string totitle [lindex [split $package_type "_"] 1]]
+# }
 
-multirow append install \
-    {Download and install/upgrade automatically from <a href="http://openacs.org/repository/">OpenACS.org repository</a>} \
-    {Install/upgrade from local files.  Use this if your site has custom code or is in a local CVS repository.
-	<a href="/doc/upgrade">Help</a>}
 
-multirow append install \
-    [subst { <a href="$remote_install_url" class="button">Install</a> or
-	<a href="$remote_upgrade_url" class="button">upgrade</a> from repository.}] \
-    [subst  {<a href="$local_install_url" class="button">Install or upgrade</a> from local file system.}]
 
-template::list::create \
-    -name install \
-    -multirow install \
-    -elements {
-        repository {
-            label "Install from Repository"
-	    display_template @install.repository;noquote@
-        }
-        local {
-            label "Install from Local Files"
-	    display_template @install.local;noquote@
-        }
-    }
 
-
-
-
-template::list::create \
-    -name packages \
-    -multirow packages \
-    -elements {
-        pretty_name {
-            label "Package"
-	    html {align left}
-        }
-        version_name {
-            label "Version"
-	    html {align left}
-        }
-        package_type_pretty {
-            label "Type"
-            hide_p 1
-        }
-    } -filters {
-        package_type {
-            label "Type"
-            default_value apm_application
-            where_clause {
-                t.package_type = :package_type
-            }
-            values {
-                {Application apm_application}
-                {Service apm_service}
-            }
-        }
-    }
-
-db_multirow -extend { package_type_pretty } packages packages "
-    select v.version_id, 
-           v.package_key, 
-           t.pretty_name, 
-           t.package_type,
-           v.version_name
-    from   apm_package_versions v, 
-           apm_package_types t
-    where  t.package_key = v.package_key
-    and    v.enabled_p = 't'
-    and    v.installed_p = 't'
-    [template::list::filter_where_clauses -and -name packages]
-    order  by t.package_type, t.pretty_name
-" {
-    set package_type_pretty [string totitle [lindex [split $package_type "_"] 1]]
-}
-
-
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
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.2.1 -r1.29.2.2
--- openacs-4/packages/acs-subsite/www/admin/index.adp	8 Sep 2015 11:42:29 -0000	1.29.2.1
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	12 Sep 2015 11:01:21 -0000	1.29.2.2
@@ -14,7 +14,7 @@
   </if>
 </ul>
 
-<h1>#acs-subsite.Advanced_Features#</h1>
+<h3>#acs-subsite.Advanced_Features#</h3>
 
 <ul>
   <li><a href="site-map/">#acs-subsite.Site_Map#</a></li>
@@ -27,10 +27,10 @@
 </ul>
 
 <if @sw_admin_p@ true>
-  <h1>#acs-subsite.Core_Services#</h1>
+  <h1>#acs-subsite.lt_For_Site-Wide_Adminis#</h1>
   <ul>
     <li>
-      <a href="@acs_admin_url@">@acs_admin_name@</a>
+    <a href="@acs_admin_url@">@acs_admin_name@</a> <span style="font-style:italic;color:#666;">(#acs-subsite.Site_wide_administration#)</span>
     </li>
   </ul>
 </if>