November 2016 - Wine-commits

Jeremy Newman : wrap body in container fluid
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: febea42089aa7423c66d28a35fedcdecf3adafc2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=febea42089aa7423c66d28a3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:09:12 2016 -0600 wrap body in container fluid --- include/footer.php | 1 + include/header.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/footer.php b/include/footer.php index 623b5fa..1340d41 100644 --- a/include/footer.php +++ b/include/footer.php @@ -1,6 +1,7 @@  </div> +</div> <div id="footer"> <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> diff --git a/include/header.php b/include/header.php index 47b8e8c..427a824 100644 --- a/include/header.php +++ b/include/header.php @@ -110,4 +110,6 @@ echo "</div>\n"; ?> <div id="whq-page-body"> +<div class="container-fluid"> +

1 0

Jeremy Newman : boostrapify and cleanup html
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 44250217bfdaa715d6e515ba1af9cc7d5f1a94f6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=44250217bfdaa715d6e515ba… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:09:57 2016 -0600 boostrapify and cleanup html --- include/objectManager.php | 108 +++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=44250217bfdaa715d6e5…

1 0

Jeremy Newman : update object style, cleanup html, remove javascript where css can be used
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 682ac81620e4d9222b3fab39ec74bd0d098b8104 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=682ac81620e4d9222b3fab39… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:10:25 2016 -0600 update object style, cleanup html, remove javascript where css can be used --- include/table.php | 203 ++++++++++++++---------------------------------------- 1 file changed, 52 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=682ac81620e4d9222b3f…

1 0

