From 7679a1184043f7bedce8a32531e67f6c91ef8b5f Mon Sep 17 00:00:00 2001
From: "ccooper%deadsquid.com"
 <ccooper%deadsquid.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 24 Apr 2007 16:37:25 +0000
Subject: [PATCH] b=322949

- automatically re-select the same testgroup when the user return to continue testing
- select the first subgroup that has not yet been tested in its entirety (defaults to first subgroup if all subgroups have been tested)


git-svn-id: svn://10.0.0.236/trunk@224948 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/litmus/css/litmus.css        |  6 +++++-
 mozilla/webtools/litmus/js/SubGroup.js        | 17 ++++++++++++++---
 mozilla/webtools/litmus/run_tests.cgi         | 19 ++++++++++---------
 .../en/default/process/process.html.tmpl      |  2 +-
 .../runtests/selectgroupsubgroup.html.tmpl    |  4 ++--
 .../en/default/runtests/testdisplay.html.tmpl |  9 +++++----
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/mozilla/webtools/litmus/css/litmus.css b/mozilla/webtools/litmus/css/litmus.css
index 0896067da19..cfaa5a0e661 100755
--- a/mozilla/webtools/litmus/css/litmus.css
+++ b/mozilla/webtools/litmus/css/litmus.css
@@ -1462,4 +1462,8 @@ ul.test_run_nav li {
 
 ul.test_run_nav a {
     text-transform: none;
-}
\ No newline at end of file
+}
+
+li.recommended {
+    font-size: 1.2em;
+}
diff --git a/mozilla/webtools/litmus/js/SubGroup.js b/mozilla/webtools/litmus/js/SubGroup.js
index 62bd82b90a1..3aa6dba03ff 100755
--- a/mozilla/webtools/litmus/js/SubGroup.js
+++ b/mozilla/webtools/litmus/js/SubGroup.js
@@ -67,7 +67,18 @@ function showsubgroup() {
 
 }
 
