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.5 -r1.5.2.1
--- openacs-4/packages/acs-admin/www/apm/index.adp	7 Aug 2017 23:47:45 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/index.adp	24 Apr 2022 16:29:53 -0000	1.5.2.1
@@ -13,7 +13,7 @@
 
 <listtemplate name="package_list"></listtemplate>
 
-<ul>
+<ul class="action-links">
 <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="/acs-admin/install/">Install or Upgrade packages.</a>
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.4 -r1.30.2.5
--- openacs-4/packages/acs-admin/www/apm/index.tcl	13 Mar 2019 09:37:19 -0000	1.30.2.4
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	24 Apr 2022 16:29:53 -0000	1.30.2.5
@@ -106,13 +106,21 @@
     }
 
     set file_link_list [list]
-    lappend file_link_list "<a href=\"version-files?version_id=$version_id\">view files</a>"
+    lappend file_link_list [subst {
+        <a href="version-files?version_id=$version_id"><adp:icon name='list' title='view files'></a>
+    }]
     if { $installed_p == "t" && $enabled_p == "t" } {
         if {!$performance_p} {
-            lappend file_link_list "<a href=\"package-watch?package_key=$package_key\">watch all files</a>"
+            lappend file_link_list [subst {
+                <a href="package-watch?package_key=$package_key">
+                <adp:icon name='watch' title='watch all files'></a>
+            }]
         }
         if { !$reload_links_p || [apm_version_load_status $version_id] eq "needs_reload"} {
-            lappend file_link_list "<a href=\"version-reload?version_id=$version_id\">reload changed</a>"
+            lappend file_link_list [subst {
+                <a href="version-reload?version_id=$version_id">
+                <adp:icon name='reload' title='reload changed'</a>
+            }]
         }
     }
     set action_html [join $file_link_list " | "]
@@ -122,9 +130,9 @@
 set page_url [export_vars -base [ad_conn url] {orderby owned_by supertype}]
 set href     [export_vars -base [ad_conn url] {orderby owned_by supertype reload_links_p}]
 if { $reload_links_p } {
-    set reload_filter "<a href=\"[ns_quotehtml $href]\">Do not check for changed files</a>"
+    set reload_filter "<a href='[ns_quotehtml $href]'>Do not check for changed files</a>"
 } else {
-    set reload_filter "<a href=\"[ns_quotehtml $href]\">Check for changed files</a>"
+    set reload_filter "<a href='[ns_quotehtml $href]'>Check for changed files</a>"
 }
 
 # Build the list of files we're watching.
Index: openacs-4/packages/acs-admin/www/apm/version-reload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-admin/www/apm/version-reload.adp	7 Aug 2017 23:47:45 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-reload.adp	24 Apr 2022 16:29:53 -0000	1.4.2.1
@@ -10,4 +10,4 @@
 </style>
 
 @body;noquote@
-
+  
\ No newline at end of file
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -r1.16.2.2 -r1.16.2.3
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	2 Aug 2021 17:38:40 -0000	1.16.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	24 Apr 2022 16:29:53 -0000	1.16.2.3
@@ -81,7 +81,7 @@
             set local_path [file join {*}[lrange [file split $file] 2 end]]
             set href [export_vars -base file-watch { version_id { paths $local_path } }]
             append body [subst {
-                (<a href="[ns_quotehtml $href]">watch this file</a>)
+                (<a href="[ns_quotehtml $href]"><adp:icon name="watch" alt="reload"> Watch this file</a>)
             }]
             lappend files_to_watch $local_path
         }
@@ -120,10 +120,10 @@
         select the "watch this file" link next to a filename to cause the interpreters to
         reload the file immediately whenever it is changed.<p>
         <ul class="action-links">