Jeremy Newman : cleanup html and bootstrapify
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 9382f6da1a9bbe1e6f0e72db0253ff382f23c7ba URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9382f6da1a9bbe1e6f0e72db… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:26:31 2016 -0600 cleanup html and bootstrapify --- include/util.php | 89 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/include/util.php b/include/util.php index 617bbf4..cdc8d96 100644 --- a/include/util.php +++ b/include/util.php @@ -1,5 +1,9 @@ <?php /** + * misc global utility functions + */ + +/** * display an error page */ function util_show_error_page_and_exit($text = null, $message = null) @@ -9,8 +13,12 @@ function util_show_error_page_and_exit($text = null, $message = null) } header("HTTP/1.0 404 Object not found or user is not logged in"); apidb_header("Oops"); - echo "<div align=center><font color=red><b>$text</b></font></div>\n"; - echo "<p>$message</p>\n"; + echo "<h1 class=\"text-danger\"><i class=\"fa fa-exclamation-triangle\"></i> $text</h1>\n"; + if (!empty($message)) + { + echo "<hr>\n"; + echo "<p>$message</p>\n"; + } apidb_footer(); exit; } @@ -185,7 +193,7 @@ function make_bugzilla_version_list($sVarname, $sSelectedValue = '') $aVersions = get_bugzilla_versions(); // build the selection array - $sStr.= "<select name='$sVarname'>\n"; + $sStr.= "<select name='$sVarname' class='form-control form-control-inline'>\n"; $sStr.= "<option value=\"\">Choose ...</option>\n"; $bFoundSelectedValue = false; foreach($aVersions as $sKey => $sValue) @@ -216,7 +224,7 @@ function make_bugzilla_version_list($sVarname, $sSelectedValue = '') // returns a string containing the html for the maintainer rating list function make_maintainer_rating_list($varname, $cvalue) { - $sTxt = "<select id='ratingSelect' name='$varname'>\n"; + $sTxt = "<select id='ratingSelect' name='$varname' class='form-control form-control-inline'>\n"; $sTxt .= "<option value=\"\">Choose ...</option>\n"; $aRating = array("Platinum", "Gold", "Silver", "Bronze", "Garbage"); $iMax = count($aRating); @@ -278,15 +286,8 @@ function outputTopXRow($oRow) $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); @@ -511,47 +512,43 @@ function outputSearchTableForhResult($search_words, $hResult) if(($hResult == null) || (query_num_rows($hResult) == 0)) { // do something - echo html_frame_start("","98%"); - echo "No matches found for '". urlencode($search_words) . "'\n"; + echo html_frame_start(); + echo "No matches found for <b>'".urlencode($search_words)."'</b>\n"; echo html_frame_end(); - } else + } + else { - echo html_frame_start("","98%","",0); - echo "<table width='100%' border=0 cellpadding=3 cellspacing=1>\n\n"; + echo html_frame_start(); + echo "<table class=\"whq-table whq-table-full\">\n\n"; - echo "<tr class=color4>\n"; - echo " <td><font color=white>Application Name</font></td>\n"; - echo " <td><font color=white>Description</font></td>\n"; - echo " <td><font color=white>No. Versions</font></td>\n"; - echo "</tr>\n\n"; + echo "<thead><tr>\n"; + echo " <td>Application Name</td>\n"; + echo " <td>Description</td>\n"; + echo " <td>No. Versions</td>\n"; + echo "</tr></thead><tbody>\n"; - $c = 0; while($oRow = query_fetch_object($hResult)) { $oApp = new application($oRow->appId); + //skip if a NONAME if ($oRow->appName == "NONAME") { continue; } - - //set row color - $bgcolor = ($c % 2) ? 'color0' : 'color1'; - + //count versions $hResult2 = query_parameters("SELECT count(*) as versions FROM appVersion WHERE appId = '?' AND versionName != 'NONAME' and state = 'accepted'", $oRow->appId); $y = query_fetch_object($hResult2); - + //display row - echo "<tr class=$bgcolor>\n"; + echo "<tr>\n"; echo " <td>".html_ahref($oRow->appName,$oApp->objectMakeUrl())."</td>\n"; echo " <td>".util_trim_description($oRow->description)."</td>\n"; - echo " <td>$y->versions  </td>\n"; + echo " <td>{$y->versions}  </td>\n"; echo "</tr>\n\n"; - - $c++; } - echo "<tr><td colspan=3 class=color4><font color=white>$c match(es) found</font></td></tr>\n"; - echo "</table>\n\n"; + echo "</tbody></table>\n"; + echo "<p><b>$c</b> match(es) found</p>"; echo html_frame_end(); } } @@ -582,13 +579,13 @@ function process_app_version_changes($bIsVersion) function perform_search_and_output_results($search_words) { - echo "<b>Searching for '".$search_words."'"; + echo "<b>Searching for '".$search_words."' "; - echo "<center><b>Like matches</b></center>"; + echo "<b>Like matches</b> "; $hResult = searchForApplication($search_words); outputSearchTableForhResult($search_words, $hResult); - echo "<center><b>Partial matches</b></center>"; + echo "<b>Partial matches</b> "; $hResult = searchForApplicationPartial($search_words); outputSearchTableForhResult($search_words, $hResult); } @@ -621,32 +618,36 @@ function display_page_range($iCurrentPage=1, $iPageRange=1, $iTotalPages=1, $sLi } $iStartPage = max(1,$iStartPage); + echo " "; + if($iCurrentPage != 1) { - echo "<a href='".$sLinkurl."&iPage=1'>|&lt</a> "; + echo "<a href=\"{$sLinkurl}&iPage=1\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-step-backward\"></i></a> "; $iPreviousPage = $iCurrentPage - 1; - echo "<a href='".$sLinkurl."&iPage=$iPreviousPage'>&lt</a> "; + echo "<a href=\"{$sLinkurl}&iPage=$iPreviousPage\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-chevron-left\"></i></a> "; } else { - echo "|&lt &lt "; + echo "<button class=\"btn btn-default btn-sm btn-skinny\" disabled=\"disabled\"><i class=\"fa fa-step-backward text-muted\"></i></button> ". + "<button class=\"btn btn-default btn-sm btn-skinny\" disabled=\"disabled\"><i class=\"fa fa-chevron-left text-muted\"></i></button> "; } /* display the desired range */ for($iPg = $iStartPage; $iPg <= $iEndPage; $iPg++) { if($iPg != $iCurrentPage) - echo "<a href='".$sLinkurl."&iPage=".$iPg."'>$iPg</a> "; + echo "<a href=\"{$sLinkurl}&iPage={$iPg}\" class=\"btn btn-default btn-sm btn-skinny\">{$iPg}</a> "; else - echo "$iPg "; + echo "<button class=\"btn btn-default btn-sm btn-skinny\" disabled=\"disabled\"><span class=\"text-muted\">$iPg</span></button> "; } if($iCurrentPage < $iTotalPages) { $iNextPage = $iCurrentPage + 1; - echo "<a href='".$sLinkurl."&iPage=$iNextPage'>&gt</a> "; - echo "<a href='".$sLinkurl."&iPage=$iTotalPages'>&gt|</a> "; + echo "<a href=\"{$sLinkurl}&iPage={$iNextPage}\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-chevron-right\"></i></a> "; + echo "<a href=\"{$sLinkurl}&iPage={$iTotalPages}\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-step-forward\"></i></a> "; } else { - echo "&gt &gt|"; + echo "<button class=\"btn btn-default btn-sm btn-skinny\" disabled=\"disabled\"><i class=\"fa fa-chevron-right text-muted\"></i></button> ". + "<button class=\"btn btn-default btn-sm btn-skinny\" disabled=\"disabled\"><i class=\"fa fa-step-forward text-muted\"></i></button> "; } }

