November 2016 - Wine-Commits

Jeremy Newman : allow additional header code to be loaded
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: a00bb7ba016822b990246b4972a42d7276c945ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a00bb7ba016822b990246b49… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 11:25:24 2016 -0600 allow additional header code to be loaded --- include/appdb.php | 4 +++- include/header.php | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/appdb.php b/include/appdb.php index 4a92df6..4130bb0 100644 --- a/include/appdb.php +++ b/include/appdb.php @@ -233,8 +233,10 @@ function appdb_fullpath($path) /** * output the common apidb header + * title => sets the page title + * sHeaderCode => add additional code to <head> block */ -function apidb_header($title = 0) +function apidb_header($title = 0, $sHeaderCode = "") { $realname = $_SESSION['current']->sRealname; diff --git a/include/header.php b/include/header.php index 1df07cc..516fba0 100644 --- a/include/header.php +++ b/include/header.php @@ -29,7 +29,11 @@ $iJStime = filemtime(BASE."utils.js"); <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> <script src="<?php echo BASE; ?>utils.js?f=<?php echo $iJStime; ?>"></script> - +<?php +// additional header code +if (!empty($sHeaderCode)) + echo " {$sHeaderCode}\n"; +?> <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml"> </head>

1 0

Jeremy Newman : remove no screenshot image, done with css now
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: b3470dc804ac28efecc486503dfb9c288caa892b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b3470dc804ac28efecc48650… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 10:37:26 2016 -0600 remove no screenshot image, done with css now --- images/no_screenshot.png | Bin 774 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/no_screenshot.png b/images/no_screenshot.png deleted file mode 100644 index dae61cd..0000000 Binary files a/images/no_screenshot.png and /dev/null differ

1 0

Jeremy Newman : add a no screenshot class
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: a9e9ebc4fd8fba5391dd9733001798deb7d1bfab URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a9e9ebc4fd8fba5391dd9733… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 10:36:32 2016 -0600 add a no screenshot class --- styles.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/styles.css b/styles.css index d4eb396..f8ec293 100644 --- a/styles.css +++ b/styles.css @@ -558,6 +558,17 @@ h2.whq-app-title { margin-top: 1em; font-size: 24px; } font-size: 70%; white-space: nowrap; } +.whq-shot-none { + display: inline-block; + width: 128px; + height: 85px; + padding-top: 35px; + border-radius: 5px; + background-color: #000000; + color: #ffffff; + font-weight: bold; + text-align: center; +} /* classes for the main page */ div.topx_style {

1 0

Jeremy Newman : move home page only funcs to home page
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: c5d6cf5c751fa7575c92eebf880c137e5e98bf1c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c5d6cf5c751fa7575c92eebf… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 10:21:46 2016 -0600 move home page only funcs to home page * reducing global code in util.php * add commas to app count --- include/util.php | 83 ------------------------------------------------------ index.php | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/include/util.php b/include/util.php index cdc8d96..367179d 100644 --- a/include/util.php +++ b/include/util.php @@ -266,89 +266,6 @@ function getNumberOfComments() return $oRow->num_comments; } -/* used by outputTopXRowAppsFromRating() to reduce duplicated code */ -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 - - // 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 TableRowclick - $oTableRowClick = new TableRowClick($oVersion->objectMakeUrl()); - - // 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 */ -function outputTopXRowAppsFromRating($sRating, $iNumApps) -{ - /* clean the input values so we can continue to use query_appdb() */ - $sRating = query_escape_string($sRating); - $iNumApps = query_escape_string($iNumApps); - - /* list of versionIds we've already output, so we don't output */ - /* them again when filling in any empty spots in the list */ - $aVersionId = array(); - - $sQuery = "SELECT appVotes.versionId, COUNT( appVotes.versionId ) AS c - FROM appVotes, appVersion - WHERE appVersion.rating = '?' - AND appVersion.versionId = appVotes.versionId - AND appVersion.state = 'accepted' - GROUP BY appVotes.versionId - ORDER BY c DESC - LIMIT ?"; - $hResult = query_parameters($sQuery, $sRating, $iNumApps); - $iNumApps -= query_num_rows($hResult); /* take away the rows we are outputting here */ - while($oRow = query_fetch_object($hResult)) - { - /* keep track of the apps we've already output */ - $aVersionId[] = $oRow->versionId; - outputTopXRow($oRow); - } - - /* if we have no more app entries we should stop now and save ourselves a query */ - if(!$iNumApps) return; - - /* if we have any empty spots in the list, get these from applications with images */ - $sQuery = "SELECT DISTINCT appVersion.versionId - FROM appVersion, appData - WHERE appVersion.rating = '$sRating' - AND appVersion.versionId = appData.versionId - AND appVersion.state = 'accepted' - AND appData.type = 'screenshot' - AND appData.state = 'accepted'"; - - /* make sure we exclude any apps we've already output */ - foreach($aVersionId as $key=>$value) - $sQuery.="AND appVersion.versionId != '".$value."' "; - - $sQuery .= " LIMIT $iNumApps"; - - /* get the list that will fill the empty spots */ - $hResult = query_appdb($sQuery); - while($oRow = query_fetch_object($hResult)) - outputTopXRow($oRow); -} - /* return true if this word is in the list of words to ignore */ function isIgnoredWord($sWord) { diff --git a/index.php b/index.php index d7fa469..71e32b4 100644 --- a/index.php +++ b/index.php @@ -11,6 +11,89 @@ require("path.php"); require(BASE."include/incl.php"); +/* used by outputTopXRowAppsFromRating() to reduce duplicated code */ +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 + + // 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->SetClass("text-center padding-left-md padding-right-md"); + $oTableRow->AddCell($oTableCell); + + // create a new TableRowclick + $oTableRowClick = new TableRowClick($oVersion->objectMakeUrl()); + + // 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 */ +function outputTopXRowAppsFromRating($sRating, $iNumApps) +{ + /* clean the input values so we can continue to use query_appdb() */ + $sRating = query_escape_string($sRating); + $iNumApps = query_escape_string($iNumApps); + + /* list of versionIds we've already output, so we don't output */ + /* them again when filling in any empty spots in the list */ + $aVersionId = array(); + + $sQuery = "SELECT appVotes.versionId, COUNT( appVotes.versionId ) AS c + FROM appVotes, appVersion + WHERE appVersion.rating = '?' + AND appVersion.versionId = appVotes.versionId + AND appVersion.state = 'accepted' + GROUP BY appVotes.versionId + ORDER BY c DESC + LIMIT ?"; + $hResult = query_parameters($sQuery, $sRating, $iNumApps); + $iNumApps -= query_num_rows($hResult); /* take away the rows we are outputting here */ + while($oRow = query_fetch_object($hResult)) + { + /* keep track of the apps we've already output */ + $aVersionId[] = $oRow->versionId; + outputTopXRow($oRow); + } + + /* if we have no more app entries we should stop now and save ourselves a query */ + if(!$iNumApps) return; + + /* if we have any empty spots in the list, get these from applications with images */ + $sQuery = "SELECT DISTINCT appVersion.versionId + FROM appVersion, appData + WHERE appVersion.rating = '$sRating' + AND appVersion.versionId = appData.versionId + AND appVersion.state = 'accepted' + AND appData.type = 'screenshot' + AND appData.state = 'accepted'"; + + /* make sure we exclude any apps we've already output */ + foreach($aVersionId as $key=>$value) + $sQuery.="AND appVersion.versionId != '".$value."' "; + + $sQuery .= " LIMIT $iNumApps"; + + /* get the list that will fill the empty spots */ + $hResult = query_appdb($sQuery); + while($oRow = query_fetch_object($hResult)) + outputTopXRow($oRow); +} + apidb_header("Wine Application Database"); ?> @@ -63,7 +146,7 @@ else ?> <?php - $iNumApps = version::objectGetEntriesCount('accepted'); + $iNumApps = number_format(version::objectGetEntriesCount('accepted')); $voteQuery = "SELECT appVotes.versionId, count(userId) as count ". "FROM appVotes ".

