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 -N -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-admin/www/install/index.adp	3 Jul 2015 10:25:38 -0000	1.9
+++ openacs-4/packages/acs-admin/www/install/index.adp	4 Sep 2015 08:34:24 -0000	1.9.2.1
@@ -3,31 +3,14 @@
   <property name="context">@context;literal@</property>
 
 <h1>@page_title@</h1>
-<table style="border: 1px solid gray" border="1" cellspacing="0" cellpadding="3">
-  <tr>
-    <th>From Repository</th>
-    <th>Local Files</th>
-  </tr>
-  <tr>
-    <td>Download and install/upgrade automatically from <a href="http://openacs.org/repository/">OpenACS.org repository</a>
-    </td>
-    <td>
-      Install/upgrade from local files.  Use this if your site has custom code or is in a local CVS repository.  <a href="/doc/upgrade.html">Help</a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <a href="@remote_install_url@">Install</a> or 
-      <a href="@remote_upgrade_url@">upgrade</a> 
-      from repository.
-    </td>
-    <td><a href="@local_install_url@">Install or upgrade</a> from local file system.</td>
-  </tr>
-</table>
 
+<listtemplate name="install" style="table-2third"></listtemplate>
+
 <h2>Installed Packages</h2>
 
+The following packages are currently installed on your system:
+
 <listfilters name="packages" style="inline-filters"></listfilters>
 
-<listtemplate name="packages"></listtemplate>
+<listtemplate name="packages" style="table-2third"></listtemplate>
 
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 -N -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-admin/www/install/index.tcl	27 Oct 2014 16:38:56 -0000	1.8
+++ openacs-4/packages/acs-admin/www/install/index.tcl	4 Sep 2015 08:34:24 -0000	1.8.2.1
@@ -7,15 +7,46 @@
 set page_title "Install Software"
 set context [list $page_title]
 
+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 \
+    { <a href="@remote_install_url@">Install</a> or <a href="@remote_upgrade_url@">upgrade</a> 
+	from repository.} \
+    {<a href="@local_install_url@">Install or upgrade</a> from local file system.}
+
 template::list::create \
