\n";
+ $oTableCell = new TableCell("".
+ "$sName");
+
+ $oHighlightColor = new Color(0xe0, 0xe6, 0xff);
+ $oInactiveColor = new Color(0xff, 0xff, 0xff);
+ $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor);
+
+ $oTableRowClick = new TableRowClick($shUrl);
+ $oTableRowClick->SetHighlight($oTableRowHighlight);
+
+ $oTableRow->SetRowClick($oTableRowClick);
} else
{
- echo "
$sName
\n";
+ $oTableCell = new TableCell(" $sName");
}
+ $oTableCell->SetAlign($sAlign);
+ $oTableCell->SetWidth("100%");
+
+ $oTableRow->SetClass("sidemenu");
+ $oTableRow->AddCell($oTableCell);
+
+ echo $oTableRow->GetString();
}
function addmisc($sStuff, $sAlign = "left")
diff --git a/include/objectManager.php b/include/objectManager.php
index a121be2..3516e24 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -23,7 +23,7 @@ class ObjectManager
$this->sTitle = $sTitle;
$this->iId = $iId;
$this->oMultiPage = new MultiPage(FALSE);
- $this->oTableRow = new TableRow(null);
+ $this->oTableRow = new OMTableRow(null);
// initialize the common responses array
$this->aCommonResponses = array();
@@ -104,10 +104,14 @@ class ObjectManager
/* if we are requesting a list of its queued objects or */
/* all of its objects */
if($this->oMultiPage->bEnabled)
+ {
$hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected,
- $this->oMultiPage->iItemsPerPage, $this->oMultiPage->iLowerLimit);
- else
+ $this->oMultiPage->iItemsPerPage,
+ $this->oMultiPage->iLowerLimit);
+ } else
+ {
$hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected);
+ }
/* did we get any entries? */
if(!$hResult || mysql_num_rows($hResult) == 0)
@@ -144,8 +148,21 @@ class ObjectManager
$this->oTableRow = $oObject->objectGetTableRow();
- if(!$this->oTableRow->sStyle)
- $this->oTableRow->sStyle = ($iCount % 2) ? "color0" : "color1";
+ $sColor = ($iCount % 2) ? "color0" : "color1";
+
+ //TODO: we shouldn't access this method directly, should make an accessor for it
+ if(!$this->oTableRow->oTableRow->sClass)
+ {
+ $this->oTableRow->oTableRow->sClass = $sColor;
+ }
+
+ // if this row is clickable, make it highlight appropirately
+ $oTableRowClick = $this->oTableRow->oTableRow->oTableRowClick;
+ if($oTableRowClick)
+ {
+ $oTableRowHighlight = GetStandardRowHighlight($iCount);
+ $oTableRowClick->SetHighlight($oTableRowHighlight);
+ }
$sEditLinkLabel = $this->bIsQueue ? "process" : "edit";
@@ -155,15 +172,16 @@ class ObjectManager
$shDeleteLink = "";
if($this->oTableRow->bHasDeleteLink)
{
- $shDeleteLink = ' [ objectGetid()).
- '">delete ]';
+ $shDeleteLink = ' [ objectGetid()).
+ '">delete ]';
}
- $this->oTableRow->aCells[] = '[ objectGetId()).'">'.$sEditLinkLabel.' ]'.$shDeleteLink;
+ $oTableCell = new TableCell('[ objectGetId()).'">'.$sEditLinkLabel.' ]'.$shDeleteLink);
+ $this->oTableRow->AddCell($oTableCell);
}
- echo html_tr($this->oTableRow->aCells, $this->oTableRow->sStyle);
+ echo $this->oTableRow->GetString();
}
echo "";
@@ -770,41 +788,4 @@ class MultiPage
}
}
-class TableRow
-{
- var $aCells; // array that contains the columns for a table row
- var $sStyle; // CSS style to be used
- var $bHasDeleteLink;
- var $aRowClickable; //FIXME: we should describe the entries required here by creating a class for a clickable row entry or something
- var $bCanEdit;
-
- function TableRow($aCells)
- {
- if(!$aCells)
- return;
-
- $this->aCells = $aCells;
-
- // initialize the rest of the variables
- $this->sStyle = null;
- $this->bHasDeleteLink = false;
- $this->aRowClickable = null;
- }
-
- function SetStyle($sStyle)
- {
- $this->sStyle = $sStyle;
- }
-
- function SetRowHasDeleteLink($bHasDeleteLink)
- {
- $this->bHasDeleteLink = $bHasDeleteLink;
- }
-
- function SetRowClickable($aRowClickableInfo)
- {
- $this->aRowClickable = $aRowClickableInfo;
- }
-}
-
?>
diff --git a/include/table.php b/include/table.php
new file mode 100644
index 0000000..34dbb5d
--- /dev/null
+++ b/include/table.php
@@ -0,0 +1,456 @@
+oHighlightColor = $oHighlightColor;
+ $this->oInactiveColor = $oInactiveColor;
+
+ $this->sTextDecorationHighlight = $sTextDecorationHighlight;
+ $this->sTextDecorationInactive = $sTextDecorationInactive;
+ }
+}
+
+class TableRowClick
+{
+ var $oTableRowHighlight;
+ var $bHasHighlight;
+ var $shUrl;
+
+ function TableRowClick($shUrl)
+ {
+ $this->shUrl = $shUrl;
+ $this->bHasHighlight = false;
+ $this->oTableRowHighlight = null;
+ }
+
+ //TODO: php5, type hint to TableRowHighlight class
+ function SetHighlight($oTableRowHighlight)
+ {
+ $this->oTableRowHighlight = $oTableRowHighlight;
+ }
+
+ function GetString()
+ {
+ $sStr = "";
+
+ // if we have highlighting output the attributes necessary to enable the javascript tht we use
+ // to perform the highlighting actions
+ if($this->oTableRowHighlight)
+ {
+ $sStr.= 'onmouseover="ChangeTr(this, true,'.
+ '\''.$this->oTableRowHighlight->oHighlightColor->GetHexString().'\','.
+ '\''.$this->oTableRowHighlight->oInactiveColor->GetHexString().'\','.
+ '\''.$this->oTableRowHighlight->sTextDecorationHighlight.'\','.
+ '\''.$this->oTableRowHighlight->sTextDecorationInactive.'\');"';
+ $sStr.= ' onmouseout="ChangeTr(this, false,'.
+ '\''.$this->oTableRowHighlight->oHighlightColor->GetHexString().'\','.
+ '\''.$this->oTableRowHighlight->oInactiveColor->GetHexString().'\','.
+ '\''.$this->oTableRowHighlight->sTextDecorationHighlight.'\','.
+ '\''.$this->oTableRowHighlight->sTextDecorationInactive.'\');"';
+ }
+
+ $sStr.= ' onclick="DoNav(\''.$this->shUrl.'\');"';
+
+ return $sStr;
+ }
+}
+
+class TableCell
+{
+ //TODO: make these private when we move to php5
+ var $sCell;
+ var $sStyle;
+ var $sClass;
+ var $sAlign; // align="$sAlign" will be output if this is not null
+ var $sValign; // valign="$sValign" will be output if this is not null
+ var $sWidth; // width="$sWidth"
+ var $sUrl; // wraps the cell contents in an anchor tag if $sUrl is not null
+ var $bBold; // if true will output the cell contents as bold
+
+ // NOTE: We specifically have limited the parameters to the constructor
+ // to only the contents of the cell. Additional parameters, while
+ // appearing convienent, make the parameters confusing
+ // Use accessors to set additional parameters.
+ function TableCell($sCellContents)
+ {
+ $this->sCellContents = $sCellContents;
+ $this->sStyle = null;
+ $this->sClass = null;
+ $this->sAlign = null;
+ $this->sValign = null;
+ $this->sWidth = null;
+ $this->bBold = false;
+ }
+
+ function SetCellContents($sCellContents)
+ {
+ $this->sCellContents = $sCellContents;
+ }
+
+ function SetStyle($sStyle)
+ {
+ $this->sStyle = $sStyle;
+ }
+
+ function SetClass($sClass)
+ {
+ $this->sClass = $sClass;
+ }
+
+ function SetAlign($sAlign)
+ {
+ $this->sAlign = $sAlign;
+ }
+
+ function SetValign($sValign)
+ {
+ $this->sValign = $sValign;
+ }
+
+ function SetWidth($sWidth)
+ {
+ $this->sWidth = $sWidth;
+ }
+
+ function SetCellLink($sUrl)
+ {
+ $this->sUrl = $sUrl;
+ }
+
+ //php5 make sure this type is boolean
+ function SetBold($bBold)
+ {
+ $this->bBold = $bBold;
+ }
+
+ function GetString()
+ {
+ $sStr = "sClass)
+ $sStr.=" class=\"".$this->sClass."\";";
+
+ if($this->sStyle)
+ $sStr.=" style=\"".$this->sStyle."\";";
+
+ if($this->sAlign)
+ $sStr.=" align=\"".$this->sAlign."\";";
+
+ if($this->sValign)
+ $sStr.=" valign=\"".$this->sValign."\";";
+
+ if($this->sWidth)
+ $sStr.=" width=\"".$this->sWidth."\";";
+
+ $sStr.=">";
+
+ // if we have a url, output the start of the anchor tag
+ if($this->sUrl)
+ $sStr.='';
+
+ if($this->bBold)
+ $sStr.='';
+
+ // output the contents of the cell
+ $sStr.=$this->sCellContents;
+
+ if($this->bBold)
+ $sStr.='';
+
+ // if we have a url, close the anchor tag
+ if($this->sUrl)
+ $sStr.='';
+
+ $sStr.="";
+
+ return $sStr;
+ }
+}
+
+class TableRow
+{
+ //TODO: make these private when we get php5
+ var $aTableCells; // array that contains the cells for the table row
+ var $sStyle; // CSS style to be used
+ var $sClass; // CSS class to be used
+ var $sExtra; // extra things to put into the table row
+
+ var $oTableRowClick; // information about whether the table row is clickable etc
+
+ function TableRow()
+ {
+ $this->aTableCells = array();
+ $this->sStyle = null;
+ $this->sClass = null;
+ $this->oTableRowClick = null;
+ }
+
+ // TODO: php5 need to add type hinting here to make sure this is a TableCell instance
+ function AddCell($oTableCell)
+ {
+ $this->aTableCells[] = $oTableCell;
+ }
+
+ function AddCells($aTableCells)
+ {
+ foreach($aTableCells as $oTableCell)
+ {
+ $this->AddCell($oTableCell);
+ }
+ }
+
+ // TODO: php5 type hint as text
+ function AddTextCell($sCellText)
+ {
+ $this->AddCell(new TableCell($sCellText));
+ }
+
+ function SetStyle($sStyle)
+ {
+ $this->sStyle = $sStyle;
+ }
+
+ function SetClass($sClass)
+ {
+ $this->sClass = $sClass;
+ }
+
+ function SetRowClick($oTableRowClick)
+ {
+ $this->oTableRowClick = $oTableRowClick;
+ }
+
+ // get a string that contains the html representation
+ // of this table row
+ function GetString()
+ {
+ // generate the opening of the tr element
+ $sStr = "sClass)
+ $sStr.= " class=\"$this->sClass\"";
+
+ if($this->sStyle)
+ $sStr.= " style=\"$this->sStyle\"";
+
+ if($this->sExtra)
+ $sStr.= " $this->sExtra";
+
+ if($this->oTableRowClick)
+ $sStr.= " ".$this->oTableRowClick->GetString();
+
+ $sStr.= ">"; // close the opening tr
+
+ // process the td elements
+ foreach($this->aTableCells as $oTableCell)
+ {
+ $sStr.=$oTableCell->GetString();
+ }
+
+ // close the table row
+ $sStr.= "";
+
+ return $sStr;
+ }
+}
+
+// object manager table row, has additional parameters used by the object manager
+// when outputting a table row
+//TODO: php5 consider inheriting from HtmlTableRow since this class is really an
+// extension of that class
+class OMTableRow
+{
+ var $oTableRow;
+ var $bHasDeleteLink;
+ var $bCanEdit;
+
+ function OMTableRow($oTableRow)
+ {
+ $this->oTableRow = $oTableRow;
+ $this->bHasDeleteLink = false;
+ $this->bCanEdit = false;
+ }
+
+ // php5 hint that type is bool
+ function SetRowHasDeleteLink($bHasDeleteLink)
+ {
+ $this->bHasDeleteLink = $bHasDeleteLink;
+ }
+
+ // php5 hint type here
+ function SetRowClickable($oTableRowClick)
+ {
+ $this->oTableRowClick = $oTableRowClick;
+ }
+
+ function SetStyle($sStyle)
+ {
+ $this->oTableRow->SetStyle($sStyle);
+ }
+
+ // add a TableCell to an existing row
+ function AddCell($oTableCell)
+ {
+ $this->oTableRow->AddCell($oTableCell);
+ }
+
+ function GetString()
+ {
+ return $this->oTableRow->GetString();
+ }
+}
+
+class Table
+{
+ //TODO: make private when we have php5
+ var $oTableRowHeader;
+ var $aTableRows;
+ var $sClass;
+ var $sWidth;
+ var $iBorder;
+ var $sAlign; // align="$sAlign" - deprecated in html standards
+ var $iCellSpacing; // cellspacing="$iCellSpacing"
+ var $iCellPadding; // cellpadding="$iCellPadding"
+
+ function Table()
+ {
+ $this->oTableRowHeader = null;
+ $this->aTableRows = array();
+ $this->sClass = null;
+ $this->sWidth = null;
+ $this->iBorder = null;
+ $this->sAlign = null;
+ $this->iCellSpacing = null;
+ $this->iCellPadding = null;
+ }
+
+ function AddRow($oTableRow)
+ {
+ $this->aTableRows[] = $oTableRow;
+ }
+
+ // TODO: php5 force type to HtmlTableRow
+ function SetHeader($oTableRowHeader)
+ {
+ $this->oTableRowHeader = $oTableRowHeader;
+ }
+
+ function SetClass($sClass)
+ {
+ $this->sClass = $sClass;
+ }
+
+ function SetWidth($sWidth)
+ {
+ $this->sWidth = $sWidth;
+ }
+
+ function SetBorder($iBorder)
+ {
+ $this->iBorder = $iBorder;
+ }
+
+ function SetAlign($sAlign)
+ {
+ $this->sAlign = $sAlign;
+ }
+
+ function SetCellSpacing($iCellSpacing)
+ {
+ $this->iCellSpacing = $iCellSpacing;
+ }
+
+ function SetCellPadding($iCellPadding)
+ {
+ $this->iCellPadding = $iCellPadding;
+ }
+
+ function GetString()
+ {
+ $sStr = "sClass)
+ $sStr.= ' class="'.$this->sClass.'"';
+
+ if($this->sWidth)
+ $sStr.= ' width="'.$this->sWidth.'"';
+
+ if($this->iBorder)
+ $sStr.= ' border="'.$this->iBorder.'"';
+
+ if($this->sAlign)
+ $sStr.= ' align="'.$this->sAlign.'"';
+
+ if($this->iCellSpacing)
+ $sStr.= ' cellspacing="'.$this->iCellSpacing.'"';
+
+ if($this->iCellPadding)
+ $sStr.= ' cellpadding="'.$this->iCellPadding.'"';
+
+ $sStr.= ">"; // close the open table element
+
+ if($this->oTableRowHeader)
+ {
+ $sStr.="";
+ $sStr.= $this->oTableRowHeader->GetString();
+ $sStr.="";
+ }
+
+ foreach($this->aTableRows as $oTableRow)
+ {
+ $sStr.= $oTableRow->GetString();
+ }
+
+ $sStr.= "";
+
+ return $sStr;
+ }
+}
+
+// input is the row index, we alternate colors based on odd or even index rows
+// returns a TableRowHighlight instance
+function GetStandardRowHighlight($iRowIndex)
+{
+ //set row color
+ $sColor = ($iRowIndex % 2) ? "color0" : "color1";
+
+ $oInactiveColor = new color();
+ $oInactiveColor->SetColorByName($sColor);
+
+ $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor);
+
+ $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor);
+
+ return $oTableRowHighlight;
+}
+
+// TODO: php5 type hint this to color class
+// returns a color class instance
+function GetHighlightColorFromInactiveColor($oInactiveColor)
+{
+ $oHighlightColor = new color($oInactiveColor->iRed,
+ $oInactiveColor->iGreen,
+ $oInactiveColor->iBlue);
+ $oHighlightColor->Add(50);
+
+ return $oHighlightColor;
+}
+
+?>
diff --git a/include/tableve.php b/include/tableve.php
index ecd6353..3c46fb6 100644
--- a/include/tableve.php
+++ b/include/tableve.php
@@ -171,8 +171,11 @@ class TableVE {
echo html_frame_end();
}
+ // returns a string that contains the option list
function make_option_list($sVarname, $sCvalue, $sTable, $sIdField, $sNameField, $aWhere = null)
{
+ $sStr = "";
+
/* We do not allow direct insertion into of SQL code, so the WHERE clause is
is accepted in an array form, where the first element is the variable
and the second is the value it must be equal to */
@@ -182,20 +185,22 @@ class TableVE {
$hResult = query_parameters("SELECT ?, ? FROM ? $sWhere ORDER BY '?'",
$sIdField, $sNameField, $sTable, $sNameField);
if(!$hResult)
- return; // Oops
+ return $sStr; // Oops
- echo "\n";
+
+ return $sStr;
}
@@ -212,25 +217,25 @@ class TableVE {
if($field->name == "appId" && $field->table != "appFamily")
{
- $this->make_option_list($varname, $value, "appFamily", "appId", "appName");
+ echo $this->make_option_list($varname, $value, "appFamily", "appId", "appName");
return;
}
if($field->name == "vendorId" && $field->table != "vendor")
{
- $this->make_option_list($varname, $value, "vendor", "vendorId", "vendorName");
+ echo $this->make_option_list($varname, $value, "vendor", "vendorId", "vendorName");
return;
}
if($field->name == "catId" && $field->table != "appCategory")
{
- $this->make_option_list($varname, $value, "appCategory", "catId", "catName");
+ echo $this->make_option_list($varname, $value, "appCategory", "catId", "catName");
return;
}
if($field->name == "catParent")
{
- $this->make_option_list($varname, $value, "appCategory", "catId", "catName");
+ echo $this->make_option_list($varname, $value, "appCategory", "catId", "catName");
return;
}
diff --git a/include/testData.php b/include/testData.php
index 1d021b2..3b9b8bf 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -436,7 +436,7 @@ class testData{
}
// Show the Test results for a application version
- function ShowVersionsTestingTable($link, $iDisplayLimit)
+ function ShowVersionsTestingTable($sLink, $iDisplayLimit)
{
global $aClean;
@@ -467,18 +467,27 @@ class testData{
echo '
',"\n";
echo '
Test Results
',"\n";
echo '
',"\n";
- echo '
',"\n";
- echo '',"\n";
- echo '
',"\n";
- echo '
',"\n";
- echo '
Distribution
',"\n";
- echo '
Test date
',"\n";
- echo '
Wine version
',"\n";
- echo '
Installs?
',"\n";
- echo '
Runs?
',"\n";
- echo '
Rating
',"\n";
- echo '
Submitter
',"\n";
- echo '
',"\n";
+
+ // create the table
+ $oTable = new Table();
+ $oTable->SetClass("historyTable");
+ $oTable->SetBorder(1);
+ $oTable->SetWidth("100%");
+
+ // setup the table header
+ $oTableRowHeader = new TableRow();
+ $oTableRowHeader->SetClass("historyHeader");
+ $oTableRowHeader->AddTextCell("");
+ $oTableRowHeader->AddTextCell("Distribution");
+ $oTableRowHeader->AddTextCell("Test date");
+ $oTableRowHeader->AddTextCell("Wine version");
+ $oTableRowHeader->AddTextCell("Installs?");
+ $oTableRowHeader->AddTextCell("Runs?");
+ $oTableRowHeader->AddTextCell("Rating");
+ $oTableRowHeader->AddTextCell("Submitter");
+ $oTable->SetHeader($oTableRowHeader);
+
+ $iIndex = 0;
while($oRow = mysql_fetch_object($hResult))
{
$oTest = new testData($oRow->testingId);
@@ -488,46 +497,73 @@ class testData{
$oDistribution = new distribution($oTest->iDistributionId);
$bgcolor = $oTest->sTestedRating;
+ // initialize the array ech time we loop
+ $oTableRowClick = null;
+
+ $oTableRow = new TableRow();
+
/* if the test we are displaying is this test then */
/* mark it as the current test */
if ($oTest->iTestingId == $this->iTestingId)
{
- echo '
',"\n";
- echo '
Current
',"\n";
+ $sTRClass = $bgcolor;
+
+ $oTableCell = new TableCell("Current");
+ $oTableCell->SetAlign("center");
} 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 '
',"\n";
- else
- echo '">Show]',"\n";
+ $oInactiveColor = new color();
+ $oInactiveColor->SetColorByName($oTest->sTestedRating);
+
+ $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor);
+
+ $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor);
+
+ $sUrl = $sLink.$oTest->iTestingId;
+
+ $oTableRowClick = new TableRowClick($sUrl);
+ $oTableRowClick->SetHighlight($oTableRowHighlight);
+
+ // add the table element indicating that the user can show the row by clicking on it
+ $oTableCell = new TableCell("Show");
+ $oTableCell->SetCellLink($sUrl);
+ $oTableCell->SetAlign("center");
}
- echo '
',"\n";
+
+ // if this is a clickable row, set the appropriate property
+ if($oTableRowClick)
+ $oTableRow->SetRowClick($oTableRowClick);
+
+ // add the row to the table
+ $oTable->AddRow($oTableRow);
+
+ $iIndex++;
}
- echo '
',"\n";
+ echo $oTable->GetString();
echo ' ',"\n"; // put a space after the test results table and the button
@@ -973,20 +1009,21 @@ class testData{
$hMaintainers = maintainer::getMaintainersForAppIdVersionId(null, $this->iVersionId);
$bHasMaintainer = (mysql_num_rows($hMaintainers) == 0) ? false : true;
- $aCells = array(
- print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)),
- $oUser->objectMakeLink(),
- $oApp->objectMakeLink(),
- $oVersion->objectMakeLink(),
- $this->sTestedRelease,
- ($bHasMaintainer ? "YES" : "no"),
- $this->sTestedRating);
+ $oTableRow = new TableRow();
+ $oTableRow->AddCell(new TableCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))));
+ $oTableRow->AddCell(new TableCell($oUser->objectMakeLink()));
+ $oTableRow->AddCell(new TableCell($oApp->objectMakeLink()));
+ $oTableRow->AddCell(new TableCell($oVersion->objectMakeLink()));
+ $oTableRow->AddCell(new TableCell($this->sTestedRelease));
+ $oTableRow->AddCell(new TableCell($bHasMaintainer ? "YES" : "no"));
+ $oTableRow->AddCell(new TableCell($this->sTestedRating));
- $oTableRow = new TableRow($aCells);
$oTableRow->SetStyle($this->sTestedRating);
- $oTableRow->SetRowHasDeleteLink(true);
- return $oTableRow;
+ $oOMTableRow = new OMTableRow($oTableRow);
+ $oOMTableRow->SetRowHasDeleteLink(true);
+
+ return $oOMTableRow;
}
function canEdit()
diff --git a/include/util.php b/include/util.php
index 001de61..9f3fc82 100644
--- a/include/util.php
+++ b/include/util.php
@@ -157,8 +157,11 @@ function get_xml_tag ($file, $mode = null)
// $sVarname - name of the selection array that this function will output
// this is the name to use to retrieve the selection on the form postback
// $sSelectedValue - the currently selected entry
+// returns a string that contains the version list output
function make_bugzilla_version_list($sVarname, $sSelectedValue)
{
+ $sStr = "";
+
$sTable = BUGZILLA_DB.".versions";
$sWhere = "WHERE product_id=".BUGZILLA_PRODUCT_ID;
$sQuery = "SELECT value FROM $sTable $sWhere";
@@ -198,18 +201,18 @@ function make_bugzilla_version_list($sVarname, $sSelectedValue)
// build the selection array
- echo "\n";
+
+ return $sStr;
}
function make_maintainer_rating_list($varname, $cvalue)
@@ -280,12 +285,36 @@ function outputTopXRow($oRow)
$oVersion = new Version($oRow->versionId);
$oApp = new Application($oVersion->iAppId);
$img = Screenshot::get_random_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting
- html_tr_highlight_clickable($oVersion->objectMakeUrl(), "white", "#f0f6ff", "white");
- echo '
-
'.version::fullNameLink($oVersion->iVersionId).'
-
'.util_trim_description($oApp->sDescription).'
-
'.$img.'
- ';
+
+ // create the table row
+ $oTableRow = new TableRow();
+ $oTableRow->SetClass("white");
+
+ // create the cells that represent the row
+ $oTableCell = new TableCell(version::fullNameLink($oVersion->iVersionId));
+ $oTableCell->SetClass("app_name");
+ $oTableRow->AddCell($oTableCell);
+ $oTableRow->AddTextCell(util_trim_description($oApp->sDescription));
+ $oTableCell = new TableCell($img);
+ $oTableCell->SetStyle("text-align:center;");
+ $oTableRow->AddCell($oTableCell);
+
+ // create a new TableRowHighlight instance
+ $oHighlightColor = new color(0xf0, 0xf6, 0xff);
+ $oInactiveColor = new color();
+ $oInactiveColor->SetColorByName("White");
+ $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor);
+
+ // create a new TableRowclick
+ $oTableRowClick = new TableRowClick($oVersion->objectMakeUrl());
+ $oTableRowClick->SetHighlight($oTableRowHighlight);
+
+ // set the click property of the html table row
+ $oTableRow->SetRowClick($oTableRowClick);
+
+ // output the entire table row
+ echo $oTableRow->GetString();
+ echo "\n";
}
/* Output the rows for the Top-X tables on the main page */
@@ -950,49 +979,64 @@ class color
$this->iBlue = $iBlue;
}
- function setColorByName($sColorName)
+ function SetColorByName($sColorName)
{
- switch($sColorName)
+ switch(strtolower($sColorName))
{
- case "Platinum":
+ case "platinum":
$this->iRed = 0xEC;
$this->iGreen = 0xEC;
$this->iBlue = 0xEC;
break;
- case "Gold":
+ case "gold":
$this->iRed = 0xFF;
$this->iGreen = 0xF6;
$this->iBlue = 0x00;
break;
- case "Silver":
+ case "silver":
$this->iRed = 0xC0;
$this->iGreen = 0xC0;
$this->iBlue = 0xC0;
break;
- case "Bronze":
+ case "bronze":
$this->iRed = 0xFC;
$this->iGreen = 0xBA;
$this->iBlue = 0x0A;
break;
- case "Garbage":
+ case "garbage":
$this->iRed = 0x99;
$this->iGreen = 0x96;
$this->iBlue = 0x66;
break;
+ case "white":
+ $this->iRed = 0xff;
+ $this->iGreen = 0xff;
+ $this->iBlue = 0xff;
+ break;
+ case "color0":
+ $this->iRed = 0xe0;
+ $this->iGreen = 0xe0;
+ $this->iBlue = 0xe0;
+ break;
+ case "color1":
+ $this->iRed = 0xc0;
+ $this->iGreen = 0xc0;
+ $this->iBlue = 0xc0;
+ break;
default:
break;
}
}
// convert the color value into a html rgb hex string
- function getHexString()
+ function GetHexString()
{
return sprintf("#%02X%02X%02X", $this->iRed, $this->iGreen, $this->iBlue);
}
// add $iAmount to each color value, maxing out at 0xFF, the largest
// color value allowed
- function add($iAmount)
+ function Add($iAmount)
{
if($this->iRed + $iAmount > 0xFF)
$this->iRed = 0xFF;
@@ -1009,6 +1053,6 @@ class color
else
$this->iBlue += $iAmount;
}
-};
+}
?>
diff --git a/include/vendor.php b/include/vendor.php
index 7e37fac..cb07ad6 100644
--- a/include/vendor.php
+++ b/include/vendor.php
@@ -171,22 +171,45 @@ class Vendor {
function outputEditor()
{
- echo "