#924158 by sun: Fixed SimpleTest selection form markup/styling is broken.

3 files changed, 49 insertions, 40 deletions

diff --git a/modules/simpletest/simpletest.css b/modules/simpletest/simpletest.css
index 9fea7697b..147589d8d 100644
--- a/modules/simpletest/simpletest.css
+++ b/modules/simpletest/simpletest.css
@@ -1,24 +1,33 @@
 /* $Id$ */
 
-/* Addon for the simpletest module */
-#simpletest {
-}
-
 /* Test Table */
 #simpletest-form-table th.select-all {
-  width: 25px;
+  width: 1em;
 }
-
 th.simpletest_test {
-  width: 160px;
+  width: 16em;
 }
 
-table#simpletest-form-table tr td {
+.simpletest-image {
+  display: inline-block;
+  cursor: pointer;
+  width: 1em;
+}
+.simpletest-group-label label {
+  display: inline;
+  font-weight: bold;
+}
+.simpletest-test-label label {
+  margin-left: 1em; /* LTR */
+}
+.simpletest-test-description .description {
+  margin: 0;
+}
+#simpletest-form-table tr td {
   background-color: white;
   color: #494949;
 }
-
-table#simpletest-form-table tr.simpletest-group td {
+#simpletest-form-table tr.simpletest-group td {
   background-color: #EDF5FA;
   color: #494949;
 }
@@ -30,46 +39,33 @@ div.message > div.item-list {
 div.simpletest-pass {
   color: #33a333;
 }
-
 .simpletest-fail {
   color: #981010;
 }
 
 tr.simpletest-pass.odd {
-  background: #b6ffb6;
+  background-color: #b6ffb6;
 }
-
 tr.simpletest-pass.even {
-  background: #9bff9b;
+  background-color: #9bff9b;
 }
-
 tr.simpletest-fail.odd {
-  background: #ffc9c9;
+  background-color: #ffc9c9;
 }
-
 tr.simpletest-fail.even {
-  background: #ffacac;
+  background-color: #ffacac;
 }
-
 tr.simpletest-exception.odd {
-  background: #f4ea71;
+  background-color: #f4ea71;
 }
-
 tr.simpletest-exception.even {
-  background: #f5e742;
+  background-color: #f5e742;
 }
-
 tr.simpletest-debug.odd {
-  background: #eeeeee;
+  background-color: #eee;
 }
-
 tr.simpletest-debug.even {
-  background: #ffffff;
-}
-
-div.simpletest-image {
-  display: inline;
-  cursor: pointer;
+  background-color: #fff;
 }
 
 a.simpletest-collapse {
@@ -77,9 +73,7 @@ a.simpletest-collapse {
   width: 0;
   top: -99em;
   position: absolute;
-
 }
-
 a.simpletest-collapse:focus,
 a.simpletest-collapse:hover {
   font-size: 80%;
diff --git a/modules/simpletest/simpletest.pages.inc b/modules/simpletest/simpletest.pages.inc
index 6024ba216..f02304eeb 100644
--- a/modules/simpletest/simpletest.pages.inc
+++ b/modules/simpletest/simpletest.pages.inc
@@ -108,12 +108,15 @@ function theme_simpletest_test_table($variables) {
 
     // Expand/collapse image and group title.
     $row[] = array(
-      'data' =>  '<div class="simpletest-image" id="simpletest-test-group-' . $test_class . '"></div>&nbsp;' .
-                 '<label for="' . $test_class . '-select-all" class="simpletest-group-label">' . $key . '</label>',
-      'style' => 'font-weight: bold;'
+      'data' => '<div class="simpletest-image" id="simpletest-test-group-' . $test_class . '"></div>' .
+        '<label for="' . $test_class . '-select-all" class="simpletest-group-label">' . $key . '</label>',
+      'class' => array('simpletest-group-label'),
     );
 
-    $row[] = '&nbsp;';
+    $row[] = array(
+      'data' => '&nbsp;',
+      'class' => array('simpletest-group-description'),
+    );
 
     $rows[] = array('data' => $row, 'class' => array('simpletest-group'));
 
@@ -145,9 +148,18 @@ function theme_simpletest_test_table($variables) {
       // Test name is used to determine what tests to run.
       $test['#name'] = $test_name;
 
-      $row[] = drupal_render($test);
-      $row[] = theme('indentation', array('size' => 1)) . '<label for="' . $test['#id'] . '">' . $title . '</label>';
-      $row[] = '<div class="description">' . $description . '</div>';
+      $row[] = array(
+        'data' => drupal_render($test),
+        'class' => array('simpletest-test-select'),
+      );
+      $row[] = array(
+        'data' => '<label for="' . $test['#id'] . '">' . $title . '</label>',
+        'class' => array('simpletest-test-label'),
+      );
+      $row[] = array(
+        'data' => '<div class="description">' . $description . '</div>',
+        'class' => array('simpletest-test-description'),
+      );
 
       $rows[] = array('data' => $row, 'class' => array($test_class . '-test', ($collapsed ? 'js-hide' : '')));
     }
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 95833f812..51f73d108 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -1290,6 +1290,9 @@ div.add-or-remove-shortcuts {
 .page-admin #content img {
   margin-right: 15px; /* LTR */
 }
+.page-admin #content .simpletest-image img {
+  margin: 0;
+}
 .page-admin-structure-block-demo .block-region {
  color: #000000;
 }