Index: openacs-4/packages/acs-automated-testing/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-automated-testing/www/index.adp	25 Feb 2004 09:16:19 -0000	1.4
+++ openacs-4/packages/acs-automated-testing/www/index.adp	26 Feb 2004 13:36:50 -0000	1.5
@@ -3,22 +3,29 @@
   <property name="context">@context@</property>
 
 <if @servers:rowcount@ gt 0>
-  <table border="1" cellspacing="0" cellpadding="2">
+  <table border="1" cellspacing="0" cellpadding="3">
     <tr>
       <th>Server</th>
+      <th>Login</th>
       <th>Description</th>
       <th>Last built</th>
       <th>Errors</th>
+      <th>Details</th>
     </tr>
+    <tr>
+      <td><b>This server</b></td>
+      <td colspan="4" align="center"><a href="admin/">Automated Test Admin</a></td>
+    </tr>
     <multiple name="servers">
       <tr>
         <if @servers.parse_errors@ not nil>
           <td colspan="4">Could not parse XML file at @servers.path@: @servers.parse_errors@</td>
         </if>
         <else>
           <td><a href="@servers.remote_url@">@servers.name@</a></td>
-          <td>@servers.description@</td>
-          <td style="white-space:nowrap"><a href="@servers.local_url@">@servers.install_date@</a></td>
+	  <td><a href="@servers.admin_login_url@">Admin</a></td>
+          <td>@servers.description;noquote@</td>
+          <td style="white-space:nowrap">@servers.install_date@</td>
 	  <if @servers.error_total_count@ eq 0>
             <td style="background-color:green">@servers.error_total_count@</td>
 	  </if>
@@ -30,14 +37,16 @@
             <td style="background-color:red"><b>@servers.error_total_count@</b></td>
             </else>
           </else>
+          <td style="white-space:nowrap"><a href="@servers.local_url@">More info</a></td>
         </else>
       </tr>
     </multiple>
   </table>
 </if>
 
-<p>Errors cannot be automatically reported for versions of OpenACS prior to 5.1d2.
-
+<p>Error reporting is not available for versions of OpenACS prior to 5.1d2.
+<p><a href="doc/">Documentation</a>
 <if @xml_report_dir@ nil>
   The XMLReportDir parameter is empty so a server listing cannot be generated.
 </if>
+
Index: openacs-4/packages/acs-automated-testing/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-automated-testing/www/index.tcl	24 Feb 2004 16:59:35 -0000	1.3
+++ openacs-4/packages/acs-automated-testing/www/index.tcl	26 Feb 2004 13:36:50 -0000	1.4
@@ -11,7 +11,7 @@
 
 set page_title "Test Servers Control Page"
 set context [list]
-multirow create servers path local_url remote_url name description install_date error_total_count parse_errors
+multirow create servers path admin_login_url local_url remote_url name description install_date error_total_count parse_errors
 
 set xml_report_dir [aa_test::xml_report_dir]
 if { ![empty_string_p $xml_report_dir] } {
@@ -24,9 +24,12 @@
             array set testcase_failure $test(testcase_failure)
             set service(num_errors) [llength [array names testcase_failure]]
         } 
+	
+	set admin_login_url [export_vars -base "$service(url)/register/auto-login" {{email {$service(adminemail)}} {password {$service(adminpassword)}}}]
 
         multirow append servers \
             $service(path) \
+	    $admin_login_url \
             [export_vars -base server { path }] \
 	    $service(url) \
             $service(name) \
Index: openacs-4/packages/acs-automated-testing/www/rebuild-server.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/Attic/rebuild-server.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-automated-testing/www/rebuild-server.tcl	26 Feb 2004 13:36:50 -0000	1.1
@@ -0,0 +1,11 @@
+ad_page_contract {
+    Rebuild server
+} {
+    server:notnull
+}
+
+exec sudo /usr/local/bin/rebuild-server.sh $server >& /web/master/www/rebuild-$server.log &
+
+ad_returnredirect /rebuild-$server.log
+
+
Index: openacs-4/packages/acs-automated-testing/www/server.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-automated-testing/www/server.adp	25 Feb 2004 09:16:19 -0000	1.3
+++ openacs-4/packages/acs-automated-testing/www/server.adp	26 Feb 2004 13:36:50 -0000	1.4
@@ -10,14 +10,9 @@
       <li>URL: <a href="@service.url@">@service.url@</a>
     </ul>
   </li>
-  <li>Login:
+  <li>Login as:
     <ul>
-      <if @admin_p@>
-        <li><a href="@admin_login_url@">Admin user</a> (pwd: @service.adminpassword@)
-      </if>
-      <else>
-        <li>You need to login as admin on this server to access admin password of remote server.</li>
-      </else>
+      <li><a href="@admin_login_url@">Admin user</a> (pwd: @service.adminpassword@)
     </ul>
   </li>
   </li>
@@ -61,20 +56,11 @@
       </p>
     </else>
   </li>
-</ul>
-
-<h3>Rebuild</h3>
-
-<ul
   <li>
-    To rebuild this server:
-    <ol>
-      <li>
-        SSH to @service.hostname@
-      </li>
-      <li>
-        Execute @service.rebuild_cmd@
-      </li>
-    </ol>
+    <a href="@rebuild_url@" onclick="return confirm('Are you sure you want to wipe and rebuild this server?');">Rebuild this server now</a>
   </li>
+  <li>
+    <a href="@rebuild_log_url@">Rebuild log</a>
+  </li>
 </ul>
+
Index: openacs-4/packages/acs-automated-testing/www/server.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-automated-testing/www/server.tcl	24 Feb 2004 15:35:09 -0000	1.2
+++ openacs-4/packages/acs-automated-testing/www/server.tcl	26 Feb 2004 13:36:50 -0000	1.3
@@ -11,7 +11,7 @@
 set test_path [aa_test::test_file_path -install_file_path $path]
 set has_test_report_p [file exists $test_path]
 
-multirow create testcase_failures testcase_id count
+multirow create testcase_failures testcase_id count 
 
 if { $has_test_report_p } {
     aa_test::parse_test_file -path $test_path -array test
@@ -25,4 +25,7 @@
 set page_title "Control Page for Server $service(name)"
 set context [list $page_title]
 
-set admin_login_url [export_vars -base "$service(url)/register" {{email {$service(adminemail)}} {password {$service(adminpassword)}}}]
+set admin_login_url [export_vars -base "$service(url)/register/auto-login" {{email {$service(adminemail)}} {password {$service(adminpassword)}}}]
+
+set rebuild_url [export_vars -base rebuild-server { { server $service(name) } }]
+set rebuild_log_url "/rebuild-$service(name).log"