-        <li><a href="[ns_quotehtml $href]">Watch all above files</a></li>
+        <li><a href="[ns_quotehtml $href]"><adp:icon name="watch" alt="reload">  Watch all above files</a></li>
     }]
 } else {
-    append body "<ul class=\"action-links\">"
+    append body "<ul class='action-links'>"
 }
 
 append body [subst {
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 -r1.3.4.1
--- openacs-4/packages/acs-admin/www/apm/version-view.adp	3 Jul 2015 10:38:12 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-view.adp	24 Apr 2022 16:29:53 -0000	1.3.4.1
@@ -1,5 +1,93 @@
 <master>
-<property name="doc(title)">@page_title;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 <property name="context">@context;literal@</property>
 
-@body;noquote@
+<if @version_upgrade_href@ not nil>
+  <p>You may <a href="@version_upgrade_href@">upgrade to this version now</a>.</p>
+</if>
+<if @prompt_text@ not nil>
+  @prompt_text;noquote@
+</if>
+
+
+<h3>Package Information</h3>
+
+<blockquote>
+<table>
+  <tr valign="baseline"><th align="left">Package Name:</th><td>@pretty_name@</td></tr>
+  <tr valign="baseline"><th align="left">Version:</th><td>@version_name@</td></tr>
+  <tr valign="baseline"><th align="left">OpenACS Core:</th><td>@initial_install_p_text@</td></tr>
+  <tr valign="baseline"><th align="left">Singleton:</th><td>@singleton_p_text@</td></tr>
+  <tr valign="baseline"><th align="left">Implements Subsite:</th><td>@implements_subsite_p_text@</td></tr>
+  <tr valign="baseline"><th align="left">Inherit Templates:</th><td>@inherit_templates_p_text@</td></tr>
+  <tr valign="baseline"><th align="left">Auto-mount:</th><td>@auto_mount@</td></tr>
+  <tr valign="baseline"><th align="left">Status:</th><td>@status@</td></tr>
+  <tr valign="baseline"><th align="left">Data Model:</th><td>@data_model_status@</td></tr>
+
+  <tr valign="baseline"><th align="left">Database Support:</th><td>@supported_databases@</td></tr>
+  <tr valign="baseline"><th align="left">CVS:</th><td>@cvs_status@</td></tr>
+  <tr valign="baseline"><th align="left"><if @nr_owners eq 1>Owner</if><else>Owners</else>:</th>
+     <td>@owners_text;noquote@</td></tr>
+  <tr valign="baseline"><th align="left">Package Key:</th><td>@package_key@</td></tr>
+  <tr valign="baseline"><th align="left">Summary:</th><td>@summary@</td></tr>
+  <tr valign="baseline"><th align="left">Description:</th><td>@description@</td></tr>
+  <tr valign="baseline"><th align="left">Release Date:</th><td>@release_date@</td></tr>
+  <if @attribute_text@ not nil>@attribute_text;noquote@</if>
+  
+  <tr valign="baseline"><th align="left">Vendor:</th><td>@vendorHTML;noquote@</td></tr>
+  <tr valign="baseline"><th align="left">Package URL:</th><td><a href="@package_uri@">@package_uri@</a></td></tr>
+  <tr valign="baseline"><th align="left">Version URL:</th><td><a href="@version_uri@">@version_uri@</a></td></tr>
+  <tr valign="baseline"><th align="left">Distribution File:</th><td>@distributionHTML;noquote@</td></tr>
+</table>
+</blockquote>
+  
+<ul class="action-links">
+<li><a href="@edit_package_info_href@">Edit above information</a> (Also use this to create a new version)</li>
+</ul>
+
+<h4>Manage</h4>
+
+<ul class="action-links">
+  <li><a href="@version_files_href@">Files</a></li>
+  <li><a href="@version_dependency_href@">Dependencies and Provides</a></li>
+  <li><a href="@version_parameters_href@">Parameters</a></li>
+  <li><a href="@version_callbacks_href@">Tcl Callbacks (install, instantiate, mount)</a></li>
+  <li><a href="@i18_href@">Internationalization</a></li>
+  <li>@instancesHTML;noquote@</li>
+  @instance_createHTML;noquote@
+</ul>
+
+<h4>Reload</h4>
+
+<ul class="action-links">
+  <li><adp:icon name="reload" alt="reload"> Reload this package</a></li>
+  <li><adp:icon name="watch" alt="reload"> Watch all files in package</a></li>
+</ul>
+
+<h4>XML .info package specification file</h4>
+
+<ul class="action-links">
+  <li><a href="@version_generate_href@">Display an XML package specification file for this version</a></li>
+  <if @version_write_href@ not nil><li><a href="@version_write_href@">Write
+        an XML package specification to the <tt>packages/@package_key@/@package_key@.info</tt> file</a></li>
+  </if>
+  <if @generate_tarball_href@ not nil><li><a href="@generate_tarball_href@">Generate
+        a distribution file for this package from the filesystem</a></li>
+  </if>
+</ul>
+
+<h4>Disable/Uninstall</h4>
+
+<ul class="action-links">
+  <if @version_disable_href@ not nil><li><a href="@version_disable_href@">Disable
+        this version of the package</a></li>
+  </if>
+  <if @version_enable_href@ not nil><li><a href="@version_enable_href@">Enable
+        this version of the package</a></li>
+  </if>
+  <if @package_delete_href@ not nil><li><a href="@package_delete_href@">Uninstall
+        this package from your system</a> (be very careful!)</li>
+  </if>
+</ul>
+           
+
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.3 -r1.30.2.4
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	3 Jul 2020 07:43:20 -0000	1.30.2.3
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	24 Apr 2022 16:29:53 -0000	1.30.2.4
@@ -31,7 +31,6 @@
 db_0or1row apm_enabled_version_info {}
 set installed_version_name_greater_p [expr {[apm_version_names_compare $installed_version_name $version_name] == 1}]
 
-
 db_0or1row apm_data_model_install_version {}
 
 if { $vendor eq "" } {
@@ -80,10 +79,7 @@
         version $installed_version_name, is installed and [expr {$installed_enabled_p ? "enabled" : "disabled"}].
     }]
     if { !$installed_version_name_greater_p } {
-        set href [export_vars -base version-upgrade {version_id}]
-        append body [subst {
-            You may <a href="[ns_quotehtml $href]">upgrade to this version now</a>.
-        }]
+        set version_upgrade_href [export_vars -base version-upgrade {version_id}]
     }
 }
 
