Index: openacs-4/packages/acs-automated-testing/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/index.adp,v
diff -u -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/acs-automated-testing/www/admin/index.adp	31 Oct 2016 09:37:12 -0000	1.17.2.2
+++ openacs-4/packages/acs-automated-testing/www/admin/index.adp	2 Dec 2016 16:16:53 -0000	1.17.2.3
@@ -116,8 +116,10 @@
         </else>
         <td> <a href="index?stress=@stress@&amp;security_risk=@security_risk@&amp;by_package_key=@packageinfo.key@&amp;view_by=testcase&amp;quiet=@quiet@">@packageinfo.key@</a></td>
         <if @packageinfo.total@ eq "0">
-          <td> No Data </td><td>-</td><td>-</td>
-          <td style="color:#ff0000"> fail </td>
+          <td align="right">No data</td>
+          <td align="right">-</td>
+          <td align="right">-</td>
+          <td align="right">-</td>
         </if><else>
           <td align="right"> @packageinfo.total@ </td>
           <td align="right"> @packageinfo.passes@ </td>
@@ -156,12 +158,14 @@
           <tr class="even">
         </else>
         <td> @tests.package_key@ </td>
-        <td> <a href="testcase?testcase_id=@tests.id@&amp;package_key=@tests.package_key@&amp;view_by=@view_by@&amp;category=@by_category@&amp;quiet=@quiet@">@tests.id@</a></td>
+        <td><a href="@tests.url@">@tests.id@</a></td>
         <td> @tests.categories@ </td>
         <td> @tests.description@ </td>
         <if @tests.timestamp@ eq "">
-          <td> No Data </td><td>-</td><td>-</td>
-          <td style="color:#ff0000"> fail </td>
+          <td>No data</td>
+          <td>-</td>
+          <td align="right">-</td>
+          <td align="right">-</td>
         </if><else>
           <td>
             <if @tests.fails@ gt 0>
@@ -196,5 +200,5 @@
     </if>
     
   </blockquote>
-<p><a href="../doc/">Documentation</a></p>
+<p><a href="doc/">Documentation</a>
 
Index: openacs-4/packages/acs-automated-testing/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/index.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/acs-automated-testing/www/admin/index.tcl	20 Oct 2015 08:01:06 -0000	1.9.2.2
+++ openacs-4/packages/acs-automated-testing/www/admin/index.tcl	2 Dec 2016 16:16:53 -0000	1.9.2.3
@@ -21,6 +21,7 @@
     quiet:onevalue
 }
 set title "System test cases"
+set return_url [ad_return_url]
 
 if {$by_package_key ne ""} {
     append title " for package $by_package_key"
@@ -95,7 +96,7 @@
     #
     # Prepare the template data for a view_by "testcase"
     #
-    template::multirow create tests id description package_key categories \
+    template::multirow create tests id url description package_key categories \
         timestamp passes fails marker
     set old_package_key ""
     foreach testcase [nsv_get aa_test cases] {
@@ -124,7 +125,11 @@
             } else {
                 set marker 0
             }
-            template::multirow append tests $testcase_id $testcase_desc \
+            set testcase_url [export_vars -base "testcase" -url {testcase_id package_key view_by {category by_category} quiet return_url}]
+            template::multirow append tests \
+                $testcase_id \
+                $testcase_url \
+                $testcase_desc \
                 $package_key \
                 $categories_str \
                 $testcase_timestamp \
@@ -147,11 +152,8 @@
         template::multirow append exclusion_categories $category
     }
 }
-#
-# Set return url 
-#
 
-set record_url [export_vars -base "record-test" -url {{return_url [ad_return_url]} package_key}]
+set record_url [export_vars -base "record-test" -url {return_url package_key}]
 ad_return_template
 
 # Local variables:
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl,v
diff -u -r1.13.2.3 -r1.13.2.4
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	9 Jun 2016 08:19:39 -0000	1.13.2.3
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	2 Dec 2016 16:16:53 -0000	1.13.2.4
@@ -5,6 +5,7 @@
     package_key:token
     {showsource:boolean 0}
     {quiet:boolean 1}
+    {return_url ""}
 } -properties {
     title:onevalue
     context_bar:onevalue
@@ -106,7 +107,9 @@
     {absolute_file_path $testcase_file}
 }]
 
-set return_url [export_vars -base . { { view_by testcase } quiet { by_package_key $package_key } }]
+if {$return_url eq ""} {
+  set return_url [export_vars -base . { { view_by testcase } quiet { by_package_key $package_key } }]
+}
 
 set quiet_url "[export_vars -base testcase -entire_form -exclude {quiet}]&quiet=1"
 set verbose_url "[export_vars -base testcase -entire_form -exclude {quiet}]&quiet=0"