1 0

Jeremy Newman : fix typo on height
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: a1c7735b754dbbcee29af7a51976af444c101523 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a1c7735b754dbbcee29af7a5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 10:24:09 2016 -0600 fix typo on height --- include/screenshot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/screenshot.php b/include/screenshot.php index a0033c5..1c14aed 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -585,7 +585,7 @@ class screenshot if (!$sImgHeight) $sImgHeight = '100'; $this->sDescription = preg_replace('/\n/', '', $this->sDescription); - return "<div class=\"whq-shot\"><img src=\"{$sImgUrl}&bThumbnail=true\" style=\"width:{$sImgWidth}px;height{$sImgHeight}:px;\" ". + return "<div class=\"whq-shot\"><img src=\"{$sImgUrl}&bThumbnail=true\" style=\"width:{$sImgWidth}px;height:{$sImgHeight}px;\" ". "alt=\"{$this->sDescription}\" data-shot=\"{$sImgUrl}\"><i class=\"fa fa-search-plus\"></i></div>\n"; }

1 0

Jeremy Newman : fix caching issues with JS/CSS
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: d0c1f087ca8eecc52f3636254a90f5c45cd87390 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d0c1f087ca8eecc52f363625… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 10:12:06 2016 -0600 fix caching issues with JS/CSS --- include/header.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/header.php b/include/header.php index d607cdc..1df07cc 100644 --- a/include/header.php +++ b/include/header.php @@ -2,6 +2,11 @@ /*********************************/ /* Application Database - Header */ /*********************************/ + +// get file modification time for local CSS/JS to fix caching issues +$iCSStime = filemtime(BASE."styles.css"); +$iJStime = filemtime(BASE."utils.js"); + ?><!doctype html> <html lang="en"> <head> @@ -18,12 +23,12 @@ <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"> <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css" type="text/css" media="all"> - <link rel="stylesheet" href="<?php echo BASE; ?>styles.css" type="text/css" media="all"> + <link rel="stylesheet" href="<?php echo BASE; ?>styles.css?f=<?php echo $iCSStime; ?>" type="text/css" media="all"> <script src="https://code.jquery.com/jquery-2.2.3.min.js" type="text/javascript"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> - <script src="<?php echo BASE; ?>utils.js"></script> + <script src="<?php echo BASE; ?>utils.js?f=<?php echo $iJStime; ?>"></script> <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml">