@@ -116,10 +112,8 @@
     lappend owners "-"
 }
 
-if { [llength $prompts] == 0 } {
-    set prompt_text ""
-} else {
-    set prompt_text "<ul><li>[join $prompts "\n<li>"]</ul>"
+if { [llength $prompts] > 0 } {
+    set prompt_text [subst {<ul><li>[join $prompts "\n<li>"]</ul>}]
 }
 
 set title "$pretty_name $version_name"
@@ -128,40 +122,19 @@
                  [list "/acs-admin/apm/" "Package Manager"] \
                  $title]
 
-append body [subst {
-    $prompt_text
+foreach var {initial_install_p singleton_p implements_subsite_p inherit_templates_p} {
+    set ${var}_text #acs-admin.[expr {[set $var] ? "Yes" : "No"}]#
+}
 
-    <h3>Package Information</h3>
-
-    <blockquote>
-    <table>
-    <tr valign="baseline"><th align="left">Package Name:</th><td>$pretty_name</td></tr>
-    <tr valign="baseline"><th align="left">Version:</th><td>$version_name</td></tr>
-    <tr valign="baseline"><th align="left">OpenACS Core:</th><td>[expr {$initial_install_p ? "Yes" : "No"}]</td></tr>
-    <tr valign="baseline"><th align="left">Singleton:</th><td>[expr {$singleton_p ? "Yes" : "No"}]</td></tr>
-    <tr valign="baseline"><th align="left">Implements Subsite:</th><td>[expr {$implements_subsite_p ? "Yes" : "No"}]</td></tr>
-    <tr valign="baseline"><th align="left">Inherit Templates:</th><td>[expr {$inherit_templates_p ? "Yes" : "No"}]</td></tr>
-    <tr valign="baseline"><th align="left">Auto-mount:</th><td>$auto_mount</td></tr>
-    <tr valign="baseline"><th align="left">Status:</th><td>$status</td></tr>
-    <tr valign="baseline"><th align="left">Data Model:</th><td>$data_model_status</td></tr>
-}]
-
 set supported_databases_list [apm_package_supported_databases $package_key]
 if { $supported_databases_list eq "" } {
     set supported_databases "none specified"
 } else {
     set supported_databases [join $supported_databases_list ", "]
 }
 