-function group_init() {
-    testConfigHeight = new fx.Height('test_run_summary', {duration: 400});
-    testConfigHeight.toggle();
+function group_init(testgroup_id) {
+  testConfigHeight = new fx.Height('test_run_summary', {duration: 400});
+  testConfigHeight.toggle();
+    
+  if (testgroup_id) {
+    var testgroups = document.getElementsByName('testgroup');
+    for (var i=0; i<testgroups.length; i++) {
+      if (testgroups[i].value == testgroup_id) {
+        testgroups[i].checked = true;            
+      } else {
+        testgroups[i].checked = false;
+      }
+    }
+  }
 }
diff --git a/mozilla/webtools/litmus/run_tests.cgi b/mozilla/webtools/litmus/run_tests.cgi
index 0c01a11ce03..bffdf34a8d1 100755
--- a/mozilla/webtools/litmus/run_tests.cgi
+++ b/mozilla/webtools/litmus/run_tests.cgi
@@ -123,6 +123,7 @@ sub displayGroupSelection() {
   Litmus::Auth::requireLogin("run_tests.cgi");
   
   my $test_run_id = $c->param("test_run_id");
+  my $default_testgroup = $c->param("defaulttestgroup");
 
   if (!$test_run_id) {
     &displayAllTestRuns();
@@ -176,15 +177,15 @@ sub displayGroupSelection() {
   }
 
   my $vars = {
-              title        => $title,
-              user         => Litmus::Auth::getCurrentUser(),
-              test_runs     => [$test_run],
-              testgroups   => \@testgroups,
-              subgroups    => \%subgroups,
-              defaultgroup => $defaultgroup,
-              defaultemail => $user,
-              show_admin   => Litmus::Auth::istrusted($user),
-              sysconfig    => $sysconfig,
+              title            => $title,
+              user             => Litmus::Auth::getCurrentUser(),
+              test_runs        => [$test_run],
+              testgroups       => \@testgroups,
+              subgroups        => \%subgroups,
+              defaulttestgroup => $default_testgroup,
+              defaultemail     => $user,
+              show_admin       => Litmus::Auth::istrusted($user),
+              sysconfig        => $sysconfig,
              };
 
   Litmus->template()->process("runtests/selectgroupsubgroup.html.tmpl", 
diff --git a/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl b/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl
index 0e8976cfb4f..60fde317452 100755
--- a/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl
@@ -102,7 +102,7 @@ Thank you for your testing efforts.</p>
 
 <p><strong>Where to now?</strong></p>
 <ul class="test_run_nav">
-    <li><a href="run_tests.cgi?test_run_id=[% test_run.test_run_id %]&amp;continuetesting=1[% IF testgroup %]&amp;defaulttestgroup=[% testgroup.testgroup_id | html | uri %][% END %]">Continue testing this Test Run under the same configuration.[% IF test_run.recommended %]<img class="inline" alt="*" src="images/yellowstar.gif" / title="Mozilla needs help testing this right now" />[% END %]</a></li>
+    <li class="recommended"><a href="run_tests.cgi?test_run_id=[% test_run.test_run_id %]&amp;continuetesting=1[% IF testgroup %]&amp;defaulttestgroup=[% testgroup.testgroup_id | html | uri %][% END %]">Continue testing this Test Run under the same configuration.[% IF test_run.recommended %]<img class="inline" alt="*" src="images/yellowstar.gif" / title="Mozilla needs help testing this right now" />[% END %]</a></li>
     <li><a href="run_tests.cgi?test_run_id=[% test_run.test_run_id %]">Continue testing this Test Run, but change my configuration.</a></li>    
     <li><a href="run_tests.cgi">Select a new Test Run to test.</a></li>    
     <li><a href="test_run_report.cgi?test_run_id=[% test_run.test_run_id %]">Show me the report for this Test Run.</a></li>    
diff --git a/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl b/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl
index ebe7d21a224..a4b3ee600ef 100755
--- a/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl
@@ -224,7 +224,7 @@ Please select a testing group with testcases, or that has not yet been tested in
             [% END %]
             
             <tr class="[% groupstyle | none %]">
-                <td align="left"><table class="none"><tr><td><input [% IF ! counttests %]disabled [% ELSIF select_first_avail_subgroup==1 %][% select_first_avail_subgroup=0 %]checked [% END %]type="radio" id="subgroup_[% testgroup FILTER html %]" name="subgroup_[% testgroup FILTER html %]" 
+                <td align="left"><table class="none"><tr><td><input [% IF ! counttests %]disabled [% ELSE %][% IF loop.first %]checked [% ELSE %][% IF select_first_avail_subgroup==1 && personal_completed != 'N/A' && personal_completed < 100 %][% select_first_avail_subgroup=0 %]checked [% END %][% END %][% END %]type="radio" id="subgroup_[% testgroup FILTER html %]" name="subgroup_[% testgroup FILTER html %]" 
                     value="[% cursubgroup.id FILTER html %]" /></td>
                     <td>[% cursubgroup.name FILTER html %]</td></tr></table></td>
                 <td align="center">[% IF ! counttests %] 0 [% ELSE %] [% counttests %] [% END %]</td>
@@ -258,7 +258,7 @@ Please select a testing group with testcases, or that has not yet been tested in
   </div> <!--END content-->
 
   <script type="text/javascript">
-    group_init();
+    group_init([% defaulttestgroup %]);
     beginCoverageLookup();
   </script>
 
diff --git a/mozilla/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl b/mozilla/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl
index 568e713c7c7..01d8f50dd75 100755
--- a/mozilla/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl
@@ -28,9 +28,10 @@
 [%# INTERFACE:
   # $sysconfig - the user's system configuration
   # $istrusted - is the user trusted?
-  # $group     - selected group to test
+  # $test_run  - chosen test run
+  # $testgroup - selected group to test
   # $subgroup  - selected subgroup to test
-  # @tests       - an array of test objects to run
+  # @tests     - an array of test objects to run
 #%]
 
 [% test_run=test_runs.0 %]
@@ -57,13 +58,13 @@
 <input type="hidden" id="test_run_id" name="test_run_id" value="[% test_run.test_run_id %]"/>
 <input id="isTestResult" name="isTestResult" type="hidden" value="true" />
 <input id="editingTestcases" name="editingTestcases" id="editingTestcases" type="hidden" value="" />
-<input id="testgroup" name="testgroup" type="hidden" value="[% group.testgroup_id FILTER html %]" />
+<input id="testgroup" name="testgroup" type="hidden" value="[% testgroup.testgroup_id FILTER html %]" />
 
 <div class="section-full">
 <div class="sec_head">
   <table cellspacing="0" cellpadding="0">
   <tr>
-  <td colspan="2" class="l">Testcases - <a href="run_tests.cgi?product=[% sysconfig.product.productid %]&amp;defaulttestgroup=[% group.testgroup_id %]&amp;continuetesting=1" title="Click here to return to the Test Group selection page">[% group.name | html %]</a>: [% subgroup.name | html %]</td>
+  <td colspan="2" class="l">Testcases - <a href="run_tests.cgi?product=[% sysconfig.product.productid %]&amp;defaulttestgroup=[% group.testgroup_id %]&amp;continuetesting=1" title="Click here to return to the Testgroup selection page">[% group.name | html %]</a>: [% subgroup.name | html %]</td>
   </tr>
   <tr>
   <td class="submitall"><div class="v3"><input class="button" type="submit" id="Submit" name="Submit" value="Submit All Results" onclick="findEdited()" /></div></td>