From 68788d58fa6c031a8d85d50d8fe0f36e16b982f6 Mon Sep 17 00:00:00 2001
From: "psychoticwolf%carolina.rr.com"
 <psychoticwolf%carolina.rr.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 18 Dec 2004 07:48:29 +0000
Subject: [PATCH] Bug 275030, throw warning when queue skips item because of
 missing data. Make tooltips discoverable.

git-svn-id: svn://10.0.0.236/trunk@166849 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/update/css/base/content.css  |  1 +
 .../webtools/update/css/cavendish/content.css |  5 ++++
 .../webtools/update/developers/approval.php   | 30 ++++++++++++-------
 .../update/developers/inc_sidebar.php         |  2 +-
 mozilla/webtools/update/developers/main.php   |  2 +-
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/mozilla/webtools/update/css/base/content.css b/mozilla/webtools/update/css/base/content.css
index cff8af9c569..8a403a80bb8 100755
--- a/mozilla/webtools/update/css/base/content.css
+++ b/mozilla/webtools/update/css/base/content.css
@@ -17,6 +17,7 @@ a:hover { color: #333; }
 a:active { color: #000; }
 
 #header a:visited { color: #039; }
+#header a:hover { color: #333; }
 
 #mBody li { padding-bottom: 0.5em; }
 
diff --git a/mozilla/webtools/update/css/cavendish/content.css b/mozilla/webtools/update/css/cavendish/content.css
index 5182e90ee3a..f0700ad776a 100755
--- a/mozilla/webtools/update/css/cavendish/content.css
+++ b/mozilla/webtools/update/css/cavendish/content.css
@@ -194,4 +194,9 @@
     padding-left: 10px;
     font-size: 8pt;
     color: #333;
+}
+
+.tooltip {
+    cursor: help;
+    border-bottom: 1px dotted;
 }
\ No newline at end of file
diff --git a/mozilla/webtools/update/developers/approval.php b/mozilla/webtools/update/developers/approval.php
index 0ac6d66dca1..1b0fa390b7a 100755
--- a/mozilla/webtools/update/developers/approval.php
+++ b/mozilla/webtools/update/developers/approval.php
@@ -63,10 +63,14 @@ if ($type=="T") {
     if ($approval=="YES") {
         if ($installation=="YES" and $uninstallation=="YES" and $appworks=="YES" and $cleanprofile=="YES" and $visualerrors=="YES" and $allelementsthemed=="YES" and $testos and $testbuild) {
             $approval_result = process_approval($type, $file, "approve");
+        } else {
+            echo"Error: Approval cannot be processed because of missing data. Fill in the required fields and try again.<br>\n";
         }
     } else {
         if ($testos and $testbuild and $comments) {
             $approval_result = process_approval($type, $file, "deny");
+        } else {
+            echo"Error: Denial cannot be processed because of missing data. Fill in the required fields and try again.<br>\n";
         }
 
     }
@@ -75,10 +79,14 @@ if ($type=="T") {
     if ($approval=="YES") {
         if ($installation=="YES" and $uninstallation=="YES" and $appworks=="YES" and $cleanprofile=="YES" and $newchrome=="YES" and $worksasdescribed=="YES" and $testos and $testbuild) {
             $approval_result = process_approval($type, $file, "approve");
+        } else {
+            echo"Error: Approval cannot be processed because of missing data. Fill in the required fields and try again.<br>\n";
         }
     } else {
         if ($testos and $testbuild and $comments) {
             $approval_result = process_approval($type, $file, "deny");    
+        } else {
+            echo"Error: Denial cannot be processed because of missing data. Fill in the required fields and try again.<br>\n";
         }
     }
 }
@@ -175,21 +183,21 @@ WHERE `approved` = '?' GROUP BY TV.URI ORDER BY TV.DateUpdated ASC";
   echo"<input name=\"file_$i\" type=\"hidden\" value=\"$uri\">\n";
   echo"<input name=\"name_$i\" type=\"hidden\" value=\"$row[Name]\">\n";
   echo"<input name=\"version_$i\" type=\"hidden\" value=\"$row[Version]\">\n";
-  echo"OSes: <input name=\"testos_$i\" type=\"text\" size=10 title=\"What OS(es) did you test in? Windows, Linux, MacOSX, etc\">\n";
-  echo"Apps: <input name=\"testbuild_$i\" type=\"text\" size=10 title=\"What app(s) version(s)/buildid(s)? (Ex. Firefox 1.0RC1 or 0.10+ 20041010)\">\n";
-  echo"Comments: <input name=\"comments_$i\" type=\"text\" size=\"35\" title=\"Comments to Author (Will Be E-Mailed w/ Notice of your Action)\">"; 
+  echo"<span class=\"tooltip\" title=\"What OS(es) did you test in? Windows, Linux, MacOSX, etc\">OSes:</span> <input name=\"testos_$i\" type=\"text\" size=10>\n";
+  echo"<span class=\"tooltip\" title=\"What app(s) version(s)/build(s)? (Ex. Firefox 1.0RC1 or 0.10+ 20041010)\">Apps:</span> <input name=\"testbuild_$i\" type=\"text\" size=10>\n";
+  echo"<span class=\"tooltip\" title=\"Comments to Author (Will Be E-Mailed w/ Notice of your Action)\">Comments (to author):</span> <input name=\"comments_$i\" type=\"text\" size=\"35\">"; 
   echo"</TD></TR>\n";
   echo"<TR><TD COLSPAN=4 style=\"font-size: 8pt\">\n";
-  echo"<input name=\"installation_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"Installs OK?\">Install?\n";
-  echo"<input name=\"uninstallation_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"Uninstalls OK?\">Uninstall?\n";
-  echo"<input name=\"appworks_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"App Works OK? (Loading pages/messages, Tabs, Back/Forward)\">App Works? \n";
-  echo"<input name=\"cleanprofile_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"Using a Clean Profile? (I.E. No Major Extensions Installed, like TBE)\">Clean Profile?\n";
+  echo"<input name=\"installation_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"Installs OK?\">Install?</span>\n";
+  echo"<input name=\"uninstallation_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"Uninstalls OK?\">Uninstall?</span>\n";
+  echo"<input name=\"appworks_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"App Works OK? (Loading pages/messages, Tabs, Back/Forward)\">App Works? </span>\n";
+  echo"<input name=\"cleanprofile_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"Using a Clean Profile? (I.E. Works with No Major Extensions Installed, like TBE)\">Clean Profile?</span>\n";
 if ($type=="E") {
-  echo"<input name=\"newchrome_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"Extension Added Chrome to the UI?\">New Chrome?\n";
-  echo"<input name=\"worksasdescribed_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"Item Works as AuthorDescribes\">Works?\n";
+  echo"<input name=\"newchrome_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"Extension Added Chrome to the UI?\">New Chrome?</span>\n";
+  echo"<input name=\"worksasdescribed_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"Item Works as Author Describes\">Works?</span>\n";
 } else if ($type=="T") {
-  echo"<input name=\"visualerrors_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"No Visual Errors / Rendering Problems\">Visual Errors?\n";
-  echo"<input name=\"allelementsthemed_$i\" type=\"checkbox\" value=\"YES\" TITLE=\"All Components Themed? (Including No Missing Icons?)\">Theme Complete?\n";
+  echo"<input name=\"visualerrors_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"No Visual Errors / Rendering Problems\">Visual Errors?</span>\n";
+  echo"<input name=\"allelementsthemed_$i\" type=\"checkbox\" value=\"YES\"><span class=\"tooltip\" TITLE=\"All Components Themed? (Including No Missing Icons?)\">Theme Complete?</span>\n";
 }
   echo"</TD></TR>\n";
 
diff --git a/mozilla/webtools/update/developers/inc_sidebar.php b/mozilla/webtools/update/developers/inc_sidebar.php
index 602c8eb48d7..0d19b97928e 100755
--- a/mozilla/webtools/update/developers/inc_sidebar.php
+++ b/mozilla/webtools/update/developers/inc_sidebar.php
@@ -1,5 +1,5 @@
 <?php
-if (($_SESSION["level"] == "admin" or $_SESSION["level"] == "moderator") and $skipqueue != "true") {
+if (($_SESSION["level"] == "admin" or $_SESSION["level"] == "editor") and $skipqueue != "true") {
     $sql ="SELECT TM.ID FROM `main` TM
         INNER JOIN `version` TV ON TM.ID = TV.ID
         WHERE `approved` = '?' GROUP BY `URI` ORDER BY TV.DateUpdated ASC";
diff --git a/mozilla/webtools/update/developers/main.php b/mozilla/webtools/update/developers/main.php
index 1a8aa5cd787..f87fac735d4 100755
--- a/mozilla/webtools/update/developers/main.php
+++ b/mozilla/webtools/update/developers/main.php
@@ -14,7 +14,7 @@ include"inc_sidebar.php";
 
 
 <?php
-if ($_SESSION["level"] == "admin" or $_SESSION["level"] == "moderator") {
+if ($_SESSION["level"] == "admin" or $_SESSION["level"] == "editor") {
 
 $sql ="SELECT TM.ID FROM `main` TM
 INNER JOIN `version` TV ON TM.ID = TV.ID