-append body [subst {
-    <tr valign="baseline"><th align="left">Database Support:</th><td>$supported_databases</td></tr>
-    <tr valign="baseline"><th align="left">CVS:</th><td>$cvs_status</td></tr>
-    <tr valign="baseline"><th align="left">[expr {[llength $owners] == 1 ? "Owner" : "Owners"}]:</th><td>[join $owners "<br>"]</td></tr>
-    <tr valign="baseline"><th align="left">Package Key:</th><td>$package_key</td></tr>
-    <tr valign="baseline"><th align="left">Summary:</th><td>$summary</td></tr>
-    <tr valign="baseline"><th align="left">Description:</th><td>$description</td></tr>
-    <tr valign="baseline"><th align="left">Release Date:</th><td>$release_date</td></tr>
-}]
+set nr_owners [llength $owners]
+set owners_text [join $owners "<br>"]
 
 # Dynamic package version attributes
 array set all_attributes [apm::package_version::attributes::get_spec]
@@ -170,33 +143,28 @@
                           -array attributes]
 foreach attribute_name [array names attributes] {
     array set attribute $all_attributes($attribute_name)
-    append body [subst {
+    append attribute_text [subst {
         <tr valign="baseline"><th align="left">$attribute(pretty_name):</th><td>$attributes($attribute_name)</td></tr>
     }]
 }
 
 set vendorHTML [expr {$vendor_uri eq "" ? $vendor : [subst {<a href="[ns_quotehtml $vendor_uri]">$vendor</a>}]}]
-append body [subst {
-    <tr valign="baseline"><th align="left">Vendor:</th><td>$vendorHTML</td></tr>
-    <tr valign="baseline"><th align="left">Package URL:</th><td><a href="$package_uri">$package_uri</a></td></tr>
-    <tr valign="baseline"><th align="left">Version URL:</th><td><a href="$version_uri">$version_uri</a></td></tr>
-    <tr valign="baseline"><th align="left">Distribution File:</th><td>
-}]
 
+set distributionHTML ""
 if { $tarball_length ne "" && $tarball_length > 0 } {
     set href [export_vars -base packages/[file tail $version_uri] {version_id}]
-    append body [subst {
+    append distributionHTML [subst {
         <a href="[ns_quotehtml $href]">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a>
     }]
     if { $distribution_uri eq "" } {
-        append body "(generated on this system"
+        append distributionHTML "(generated on this system"
         if { $distribution_date ne "" } {
-            append body " on $distribution_date"
+            append distributionHTML " on $distribution_date"
         }
-        append body ")"
+        append distributionHTML ")"
         set href [export_vars -base "https://openacs.org/xowf/package-submissions/PackageSubmit.wf" \
                       {{m create-new} {p.description $summary} {title "[file tail $version_uri]"}}]
-        append body [subst {
+        append distributionHTML [subst {
             <p>
             In order to contribute this package back to the OpenACS community,
             <ol>
@@ -207,17 +175,17 @@
             </ol>
         }]
     } else {
-        append body "(downloaded from $distribution_uri"
+        append distributionHTML "(downloaded from $distribution_uri"
         if { $distribution_date ne "" } {
-            append body " on $distribution_date"
+            append distributionHTML " on $distribution_date"
         }
-        append body ")"
+        append distributionHTML ")"
     }
 } else {
-    append body "None available"
+    append distributionHTML "None available"
     if { $installed_p == "t" } {
         set href [export_vars -base version-generate-tarball {version_id}]
-        append body [subst {
+        append distributionHTML [subst {
             (<a href="[ns_quotehtml $href]">generate one now</a> from the filesystem)
         }]
     }
@@ -226,105 +194,64 @@
 
 set nr_instances [apm_num_instances $package_key]
 if {$nr_instances > 0} {
-    set instances [subst {
+    set instancesHTML [subst {
         Installed instances of this package:
         <a href="[ns_quotehtml [export_vars -base package-instances { package_key }]]">$nr_instances</a>
     }]
 } else {
-    set instances "No installed instance of this package\n"
+    set instancesHTML "No installed instance of this package\n"
 }
 if {$nr_instances == 0 || ($nr_instances > 0 && !$singleton_p)} {
     set href [export_vars -base package-instance-create { package_key {return_url [ad_return_url]}}]
-    set instance_create [subst {
+    set instance_createHTML [subst {
         <li><a href="[ns_quotehtml $href]">Create
         (unmounted) instance of this package</a></li>
     }]
 } else {
-    set instance_create ""
+    set instance_createHTML ""
 }
 
-append body [subst {
-    </td></tr>
-    </table>
-    </blockquote>
+set edit_package_info_href  [export_vars -base version-edit         {version_id}]
+set version_files_href      [export_vars -base version-files        {version_id}]
+set version_dependency_href [export_vars -base version-dependencies {version_id}]
+set version_parameters_href [export_vars -base version-parameters   {version_id}]
+set version_callbacks_href  [export_vars -base version-callbacks    {version_id}]
+set i18_href                [export_vars -base version-i18n-index   {version_id}]
+set reload_href             [export_vars -base version-reload {version_id {return_url [ad_return_url]}}]
+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}]
 
-    <ul>
-    <li><a href="[ns_quotehtml [export_vars -base version-edit {version_id}]]">Edit
-    above information</a> (Also use this to create a new version)</li>
-    </ul>
-    <h4>Manage</h4>
-    <ul>
-    <li><a href="[ns_quotehtml [export_vars -base version-files        {version_id}]]">Files</a></li>
-    <li><a href="[ns_quotehtml [export_vars -base version-dependencies {version_id}]]">Dependencies and Provides</a></li>
-    <li><a href="[ns_quotehtml [export_vars -base version-parameters   {version_id}]]">Parameters</a></li>
-    <li><a href="[ns_quotehtml [export_vars -base version-callbacks    {version_id}]]">Tcl Callbacks (install, instantiate, mount)</a></li>
-    <li><a href="[ns_quotehtml [export_vars -base version-i18n-index   {version_id}]]">Internationalization</a></li>
-    <li>$instances</li>
-    $instance_create
-    </ul>
-    <h4>Reload</h4>
-    <ul>
-    <li><a href="[ns_quotehtml [export_vars -base version-reload {version_id  {return_url [ad_return_url]}}]]">Reload
-    this package</a></li>
-    <li><a href="[ns_quotehtml [export_vars -base package-watch  {package_key {return_url [ad_return_url]}}]]">Watch
-    all files in package</a></li>
-    </ul>
-    <h4>XML .info package specification file</h4>
-    <ul>
-    <li><a href="[ns_quotehtml [export_vars -base version-generate-info {version_id}]]">Display an
-    XML package specification file for this version</a></li>
-}]
-
-if { ![info exists installed_version_id] || $installed_version_id == $version_id &&
-     $distribution_uri eq "" } {
+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 {
-        <li><a href="[ns_quotehtml [export_vars -base version-generate-info {version_id {write_p 1}}]]">Write
-        an XML package specification to the <tt>packages/$package_key/$package_key.info</tt> file</a></li>
-    }]
+    set version_write_href [export_vars -base version-generate-info {version_id {write_p 1}}]
 }
 
 if { $installed_p == "t" } {
     if { $distribution_uri eq "" } {
         # 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 {
-            <li><a href="[ns_quotehtml [export_vars -base version-generate-tarball {version_id}]]">Generate
-            a distribution file for this package from the filesystem</a></li>
-        }]
+        set generate_tarball_href [export_vars -base version-generate-tarball {version_id}]
     }
 
-    append body "</ul><h4>Disable/Uninstall</h4><ul>"
+    append body "<ul>"
 
     if { [info exists can_disable_p] } {
-        append body [subst {
-            <li><a href="[ns_quotehtml [export_vars -base version-disable {version_id}]]">Disable
-            this version of the package</a></li>
-        }]
+        set version_disable_href [export_vars -base version-disable {version_id}]
+
     }
     if { [info exists can_enable_p] } {
-        append body [subst {
-            <li><a href="[ns_quotehtml [export_vars -base version-enable {version_id}]]">Enable
-            this version of the package</a></li>
-        }]
+        set version_enable_href [export_vars -base version-enable {version_id}]
     }
 
     if { $installed_p == "t" } {
-        append body [subst {
-            <li><a href="[ns_quotehtml [export_vars -base package-delete {version_id}]]">Uninstall
-            this package from your system</a> (be very careful!)</li>
-        }]
-    }
+        set package_delete_href [export_vars -base package-delete {version_id}]
+    }        
 }
 
-append body {
-    </ul>
-}
-
-ad_return_template apm
-
 #
 # Local variables:
 #    mode: tcl