1 0

Jeremy Newman : improve category breadcrumb bar
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 2a4b02ecc97bfcc7b7ca47307911727400e8ed77 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2a4b02ecc97bfcc7b7ca4730… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:48:04 2016 -0600 improve category breadcrumb bar --- include/category.php | 70 +++++++++++++++++----------------------------------- styles.css | 9 +++++++ 2 files changed, 31 insertions(+), 48 deletions(-) diff --git a/include/category.php b/include/category.php index 9c61646..b46eb56 100644 --- a/include/category.php +++ b/include/category.php @@ -269,7 +269,7 @@ class Category { else $sCatname = $sName; - if ($iCatCount > 0) $sStr .= " > "; + if ($iCatCount > 0) $sStr .= " <i class=\"fa fa-arrow-right\"></i> "; $sStr .= html_ahref($sCatname,"objectManager.php?sClass=category&iId=$iCatId&sAction=view&sTitle=Browse+Applications"); $iCatCount++; } @@ -280,11 +280,11 @@ class Category { if($iVersionId) { $oVersion = new Version($iVersionId); - $sStr .= " > ".$oApp->objectMakeLink(); - $sStr .= " > ".$oVersion->sName; + $sStr .= " <i class=\"fa fa-arrow-right\"></i> ".$oApp->objectMakeLink(); + $sStr .= " <i class=\"fa fa-arrow-right\"></i> ".$oVersion->sName; } else { - $sStr .= " > ".$oApp->sName; + $sStr .= " <i class=\"fa fa-arrow-right\"></i> ".$oApp->sName; } } @@ -408,8 +408,8 @@ class Category { function displayPath($appId, $versionId = '') { $sCatFullPath = Category::make_cat_path($this->getCategoryPath(), $appId, $versionId); - echo html_frame_start("",'98%','',2); - echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; + echo html_frame_start(); + echo "<div class=\"whq-breadcrumb\"><b>Category:</b> {$sCatFullPath}</div>\n"; echo html_frame_end(); } @@ -419,8 +419,6 @@ class Category { $sCatFullPath = Category::make_cat_path($this->getCategoryPath()); $aSubs = $this->aSubcatsIds; - echo "<div class='default_container'>\n"; - // Allow editing categories if($this->canEdit()) { @@ -441,20 +439,17 @@ class Category { // Output sub-categories if($aSubs) { - echo html_frame_start("",'98%','',2); - echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; + echo html_frame_start(); + echo "<div class=\"whq-breadcrumb\"><b>Category:</b> {$sCatFullPath}</div>\n"; echo html_frame_end(); - echo html_frame_start("","98%","",0); + echo html_frame_start(); $oTable = new Table(); - $oTable->SetWidth("100%"); - $oTable->SetBorder(0); - $oTable->SetCellPadding(3); - $oTable->SetCellSpacing(1); + $oTable->setWidth('100%'); + $oTable->setClass('whq-table'); $oTableRow = new TableRow(); - $oTableRow->SetClass("color4"); $oTableRow->AddTextCell("Sub Category"); $oTableRow->AddTextCell("Description"); $oTableRow->AddTextCell("No. Apps"); @@ -463,16 +458,8 @@ class Category { while(list($i,$iSubcatId) = each($aSubs)) { $oSubCat= new Category($iSubcatId); - - //set row color - $sColor = ($i % 2) ? "color0" : "color1"; - - $oTableRowHighlight = GetStandardRowHighlight($i); - $sUrl = $oSubCat->objectMakeUrl(); - $oTableRowClick = new TableRowClick($sUrl); - $oTableRowClick->SetHighlight($oTableRowHighlight); //get number of apps in this sub-category $iAppcount = $oSubCat->getApplicationCount(); @@ -482,7 +469,6 @@ class Category { //display row $oTableRow = new TableRow(); - $oTableRow->SetClass($sColor); $oTableRow->SetRowClick($oTableRowClick); $oTableCell = new TableCell($oSubCat->sName); @@ -505,47 +491,35 @@ class Category { $aApps = $this->aApplicationsIds; if($aApps) { - echo html_frame_start("",'98%','',2); - echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; + echo html_frame_start(); + echo "<div class=\"whq-breadcrumb\"><b>Category:</b> {$sCatFullPath}</div>\n"; echo html_frame_end(); - echo html_frame_start("","98%","",0); + echo html_frame_start(); $oTable = new Table(); - $oTable->SetWidth("100%"); - $oTable->SetBorder(0); - $oTable->SetCellPadding(3); - $oTable->SetCellSpacing(1); + $oTable->setClass('whq-table'); + $oTableRow = new TableRow(); - $oTableRow->SetClass("color4"); $oTableRow->AddTextCell("Application name"); $oTableRow->AddTextCell("Description"); $oTableRow->AddTextCell("No. Versions"); $oTable->SetHeader($oTableRow); - + while(list($i, $iAppId) = each($aApps)) { $oApp = new Application($iAppId); - - //set row color - $sColor = ($i % 2) ? "color0" : "color1"; - - $oTableRowHighlight = GetStandardRowHighlight($i); - $sUrl = $oApp->objectMakeUrl(); - $oTableRowClick = new TableRowClick($sUrl); - $oTableRowClick->SetHighlight($oTableRowHighlight); - + //format desc $sDesc = util_trim_description($oApp->sDescription); - + //display row $oTableRow = new TableRow(); $oTableRow->SetRowClick($oTableRowClick); - $oTableRow->SetClass($sColor); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCell("$sDesc  "); $oTableRow->AddTextCell(sizeof($oApp->aVersionsIds)); @@ -562,11 +536,11 @@ class Category { // Show a message if this category is empty if(!$aApps && !$aSubs) { - echo html_frame_start("",'98%','',2); - echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; + echo html_frame_start(); + echo "<div class=\"whq-breadcrumb\"><b>Category:</b> {$sCatFullPath}</div>\n"; echo html_frame_end(); - echo html_frame_start('','90%','',2); + echo html_frame_start(); echo 'This category has no sub-categories or applications'; echo html_frame_end(); } diff --git a/styles.css b/styles.css index 9426e95..32ea3d2 100644 --- a/styles.css +++ b/styles.css @@ -452,6 +452,15 @@ hr /* zoom image overlay style */ .zoom_overlay { position:relative; top:10px; left:10px; margin-left:-32px; padding:0px; } +/* breadcrumb */ +.whq-breadcrumb a, .whq-breadcrumb a:visited { + color: inherit; +} +.whq-breadcrumb i { + font-size: 80%; + color: #aaaaaa; +} + /* ===================================================================================================================== Boxes

1 0

Jeremy Newman : remove old highlight code
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 374bc7a829829615b6875c668c840cfa4ec37d60 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=374bc7a829829615b6875c66… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:49:19 2016 -0600 remove old highlight code --- include/testData.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/testData.php b/include/testData.php index 2a83066..326de0c 100644 --- a/include/testData.php +++ b/include/testData.php @@ -586,20 +586,12 @@ class testData{ { $sTRClass = $bgcolor; - $oInactiveColor = new color(); - $oInactiveColor->SetColorByName($this->sTestedRating); - - $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor); - - $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor); - $sUrl = $sLink.$this->iTestingId; if($bShowAll) $sUrl .= '&bShowAll=true'; $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");

1 0

Jeremy Newman : remove old highlight code
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 5d1998b9ef1b55535c6119f978976e229b5e7fe1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5d1998b9ef1b55535c6119f9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:49:41 2016 -0600 remove old highlight code --- include/version.php | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/include/version.php b/include/version.php index 7dca7eb..8d0dd24 100644 --- a/include/version.php +++ b/include/version.php @@ -1231,13 +1231,8 @@ class version { echo html_frame_start("","98%","",0); $oTable = new Table(); - $oTable->SetWidth("100%"); - $oTable->SetBorder(0); - $oTable->SetCellPadding(3); - $oTable->SetCellSpacing(1); - + $oTable->SetClass('whq-table'); $oTableRow = new TableRow(); - $oTableRow->SetClass("color4"); $oTableCell = new TableCell("Version"); $oTableCell->SetWidth("80"); @@ -1270,33 +1265,15 @@ class version { if ($oVersion->sState == $oApp->objectGetState()) { - // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - - $oTableRowHighlight = null; - // if we have a valid tested rating if($oVersion->sTestedRating && ($oVersion->sTestedRating != "/") && ($oVersion->sTestedRating != " ")) { $sClass = $oVersion->sTestedRating; - - $oInactiveColor = new Color(); - $oInactiveColor->SetColorByName($oVersion->sTestedRating); - - $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor); - - $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor); - } else - { - $sClass = $bgcolor; - - $oTableRowHighlight = GetStandardRowHighlight($c); } //display row $oTableRowClick = new TableRowClick($oVersion->objectMakeUrl()); - $oTableRowClick->SetHighlight($oTableRowHighlight); $oTableRow = new TableRow(); $oTableRow->SetRowClick($oTableRowClick); // make the row clickable

1 0

Jeremy Newman : cleanup html, fix link to help
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 730211a8a757ba42d945913ecc094dead444a8d7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=730211a8a757ba42d945913e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:50:10 2016 -0600 cleanup html, fix link to help --- votestats.php | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/votestats.php b/votestats.php index 58cb715..eba3279 100644 --- a/votestats.php +++ b/votestats.php @@ -20,12 +20,10 @@ if(empty($aClean['iCategoryId'])) apidb_header("Vote Stats - Top ".$aClean['iTopNumber']." Applications"); -echo "<div class='default_container'>\n"; - /* display the selection for the top number of apps to view */ echo "<form method=\"post\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">"; echo "<b>Number of top apps to display:</b>"; -echo "<select name='iTopNumber'>"; +echo "<select name='iTopNumber' class=\"form-control form-control-inline\">"; $topNumberArray = array(25, 50, 100, 200); foreach ($topNumberArray as $i => $value) @@ -70,7 +68,7 @@ if(!empty($aClean['iCategoryId'])) /*******************************************************************/ /* add options for all of the categories that we are recursed into */ echo "<b>Section:</b>"; -echo '<select name="iCategoryId">'; +echo '<select name="iCategoryId" class="form-control form-control-inline">'; if(empty($aClean['iCategoryId'])) echo '<option value="0" SELECTED>Any</option>'; @@ -117,10 +115,8 @@ if($subs) } } echo '</select>'; -echo '<input type="submit" value="Refresh">'; +echo ' <input type="submit" value="Refresh" class="btn btn-default">'; echo '</form>'; -echo '<br>'; -echo '<br>'; /***************************************************/ /* build a list of the apps in the chosen category */ @@ -163,32 +159,23 @@ if(empty($aClean['iCategoryId'])) if($hResult) { - echo html_frame_start("", "90%", '', 0); + echo html_frame_start(); $oTable = new Table(); - $oTable->SetWidth("100%"); - $oTable->SetAlign("center"); + $oTable->setWidth("100%"); + $oTable->SetClass("whq-table"); $oTableRow = new TableRow(); - $oTableRow->SetClass("color4"); - $oTableRow->AddTextCell("<font color=white>Application Name</font>"); - $oTableRow->AddTextCell("<font color=white>Votes</font>"); - $oTable->AddRow($oTableRow); + $oTableRow->AddTextCell("Application Name"); + $oTableRow->AddTextCell("Votes"); + $oTable->SetHeader($oTableRow); $c = 1; while($oRow = query_fetch_object($hResult)) { - $sColor = ($c % 2) ? "color0" : "color1"; - - $oTableRowHighlight = GetStandardRowHighlight($c); - $shLink = version::fullNameLink($oRow->versionId); - $oVersion = new Version($oRow->versionId); - $oTableRowClick = new TableRowClick($oVersion->objectMakeUrl()); - $oTableRowClick->SetHighlight($oTableRowHighlight); - $oTableRow = new TableRow(); $oTableRow->SetRowClick($oTableRowClick); $oTableRow->SetClass($sColor); @@ -196,9 +183,7 @@ if($hResult) $oTableCell->SetWidth("90%"); $oTableRow->AddCell($oTableCell); $oTableRow->AddTextCell($oRow->count); - $oTable->AddRow($oTableRow); - $c++; } @@ -211,13 +196,11 @@ if($hResult) /* think that something went wrong with the server */ if($c == 1) { - echo '<h2 align="center">No apps found in this category, please vote for your favorite apps!</h2>'; + echo '<h2>No apps found in this category, please vote for your favorite apps!</h2>'; } - - echo '<p align="center"><a href="help/?sTopic=voting">What does this screen mean?</a></p>'; -} -echo "</div>\n"; + echo '<p><a href="https://wiki.winehq.org/AppDB_Voting_Help">What does this screen mean?</a></p>'; +} apidb_footer(); ?>

1 0

Jeremy Newman : move help links into the wiki
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 3aeea4886fb661a2f684669f13f4953c39119879 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3aeea4886fb661a2f684669f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 13:14:49 2016 -0600 move help links into the wiki --- index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index b1560ea..0ef4ae1 100644 --- a/index.php +++ b/index.php @@ -23,11 +23,11 @@ compatibility with Wine.</p> <?php $str_benefits=" <ul> - <li>Ability to <a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\" style=\"cursor: help\">vote</a> on your favorite applications</li> + <li>Ability to <a href=\"https://wiki.winehq.org/AppDB_Voting_Help\" title=\"help on voting\">vote</a> on your favorite applications</li> <li>Ability to customize the layout and behavior of the AppDB and comments system</li> <li>Take credit for your witty posts</li> - <li>Ability to sign up to be an <a href=\"".BASE."help/?sTopic=maintainer_guidelines\" - title=\"information about application maintainers\" style=\"cursor: help\">application maintainer</a></li> + <li>Ability to sign up to be an <a href=\"https://wiki.winehq.org/AppDB_Maintainer_Guidelines\" + title=\"information about application maintainers\">application maintainer</a></li> <li>Submit new applications and versions</li> <li>Submit new screenshots</li> </ul>

1 0

Jeremy Newman : change some PHP defaults
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 45b600425c0560e3656ed0025fcdc2ed058086c8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=45b600425c0560e3656ed002… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 13:16:11 2016 -0600 change some PHP defaults error reporting will be handled internally --- .htaccess | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 5884b93..a0020e6 100644 --- a/.htaccess +++ b/.htaccess @@ -15,14 +15,16 @@ ErrorDocument 404 https://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting 22519 +php_value memory_limit 64M php_value html_errors "1" -php_value display_errors "1" +php_value display_errors "0" php_value register_globals 0 php_value short_open_tag 0 php_value register_long_arrays 0 php_value magic_quotes_gpc 0 php_flag zlib.output_compression on +php_value date.timezone "America/Chicago" +php_value mail.add_x_header "0" # make sure gc_probability is non-zero, we want php to take care of # session cleanup for us

1 0