diff --git a/lib/visualpatterns/PatternBrowsableSearchResults.inc b/lib/visualpatterns/PatternBrowsableSearchResults.inc index db1cffb..6c8e4fc 100644 --- a/lib/visualpatterns/PatternBrowsableSearchResults.inc +++ b/lib/visualpatterns/PatternBrowsableSearchResults.inc @@ -107,7 +107,7 @@ class PatternBrowseableSearchResults { $iDisplayed = 0; //limit the result set displayed while($sql->next_record() && ($iDisplayed < $this->iResultsToDisplay)) { - $sToRender .= "getColour($iColour) . "\">"; + $sToRender .= ""; $iColour++; for ($i = 0; $i < count($this->aColumns); $i++) { @@ -204,10 +204,5 @@ class PatternBrowseableSearchResults { } return 0; } - - function getColour($iColourCount) { - return ($iColourCount%2 == 0) ? "F5F6EE" : "FFFFFF"; - } } - -?> +?> \ No newline at end of file diff --git a/lib/visualpatterns/PatternEditableListFromQuery.inc b/lib/visualpatterns/PatternEditableListFromQuery.inc index 27a6bd8..4cc06d1 100644 --- a/lib/visualpatterns/PatternEditableListFromQuery.inc +++ b/lib/visualpatterns/PatternEditableListFromQuery.inc @@ -124,21 +124,21 @@ class PatternEditableListFromQuery { switch ($this->aDisplayColumnTypes[$i]) { case 1: //plain text field - $sToRender .= "\tgetColour($i) . "\">sUniqueName . "_" . $i . "_value\" value=\"" . stripslashes($sql->f($this->aDisplayColumns[$i])) . "\"\n"; + $sToRender .= "\tsUniqueName . "_" . $i . "_value\" value=\"" . stripslashes($sql->f($this->aDisplayColumns[$i])) . "\"\n"; break; case 2: //boolean value - $sToRender .= "\tgetColour($i) . "\">sUniqueName . "_" . $i . "_value\" value=\"1\" " . ($sql->f($this->aDisplayColumns[$i]) ? " CHECKED " : " ") . "/>\n"; + $sToRender .= "\tsUniqueName . "_" . $i . "_value\" value=\"1\" " . ($sql->f($this->aDisplayColumns[$i]) ? " CHECKED " : " ") . "/>\n"; break; case 3: $oPatternListBox = & new PatternListBox($this->aDropDownListTableNames[$i], "name", "id", $this->sUniqueName . "_" . $i . "_value"); $oPatternListBox->setSelectedValue($sql->f($this->aStoreColumns[$i])); - $sToRender .= "\tgetColour($i) . "\">" . $oPatternListBox->render() . "\t\n"; + $sToRender .= "\t" . $oPatternListBox->render() . "\t\n"; break; case 4: //meta data type $oPattern = & new PatternMetaData($this->aMetaDataFields[$i], $this->sUniqueName . "_" . $i . "_value", $sql->f($this->aStoreColumns[$i])); - $sToRender .= "\tgetColour($i) . "\">" . $oPattern->render() . "\t\n"; + $sToRender .= "\t" . $oPattern->render() . "\t\n"; default: break; } @@ -179,11 +179,5 @@ class PatternEditableListFromQuery { return $sToRender; } - - function getColour($iColourCount) { - return ($iColourCount%2 == 0) ? "F5F6EE" : "FFFFFF"; - } - } - ?> diff --git a/lib/visualpatterns/PatternListFromQuery.inc b/lib/visualpatterns/PatternListFromQuery.inc index b9431d3..1eed971 100644 --- a/lib/visualpatterns/PatternListFromQuery.inc +++ b/lib/visualpatterns/PatternListFromQuery.inc @@ -97,14 +97,14 @@ class PatternListFromQuery { switch ($this->aColumnTypes[$i]) { //plain text field case 1: - $sToRender .= "" . $this->aColumnNames[$i] . "getColour($iColour) ."\">" . stripslashes($sql->f($this->aColumns[$i])) . "\n"; + $sToRender .= "" . $this->aColumnNames[$i] . "" . stripslashes($sql->f($this->aColumns[$i])) . "\n"; break; //text area case 2: - $sToRender .= "" . $this->aColumnNames[$i] . "getColour($iColour) ."\">\n"; + $sToRender .= "" . $this->aColumnNames[$i] . "\n"; break; case 3: - $sToRender .= "" . $this->aColumnNames[$i] . "getColour($iColour) ."\">aHyperLinkURL[$i] . "?" . $this->replaceValues($this->aQueryStringText[$i], $sql) . "\">" . stripslashes($sql->f($this->aColumns[$i])) . "\n"; + $sToRender .= "" . $this->aColumnNames[$i] . "aHyperLinkURL[$i] . "?" . $this->replaceValues($this->aQueryStringText[$i], $sql) . "\">" . stripslashes($sql->f($this->aColumns[$i])) . "\n"; break; default: break; @@ -121,11 +121,5 @@ class PatternListFromQuery { function replaceValues($sQueryStringText, $sql) { return $sQueryStringText; } - - function getColour($iColourCount) { - return ($iColourCount%2 == 0) ? "F5F6EE" : "FFFFFF"; - } - } - ?> diff --git a/lib/visualpatterns/PatternTableSqlQuery.inc b/lib/visualpatterns/PatternTableSqlQuery.inc index af3ba71..142a4b3 100644 --- a/lib/visualpatterns/PatternTableSqlQuery.inc +++ b/lib/visualpatterns/PatternTableSqlQuery.inc @@ -122,7 +122,7 @@ class PatternTableSqlQuery { } else { $iColour = 0; while ($sql->next_record()) { - $sToRender .= "getColour($iColour) . "\">\n"; + $sToRender .= "\n"; $iColour++; for ($i = 0; $i < count($this->aColumns); $i++) { switch ($this->aColumnTypes[$i]) { @@ -186,11 +186,5 @@ class PatternTableSqlQuery { function generateImageURL($sURL) { return ""; } - - function getColour($iColourCount) { - return ($iColourCount%2 == 0) ? "F5F6EE" : "FFFFFF"; - } - } - ?> \ No newline at end of file