1 0

Jeremy Newman : jquery is now pulled from the CDN
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: 423df9c3bd76a10a436d0062d48c12c792d9d9d8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=423df9c3bd76a10a436d0062… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 10:00:48 2016 -0600 jquery is now pulled from the CDN --- jquery.js | 32 -------------- jquery.pngfix.js | 126 ------------------------------------------------------- 2 files changed, 158 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=423df9c3bd76a10a436d…

1 0

Jeremy Newman : move last help links over to the wiki
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: 23fae1afb7dd6b34b546934661eed179f304ac93 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=23fae1afb7dd6b34b5469346… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:53:16 2016 -0600 move last help links over to the wiki --- include/maintainer.php | 2 +- include/testData.php | 2 +- index.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index fa0aa07..6c0c92f 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -755,7 +755,7 @@ class maintainer echo "An application maintainer is someone who runs the application \n"; echo "regularly and who is willing to be active in reporting regressions with newer \n"; echo "versions of Wine and to help other users run this application under Wine.</p>"; - echo "<p>Being an application maintainer comes with new rights and new responsibilities; please be sure to read the <a href=\"".BASE."/help/?sTopic=maintainer_guidelines\">maintainer's guidelines</a> before to proceed.</p> "; + echo "<p>Being an application maintainer comes with new rights and new responsibilities; please be sure to read the <a href=\"https://wiki.winehq.org/AppDB_Maintainer_Guidelines\" target=\"_blank\">maintainer's guidelines</a> before to proceed.</p> "; echo "<p>We ask that all maintainers explain why they want to be an application maintainer,\n"; echo "why they think they will do a good job and a little about their experience\n"; echo "with Wine. This is both to give you time to\n"; diff --git a/include/testData.php b/include/testData.php index 352428f..18a04b4 100644 --- a/include/testData.php +++ b/include/testData.php @@ -901,7 +901,7 @@ class testData{ // Rating echo '<tr><td class="color0"><b>Rating</b></td><td class="color0">',"\n"; echo make_maintainer_rating_list("sTestedRating", $this->sTestedRating); - echo '<a href="'.BASE.'/help/?sTopic=maintainer_ratings" target="_blank">Rating definitions</a></td></tr>',"\n"; + echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td class="color1"><b>Extra comments</b></td>',"\n"; echo '<td class="color0"><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; diff --git a/index.php b/index.php index 405acac..d7fa469 100644 --- a/index.php +++ b/index.php @@ -84,8 +84,7 @@ else } else { - echo " please <a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\"". - "style=\"cursor: help\">vote</a> for your favourite application.\n"; + echo " please <a href=\"https://wiki.winehq.org/AppDB_Voting_Help\">vote</a> for your favorite application.\n"; } }

1 0

Jeremy Newman : removing old help section, this all has been moved to the wiki
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: e25249abccbafb0f9a5b8e63e042ab7ee4b8aea4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e25249abccbafb0f9a5b8e63… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:58:09 2016 -0600 removing old help section, this all has been moved to the wiki --- help/.cvsignore | 2 - help/appdb_faq.help | 87 -------------------------------- help/generic.help | 56 --------------------- help/index.php | 105 -------------------------------------- help/maintainer.help | 21 -------- help/maintainer_guidelines.help | 109 ---------------------------------------- help/maintainer_ratings.help | 47 ----------------- help/path.php | 3 -- help/privacy.help | 38 -------------- help/voting.help | 39 -------------- 10 files changed, 507 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e25249abccbafb0f9a5b…

1 0

Jeremy Newman : use minified version of jquery-ui theme
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: b93a287d35ee2d18c7eaf30ca366f6ca5f3e91a1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b93a287d35ee2d18c7eaf30c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:30:26 2016 -0600 use minified version of jquery-ui theme --- include/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/header.php b/include/header.php index 427a824..d607cdc 100644 --- a/include/header.php +++ b/include/header.php @@ -17,7 +17,7 @@ <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"> - <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" type="text/css" media="all"> + <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css" type="text/css" media="all"> <link rel="stylesheet" href="<?php echo BASE; ?>styles.css" type="text/css" media="all"> <script src="https://code.jquery.com/jquery-2.2.3.min.js" type="text/javascript"></script>

1 0