+    -name install \
+    -multirow install \
+    -elements {
+        repository {
+            label "From Repository"
+	    display_template @install.repository;noquote@
+        }
+        local {
+            label "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"
Index: openacs-4/packages/acs-templating/resources/lists/table-2third.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/table-2third.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/resources/lists/table-2third.adp	4 Sep 2015 08:34:25 -0000	1.1.2.1
@@ -0,0 +1,308 @@
+<if @list_properties.page_size@ not nil>
+<!-- top pagination -->
+  <noparse>
+    <if \@paginator.page_count@ gt 1 or \@list_properties.page_size_variable_p@ eq 1>
+      <div class="list-paginator-top">
+        <ul class="compact list-paginator">
+          <if \@paginator.page_count@ gt 1>
+            <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
+              <if \@paginator.previous_group_url@ not nil>
+                <li><a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&lt;&lt;</a></li>
+              </if>
+              <else>
+                 <li>&lt;&lt;</li>
+              </else>
+            </if>
+            <if \@paginator.previous_page_url@ not nil>
+              <li><a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a></li>
+            </if>
+            <else>
+               <li>&lt;</li>
+            </else>
+    
+            <multiple name="paginator_pages">
+              <if \@paginator.current_page@ ne \@paginator_pages.page@>
+                <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
+              </if>
+              <else>
+                <li class="current">\@paginator_pages.page@</li>
+              </else>
+            </multiple>
+
+            <if \@paginator.next_page_url@ not nil>
+             <li><a href="\@paginator.next_page_url@" title="\@paginator.next_page_context@">&gt;</a></li>
+            </if>
+            <else>
+              <li>&gt;</li>
+            </else>
+            <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
+              <if \@paginator.next_group_url@ not nil>
+                <li><a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&gt;&gt;</a></li>
+              </if>
+              <else>
+                <li>&gt;&gt;</li>
+              </else>
+            </if>
+          </if>
+
+          <if \@list_properties.page_size_variable_p@ eq 1>
+            </td><td align="right" width="5%">
+            <form name="\@list_properties.name@_resize" method="GET" action="">
+              \@list_properties.page_size_export_chunk;noquote@
+              <select name="page_size" onChange="acs_ListBulkActionClick('\@list_properties.name@_resize', '\@list_properties.url@'); return false;">
+                <multiple name="page_sizes">
+                  <option value="\@page_sizes.value@"<if \@list_properties.page_size@ eq \@page_sizes.value@> selected</if>>\@page_sizes.name@
+                </multiple>
+              </select>
+            </form>
+          </if>
+        </ul>
+      </div>
+    </if>
+  </noparse>
+<!-- end of top pagination -->
+</if>
+
+
+<if @list_properties.bulk_actions@ not nil>
+  <if @list_properties.bulk_action_method@ not nil>
+  <form name="@list_properties.name@" method="@list_properties.bulk_action_method@" action="">  
+  </if>
+  <else>
+  <form name="@list_properties.name@" method="GET" action="">
+  </else>
+  @list_properties.bulk_action_export_chunk;noquote@
+</if>
+
+
+<if @actions:rowcount@ gt 0>
+<!-- list-button-bar-top div -->
+  <div class="list-button-bar-top">
+    <ul class="compact">
+      <multiple name="actions">
+        <li><a href="@actions.url@" title="@actions.title@" class="button">@actions.label@</a></li>
+      </multiple>
+    </ul>
+  </div>
+<!-- end of list-button-bar-top div -->
+</if>
+
+
+<table width="66%" class="@list_properties.class@" cellpadding="3" cellspacing="1"@list_properties.table_attributes;noquote@>
+  <if "@list_properties.caption@" ne ""><caption>@list_properties.caption;noquote@</caption></if>
+  <multiple name="elements">
+    <thead>
+      <tr class="list-header">
+      <group column="subrownum">
+        <th class="@elements.class@"@elements.cell_attributes;noquote@ id="@list_properties.name@_@elements.name@">
+          <if @elements.orderby_url@ not nil>
+            <if @elements.ordering_p@ true>
+              <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label;noquote@</a>
+              <a href="@elements.orderby_url@" title="@elements.orderby_html_title@"><if @elements.orderby_direction@ eq "desc"><img src="/resources/acs-templating/sort-descending.png" alt="#acs-templating.descending_order#" style="border:0"></if><else><img src="/resources/acs-templating/sort-ascending.png" alt="#acs-templating.ascending_order#" style="border:0"></else></a>
+            </if>
+            <else>
+              <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label;noquote@</a> <img src="/resources/acs-templating/sort-neither.png" alt="#acs-templating.not_ordered#" style="border:0">
+            </else>
+          </if>
+          <else>
+            @elements.label;noquote@
+          </else>
+        </th>
+      </group>
+    </tr>
+    </thead>
+  </multiple>
+
+<!-- START TFOOT for Aggregate func -->
+  <noparse>
+    <multiple name="@list_properties.multirow@">
+  </noparse>
+      
+  <if @list_properties.aggregates_p@ true>
+    <noparse><if \@@list_properties.multirow@.rownum@ eq \@@list_properties.multirow@:rowcount@></noparse>
+      <multiple name="elements">
+        <tfoot>
+        <tr class="list-subheader last">
+          <group column="subrownum">
+            <td class="@elements.class@"@elements.cell_attributes;noquote@>
+              <if @elements.aggregate_label@ not nil>
+                @elements.aggregate_label@
+              </if>
+              <if @elements.aggregate@ not nil>
+                \@@list_properties.multirow@.@elements.aggregate_col@@
+              </if>
+            </td>
+          </group>
+        </tr>
+        </tfoot>
+      </multiple>
+    <noparse></if></noparse>
+  </if>
+
+  <noparse>
+    </multiple>
+  </noparse>
+<!-- END of TFOOT -->
+
+<noparse>
+  <if \@@list_properties.multirow@:rowcount@ eq 0>
+    <tbody>
+    <tr class="list-odd last">
+        <td colspan="@elements:rowcount@">
+        @list_properties.no_data@
+      </td>
+    </tr>
+    </tbody>
+  </if>
+  <else>
+
+    <tbody>
+    <multiple name="@list_properties.multirow@">
+</noparse>
+      
+  <if @list_properties.groupby@ not nil>
+
+      <tr class="list-subheader">
+        <td colspan="@elements:rowcount@" headers="@list_properties.name@_@list_properties.groupby@">
+          <if @list_properties.groupby_label@ ne "">@list_properties.groupby_label@: </if><listelement name="@list_properties.groupby@">
+        </td>
+      </tr>
+
+      <noparse>
+        <group column="@list_properties.groupby@">
+      </noparse>
+  </if>
+
+        <multiple name="elements">
+        
+  <noparse>
+          <if \@@list_properties.multirow@.rownum@ lt \@@list_properties.multirow@:rowcount@>
+            <if \@@list_properties.multirow@.rownum@ odd>
+              <tr class="odd">
+            </if>
+            <else>
+              <tr class="even">
+            </else>
+          </if>
+          <else>
+            <if \@@list_properties.multirow@.rownum@ odd>
+              <tr class="odd last">
+            </if>
+            <else>
+              <tr class="even last">
+            </else>
+          </else>
+  </noparse>
+
+            <group column="subrownum">
+              <td class="@elements.class@"@elements.cell_attributes;noquote@ headers="@list_properties.name@_@elements.name@">
+                <listelement name="@elements.name@">
+              </td>
+            </group>
+          </tr>
+        </multiple>
+
+  <if @list_properties.groupby@ not nil>
+          <noparse><if \@@list_properties.multirow@.groupnum_last_p@ true></noparse>
+            <multiple name="elements">
+              <tr class="list-subheader">
+                <group column="subrownum">
+                  <td class="@elements.class@"@elements.cell_attributes;noquote@>
+                    <if @elements.aggregate_group_label@ not nil>
+                      @elements.aggregate_group_label@
+                    </if>
+                    <if @elements.aggregate@ not nil>
+                      \@@list_properties.multirow@.@elements.aggregate_group_col@@
+                    </if>
+                  </td>
+                </group>
+              </tr>
+            </multiple>
+          <noparse></if></noparse>
+
+       <noparse>
+        </group>
+      </noparse>
+  </if>
+
+  <noparse>
+      </multiple>
+</tbody>
+    </else>
+  </noparse>
+
+</table>
+
+
+<noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
+  <if @bulk_actions:rowcount@ gt 0>
+    <!-- list-button-bar-bottom div -->
+    <div class="list-button-bar-bottom">
+        <multiple name="bulk_actions">
+        <input type="submit" title="@bulk_actions.title@" onclick="@list_properties.bulk_action_click_function@('@list_properties.name@', '@bulk_actions.url@'); return false;" value="@bulk_actions.label@" class="button">
+        </multiple>
+    </div>
+    <!-- end of list-button-bar-bottom div -->
+  </if>
+<noparse></if></noparse>
+
+<if @list_properties.page_size@ not nil>
+<!-- bottom pagination -->
+  <noparse>
+    <if \@paginator.page_count@ gt 1>
+      <div class="list-paginator-bottom">
+        <ul class="compact list-paginator">
+          <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
+            <if \@paginator.previous_group_url@ not nil>
+              <li><a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&lt;&lt;</a></li>
+            </if>
+            <else>
+              <li>&lt;&lt;</li>
+            </else>
+          </if>
+          <if \@paginator.previous_page_url@ not nil>
+            <li><a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a></li>
+          </if>
+          <else>
+            <li>&lt;</li>
+          </else>
+
+          <multiple name="paginator_pages">
+              <if \@paginator.current_page@ ne \@paginator_pages.page@>
+                <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
+              </if>
+              <else>
+                <li class="current">\@paginator_pages.page@</li>
+              </else>
+            </multiple>
+
+          <if \@paginator.next_page_url@ not nil>
+            <li><a href="\@paginator.next_page_url@" title="\@paginator.next_page_context@">&gt;</a></li>
+          </if>
+          <else>
+            <li>&gt;</li>
+          </else>
+          <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
+            <if \@paginator.next_group_url@ not nil>
+              <li><a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&gt;&gt;</a></li>
+            </if>
+            <else>
+              <li>&gt;&gt;</li>
+            </else>
+          </if>
+        </ul>
+      </div>
+    </if>
+  </noparse>
+<!-- end of bottom pagination -->
+</if>
+
+
+
+
+
+<if @list_properties.bulk_actions@ not nil>
+  </form>
+</if>
+
+