From 886cdeafa358f2eec65245a1cfa2a0d8e32f1206 Mon Sep 17 00:00:00 2001
From: Chris Morgan <cmorgan@alum.wpi.edu>
Date: Mon, 23 Apr 2007 02:33:19 +0000
Subject: [PATCH] Clean up the layout of the version and application pages and
 add some css classes to define the formatting

---
 application.css         |   7 ++
 include/application.php |  12 ++-
 include/testData.php    |  37 +++++----
 include/version.php     | 174 ++++++++++++++++++++++++----------------
 4 files changed, 143 insertions(+), 87 deletions(-)

diff --git a/application.css b/application.css
index 6094e13..4922293 100644
--- a/application.css
+++ b/application.css
@@ -29,3 +29,10 @@ tr.gold             { background-color: #fff600; }
 tr.silver           { background-color: silver;  }
 tr.bronze           { background-color: #fcba0a; }
 tr.garbage          { background-color: #999966; }
+
+/* classes for the version info pane */
+/* version info pane is the right hand pane at the top of the version page */
+div.version_info_pane p { margin:0px; }
+div.info_container { margin:6px; border: 1px solid; }
+div.info_contents { padding:10px; background-color: #eee; }
+div.title_class { font-weight: bold; border-bottom: 1px solid; padding: 4px; font-size: 140%; background-color: #ddd; }
diff --git a/include/application.php b/include/application.php
index 54269d5..c174642 100644
--- a/include/application.php
+++ b/include/application.php
@@ -716,9 +716,15 @@ class Application {
 
         // description
         echo "  <td class=color2 valign=top width='100%'>\n";
-        echo "    <table width='100%' border=0><tr><td width='100%' valign=top><span class=\"title\">Description</span>\n";
-        echo $this->sDescription;
-        echo "    </td></tr></table>\n";
+        echo "<div class='info_container'>\n";
+        echo "\t<div class='title_class'>\n";
+        echo "\t\tDescription\n";
+        echo "\t</div>\n";                      // close the 'title_class' div
+        echo "\t<div class='info_contents'>\n";
+        echo "\t\t".$this->sDescription."\n";
+        echo "\t</div>\n";                      // close the 'info_contents' div
+        echo "</div>\n";                        // close the 'info_container' div
+
         echo html_frame_end("For more details and user comments, view the versions of this application.");
 
         // display versions
diff --git a/include/testData.php b/include/testData.php
index 47d57b6..cd78e32 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -421,13 +421,13 @@ class testData{
     function ShowTestResult()
     {
         echo '<p><b>What works</b><br />',"\n";
-        echo $this->shWhatWorks;
-        echo '<p><b>What does not</b><br />',"\n";
-        echo $this->shWhatDoesnt;
-        echo '<p><b>What was not tested</b><br />',"\n";
-        echo $this->shWhatNotTested;
-        echo '<p><b>Additional Comments</b><br />',"\n";
-        echo $this->sComments;
+        echo $this->shWhatWorks,"\n";
+        echo '<p><br /><b>What does not</b><br />',"\n";
+        echo $this->shWhatDoesnt,"\n";
+        echo '<p><br /><b>What was not tested</b><br />',"\n";
+        echo $this->shWhatNotTested,"\n";
+        echo '<p><br /><b>Additional Comments</b><br />',"\n";
+        echo $this->sComments,"\n";
     }
 
     // Show the Test results for a application version
@@ -459,7 +459,9 @@ class testData{
 
         if($rowsUsed == 0)
              return;
-        echo '<p><span class="title">Test Results</span><br />',"\n";
+        echo '<div class="info_container">',"\n";
+        echo '<div class="title_class">Test Results</div>',"\n";
+        echo '<div class="info_contents">',"\n";
         echo '<table width="100%" border="1" class="historyTable">',"\n";
         echo '<thead class="historyHeader">',"\n";
         echo '<tr>',"\n";
@@ -486,11 +488,11 @@ class testData{
             if ($oTest->iTestingId == $this->iTestingId)
             {
                 echo '<tr class='.$bgcolor.'>',"\n";
-                echo '    <td align="center" class="color2"><b>Current</b></td>',"\n";
+                echo '    <td align="center"><b>Current</b></td>',"\n";
             } else /* make all non-current rows clickable so clicking on them selects the test as current */
             {
                 html_tr_highlight_clickable($link.$oTest->iTestingId, $bgcolor, "", "color2", "underline"); 
-                echo '    <td align="center" class="color2">[<a href="'.$link.$oTest->iTestingId;
+                echo '    <td align="center">[<a href="'.$link.$oTest->iTestingId;
 
                 if(is_string($sShowAll))
                     echo '&sShowAll='.$sShowAll.'">Show</a>]</td>',"\n";
@@ -519,16 +521,21 @@ class testData{
 
         echo '</table>',"\n";
 
-        echo '<form method=get action="'.$PHP_SELF.'">';
-        echo '<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />';
+        echo '<br />',"\n"; // put a space after the test results table and the button
+
+        echo '<form method=get action="'.$PHP_SELF.'">'."\n";
+        echo "\t".'<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'."\n";
         if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll))
-            echo '<input class="button" name="sShowAll" type=submit value="Show All Tests" />';
+            echo "\t".'<input class="button" name="sShowAll" type=submit value="Show All Tests" />'."\n";
 
         if(is_string($sShowAll))
         {
-            echo '<input class="button" name="sHideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />';
+            echo "\t".'<input class="button" name="sHideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />'."\n";
         }
-        echo '</form>';
+        echo '</form>'."\n";
+
+        echo '</div>',"\n"; // end of the 'info_contents' div
+        echo '</div>',"\n"; // end of the 'info_container' div
     }
 
     /* retrieve the latest test result for a given version id */
diff --git a/include/version.php b/include/version.php
index 6551326..5d612b0 100644
--- a/include/version.php
+++ b/include/version.php
@@ -761,86 +761,86 @@ class Version {
             echo "<tr class=color0><td align=right colspan=2>";
             echo "No maintainers. Volunteer today!</td></tr>\n";
         }
-        echo "</table></td></tr>";
+        echo "</table></td></tr>\n";
 
         // display the app maintainer button
-        echo '<tr><td colspan="2" align="center">';
+        echo '<tr><td colspan="2" align="center">'."\n";
         if($_SESSION['current']->isLoggedIn())
         {
             /* is this user a maintainer of this version by virtue of being a super maintainer */
             /* of this app family? */
             if($_SESSION['current']->isSuperMaintainer($oApp->iAppId))
             {
-                echo '<form method="post" name="sMessage" action="maintainerdelete.php">';
-                echo '<input type="submit" value="Remove yourself as a super maintainer" class="button">';
-                echo '<input type="hidden" name="iSuperMaintainer" value="1">';
-                echo "<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">";
-                echo "<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">";
-                echo "</form>";
+                echo '<form method="post" name="sMessage" action="maintainerdelete.php">'."\n";
+                echo "\t".'<input type="submit" value="Remove yourself as a super maintainer" class="button">'."\n";
+                echo "\t".'<input type="hidden" name="iSuperMaintainer" value="1">'."\n";
+                echo "\t<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">\n";
+                echo "\t<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">\n";
+                echo "</form>\n";
             } else
             {
                 /* are we already a maintainer? */
                 if($_SESSION['current']->isMaintainer($this->iVersionId)) /* yep */
                 {
-                    echo '<form method="post" name="sMessage" action="maintainerdelete.php">';
-                    echo '<input type="submit" value="Remove yourself as a maintainer" class=button>';
-                    echo '<input type="hidden" name="iSuperMaintainer" value="0">';
-                    echo "<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">";
-                    echo "<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">";
-                    echo "</form>";
+                    echo '<form method="post" name="sMessage" action="maintainerdelete.php">'."\n";
+                    echo "\t".'<input type="submit" value="Remove yourself as a maintainer" class=button>'."\n";
+                    echo "\t".'<input type="hidden" name="iSuperMaintainer" value="0">'."\n";
+                    echo "\t"."<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">\n";
+                    echo "\t"."<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">\n";
+                    echo "</form>\n";
                 } else /* nope */
                 {
-                    echo '<form method="post" name="sMessage" action="maintainersubmit.php">';
-                    echo '<input type="submit" value="Be a Maintainer for This Version" class="button" title="Click here to know more about maintainers.">';
-                    echo "<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">";
-                    echo "<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">";
-                    echo "</form>";
+                    echo '<form method="post" name="sMessage" action="maintainersubmit.php">'."\n";
+                    echo "\t".'<input type="submit" value="Be a Maintainer for This Version" class="button" title="Click here to know more about maintainers.">'."\n";
+                    echo "\t"."<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">\n";
+                    echo "\t"."<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">\n";
+                    echo "</form>\n";
                     $oMonitor = new Monitor();
                     $oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId);
                     if(!$oMonitor->iMonitorId)
                     {
                         echo '<form method="post" name="sMessage" action='.
-                                $this->objectMakeUrl().'&iAppId='.$oApp->iAppId.'>';
-                        echo '<input type=hidden name="sSub" value="StartMonitoring" />';
-                        echo '<input type=submit value="Monitor Changes" class="button" />';
-                        echo "</form>";
+                                $this->objectMakeUrl().'&iAppId='.$oApp->iAppId.'>'."\n";
+                        echo "\t".'<input type=hidden name="sSub" value="StartMonitoring" />'."\n";
+                        echo "\t".'<input type=submit value="Monitor Changes" class="button" />'."\n";
+                        echo "</form>\n";
                     }
                 }
             }
             
         } else
         {
-            echo '<form method="post" name="sMessage" action="account.php">';
-            echo '<input type="hidden" name="sCmd" value="login">';
-            echo '<input type=submit value="Log in to become an app maintainer" class="button">';
-            echo '</form>';
+            echo '<form method="post" name="sMessage" action="account.php">'."\n";
+            echo "\t".'<input type="hidden" name="sCmd" value="login">'."\n";
+            echo "\t".'<input type=submit value="Log in to become an app maintainer" class="button">'."\n";
+            echo '</form>'."\n";
         }
     
         echo "</td></tr>";
 
         if ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($this->iVersionId) || $_SESSION['current']->isSuperMaintainer($this->iAppId))
         {
-            echo '<tr><td colspan="2" align="center">';
-            echo '<form method="post" name="sMessage" action="admin/editAppVersion.php">';
-            echo '<input type="hidden" name="iAppId" value="'.$oApp->iAppId.'" />';
-            echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />';
-            echo '<input type=submit value="Edit Version" class="button" />';
-            echo '</form>';
+            echo '<tr><td colspan="2" align="center">'."\n";
+            echo '<form method="post" name="sMessage" action="admin/editAppVersion.php">'."\n";
+            echo "\t".'<input type="hidden" name="iAppId" value="'.$oApp->iAppId.'" />'."\n";
+            echo "\t".'<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />'."\n";
+            echo "\t".'<input type=submit value="Edit Version" class="button" />'."\n";
+            echo '</form>'."\n";
             $url = BASE."admin/deleteAny.php?sWhat=appVersion&amp;iAppId=".$oApp->iAppId."&amp;iVersionId=".$this->iVersionId."&amp;sConfirmed=yes";
-            echo "<form method=\"post\" name=\"sDelete\" action=\"javascript:deleteURL('Are you sure?', '".$url."')\">";
-            echo '<input type=submit value="Delete Version" class="button" />';
-            echo '</form>';
-            echo '<form method="post" name="message" action="admin/addAppNote.php">';
-            echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />';
-            echo '<input type="submit" value="Add Note" class="button" />';
-            echo '</form>';
-            echo '<form method=post name=message action=admin/addAppNote.php?iVersionId='.$this->iVersionId.'>';
-            echo '<input type=hidden name="sNoteTitle" value="HOWTO" />';
-            echo '<input type=submit value="Add How To" class="button" />';
-            echo '</form>';
-            echo '<form method=post name=message action=admin/addAppNote.php?iVersionId='.$this->iVersionId.'>';
-            echo '<input type=hidden name="sNoteTitle" value="WARNING" />';
-            echo '<input type=submit value="Add Warning" class="button" />';
+            echo "<form method=\"post\" name=\"sDelete\" action=\"javascript:deleteURL('Are you sure?', '".$url."')\">\n";
+            echo "\t".'<input type=submit value="Delete Version" class="button" />'."\n";
+            echo '</form>'."\n";
+            echo '<form method="post" name="message" action="admin/addAppNote.php">'."\n";
+            echo "\t".'<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />'."\n";
+            echo "\t".'<input type="submit" value="Add Note" class="button" />'."\n";
+            echo '</form>'."\n";
+            echo '<form method=post name=message action=admin/addAppNote.php?iVersionId='.$this->iVersionId.'>'."\n";
+            echo "\t".'<input type=hidden name="sNoteTitle" value="HOWTO" />'."\n";
+            echo "\t".'<input type=submit value="Add How To" class="button" />'."\n";
+            echo '</form>'."\n";
+            echo '<form method=post name=message action=admin/addAppNote.php?iVersionId='.$this->iVersionId.'>'."\n";
+            echo "\t".'<input type=hidden name="sNoteTitle" value="WARNING" />'."\n";
+            echo "\t".'<input type=submit value="Add Warning" class="button" />'."\n";
             echo '</form>';
             echo "</td></tr>";
         }
@@ -848,24 +848,47 @@ class Version {
         $oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId);
         if($oMonitor->iMonitorId)
         {
-            echo '<tr><td colspan="2" align="center">';
-            echo '</form>';
+            echo '<tr><td colspan="2" align="center">'."\n";
+            echo '</form>'."\n";
             echo '<form method="post" name="sMessage" action='.
-                    $this->objectMakeUrl().'>';
-            echo '<input type=hidden name="sSub" value="StopMonitoring" />';
-            echo '<input type=submit value="Stop Monitoring Version" class="button" />';
-            echo '</form>';
-            echo "</td></tr>";
+                    $this->objectMakeUrl().'>'."\n";
+            echo '<input type=hidden name="sSub" value="StopMonitoring" />."\n"';
+            echo '<input type=submit value="Stop Monitoring Version" class="button" />'."\n";
+            echo "</form>\n";
+            echo "</td></tr>\n";
         } 
-        echo "</table><td class=color2 valign=top width='100%'>\n";
+        echo "</table>\n";
 
-        // description
-        echo "<table width='100%' border=0><tr><td width='100%' valign=top> <b>Description</b><br />\n";
-        echo $this->sDescription;
+        // start of the right hand pane in the version display
+        echo "<td class=color2 valign=top width='100%'>\n";
+        echo "<div class='version_info_pane'>\n";
+
+        /////////////////////////
+        // output the description
+        echo "<div class='info_container'>\n";
+
+        // output the description title
+        echo "\t<div class='title_class'>\n";
+        echo "\t\tDescription\n";
+        echo "\t</div>\n";
+
+        // output the description
+        echo "\t<div class='info_contents'>\n";
+        echo "\t\t".$this->sDescription."\n";
+        echo "\t</div>\n";
+
+        echo "</div>\n"; // end the 'info_container' div
+        // end description
+        /////////////////////////
 
 
+        //////////////////////
         // Show test data
+        echo "<div class='info_container'>\n";
 
+        echo "\t<div class='title_class'>\n";
+        echo "\t\tSelected test results <small><small>(selected in 'Test Results' table below)</small></small>\n";
+        echo "\t</div>\n";
         $oTest = new testData($iTestingId);
 
         /* if $iTestingId wasn't valid then it won't be valid in $oTest */
@@ -876,7 +899,17 @@ class Version {
             $oTest = new testData($iTestingId);
         }
 
+        echo "<div class='info_contents'>\n";
         $oTest->ShowTestResult();
+        echo "</div>\n";
+
+        echo "</div>\n"; // end the 'info_container' div
+        // end show test data
+        /////////////////////
+
+
+        //////////////////////////////
+        // show the test results table
         if($oTest->iTestingId)
         {
             $oTest->ShowVersionsTestingTable($_SERVER['PHP_SELF']."?iVersionId=".$this->iVersionId."&iTestingId=",
@@ -886,20 +919,23 @@ class Version {
         {
             echo '<form method=post name=sMessage action=objectManager.php?'.
                     'sClass=testData_queue&sAction=add&iVersionId='.$this->iVersionId.
-                    '&sTitle=Add+Test+Data>';
-            echo '<input type=submit value="Add Test Data" class="button" />';
-            echo '</form>';
+                    '&sTitle=Add+Test+Data>'."\n";
+            echo "\t".'<input type=submit value="Add Test Data" class="button" />'."\n";
+            echo '</form>'."\n";
         } else
         {
-            echo '<form method="post" name="sMessage" action="account.php">';
-            echo '<input type="hidden" name="sCmd" value="login">';
-            echo '<input type=submit value="Log in add Test Data" class="button">';
-            echo '</form>';
+            echo '<form method="post" name="sMessage" action="account.php">'."\n";
+            echo "\t".'<input type="hidden" name="sCmd" value="login">'."\n";
+            echo "\t".'<input type=submit value="Log in add Test Data" class="button">'."\n";
+            echo '</form>'."\n";
         }
-        echo "</td></tr>";
-    
-        /* close the table */
-        echo "</table>\n";
+
+        // end show test results table
+        /////////////////////////////
+
+
+        echo "</div>\n"; // end the version info pane, the right hand pane in the
+                         // version display
 
         echo html_frame_end();