November 2016 - Wine-commits

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

21 Nov '16

Module: appdb Branch: master Commit: dcee2457bf93e62d9ac93eda60460e9d9edb12d8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dcee2457bf93e62d9ac93eda… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:40:44 2016 -0600 cleanup and bootstrapify --- include/distribution.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 56577d0..a021ce8 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -677,9 +677,9 @@ class distribution { if($this->aTestingIds) { - echo '<p><span class="title">Test Results for '.$this->sName.'</span><br>',"\n"; - echo '<table width="100%" border="1">',"\n"; - echo '<thead class="historyHeader">',"\n"; + echo '<h1 class="whq-app-title">Test Results for '.$this->sName.'</h1>',"\n"; + echo '<table class="whq-table whq-table-full">',"\n"; + echo '<thead>',"\n"; echo '<tr>',"\n"; echo '<td>Application Version</td>',"\n"; echo '<td>Submitter</td>',"\n"; @@ -688,7 +688,8 @@ class distribution { echo '<td>Installs?</td>',"\n"; echo '<td>Runs?</td>',"\n"; echo '<td>Rating</td>',"\n"; - echo '</tr></thead>',"\n"; + echo '<td></td>',"\n"; + echo '</tr></thead><tbody>',"\n"; foreach($this->aTestingIds as $iTestingId) { $oTest = new testData($iTestingId); @@ -708,11 +709,11 @@ class distribution { if(!$_SESSION['current']->canViewVersion($oVersion)) continue; - echo '<tr class='.$bgcolor.'>',"\n"; + echo "<tr>\n"; echo '<td><a href="'.$oVersion->objectMakeUrl().'&iTestingId='.$oTest->iTestingId.'">',"\n"; echo version::fullName($oVersion->iVersionId).'</a></td>',"\n"; - echo '<td>',"\n"; - + echo "<td>\n"; + echo $oSubmitter->objectMakeLink(); echo '</td>',"\n"; @@ -720,15 +721,15 @@ class distribution { echo '<td>'.$oTest->sTestedRelease.' </td>',"\n"; echo '<td>'.$oTest->sInstalls.' </td>',"\n"; echo '<td>'.$oTest->sRuns.' </td>',"\n"; - echo '<td>'.$oTest->sTestedRating.' </td>',"\n"; + echo "<td class=\"{$bgcolor}\">{$oTest->sTestedRating}</td>\n"; if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { - echo '<td><a href="'.$oTest->objectMakeUrl().'">',"\n"; - echo 'Edit</a></td>',"\n"; + echo '<td><a href="'.$oTest->objectMakeUrl().'" class="btn btn-default btn-xs">',"\n"; + echo '<i class="fa fa-pencil-square-o"></i> Edit</a></td>',"\n"; } echo '</tr>',"\n"; } - echo '</table>',"\n"; + echo '</tbody></table>',"\n"; } }

1 0

Jeremy Newman : set rating color on the column only
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 7cf9b437874e852b925a5d75043f528a017d9aeb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7cf9b437874e852b925a5d75… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:40:59 2016 -0600 set rating color on the column only --- include/version.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/version.php b/include/version.php index bb2aa68..1ee7a26 100644 --- a/include/version.php +++ b/include/version.php @@ -1212,8 +1212,6 @@ EOT; { if ($aVersions) { - echo html_frame_start("","98%","",0); - $oTable = new Table(); $oTable->SetClass('whq-table'); $oTableRow = new TableRow(); @@ -1262,11 +1260,11 @@ EOT; $oTableRow = new TableRow(); $oTableRow->SetRowClick($oTableRowClick); // make the row clickable $oTableRow->AddTextCell($oVersion->objectMakeLink()); - $oTableRow->SetClass($sClass); $oTableRow->AddTextCell(util_trim_description($oVersion->sDescription)); $oTableCell = new TableCell($oVersion->sTestedRating); $oTableCell->SetAlign("center"); + $oTableCell->SetClass($sClass); $oTableRow->AddCell($oTableCell); $oTableCell = new TableCell($oVersion->sTestedRelease); @@ -1284,14 +1282,12 @@ EOT; // add the row to the table $oTable->AddRow($oTableRow); - $c++; + $c++; } } // output the table echo $oTable->GetString(); - - echo html_frame_end("Click the Version Name to view the details of that Version"); } }

1 0

Jeremy Newman : cleanup styles for ratings box on home page
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: d37a4b1951b67c7f0695f11ded17f43a7e89efb8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d37a4b1951b67c7f0695f11d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:50:50 2016 -0600 cleanup styles for ratings box on home page --- styles.css | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/styles.css b/styles.css index 20fdcaa..9581b48 100644 --- a/styles.css +++ b/styles.css @@ -533,6 +533,25 @@ h2.whq-app-title { margin-top: 1em; font-size: 24px; } word-wrap: break-word; } +/* screenshots */ +div.imgarea { + text-align:center; +} + +/* classes for the main page */ +div.topx_style { + padding: 7px; + margin: 6px; + border: 2px solid #999999; + border-radius: 5px; +} +div.topx_style.platinum { background-color: #333333; } +div.topx_style.platinum div.rating_header { color: #ffffff; } +div.topx_style.gold { background-color: #FFF600; } +div.topx_style.silver { background-color: #C0C0C0; } +div.rating_header { padding: 8px; } +div.rating_title { padding-bottom: 4px; font-weight: bold; font-size: 160%; } + /* ===================================================================================================================== Boxes @@ -672,13 +691,6 @@ table tr.rowtitle td:last-child { .color3 { background-color: #666666 } .color4 { background-color: #999999 } -/* Colors for supported apps table */ -.platinum { background-color: #333333; color: #ffffff; } -.gold { background-color: #FFF600; } -.silver { background-color: #C0C0C0; } -.bronze { background-color: #FCBA0A; } -.garbage { background-color: #999966; } - /* table row colors for ratings (alternating colors for rows) */ tr:nth-child(odd) td.Platinum { background-color: #333333 !important; color: #ffffff !important; } tr:nth-child(even) td.Platinum { background-color: #666666 !important; color: #ffffff !important; } @@ -745,35 +757,8 @@ table.historyTable { border: 1px; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; font-size: 12px; } -/* rank row colors */ -td.platinum { background-color: #ECECEC; } -td.gold { background-color: #fff600; } -td.silver { background-color: silver; } -td.bronze { background-color: #fcba0a; } -td.garbage { background-color: #999966; } - -tr.platinum { background-color: #ECECEC; } -tr.gold { background-color: #fff600; } -tr.silver { background-color: silver; } -tr.bronze { background-color: #fcba0a; } -tr.garbage { background-color: #999966; } -tr.warning { background-color: #ff3333; } /* novascotia salmon */ - /* note/howto colors */ .note-howto { font-weight: bold; color: green; } .note-defaultnote { font-weight: bold; color: #0066CC; } /* mid-light blue */ -/* classes for the main page */ -div.rating_header { padding: 8px; } -div.rating_title { padding-bottom: 4px; font-weight: bold; font-size: 160%; } -div.topx_style { - padding: 7px; - margin: 6px; - border: 2px solid #999999; - border-radius: 5px; -} -div.imgarea { - text-align:center; -} - /* done */ \ No newline at end of file

1 0

Jeremy Newman : cleanup
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 40dd50d292ee77f64c81d214769cc17f42ec7218 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=40dd50d292ee77f64c81d214… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:55:41 2016 -0600 cleanup --- appdbStats.php | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/appdbStats.php b/appdbStats.php index 0915839..51ac310 100644 --- a/appdbStats.php +++ b/appdbStats.php @@ -7,90 +7,94 @@ require("path.php"); require(BASE."include/incl.php"); require_once(BASE."include/user.php"); -apidb_header("Appdb Statistics"); +apidb_header("AppDB Statistics"); -echo "<div class='default_container'>\n"; +echo "<h1 class=\"whq-app-title\">AppDB Statistics</h1>\n"; -echo html_frame_start("","60%",""); -echo "<table width='100%' border=1 cellpadding=3 cellspacing=0>\n\n"; +echo "<table class=\"whq-table\">\n"; +echo "<thead>\n"; +echo "<tr>\n"; +echo " <td>Item:</td>\n"; +echo " <td>Stat:</td>\n"; +echo "</tr>\n\n"; +echo "</thead>\n"; +echo "<tbody>\n"; /* Display the number of users */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Users:</td>\n"; echo " <td>".User::objectGetEntriesCount()."</td>\n"; echo "</tr>\n\n"; /* Display the active users in the last 30 days */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Users active within the last 30 days:</td>\n"; echo " <td>".User::active_users_within_days(30)."</td>\n"; echo "</tr>\n\n"; /* Display the active users in the last 60 days */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Users active within the last 60 days:</td>\n"; echo " <td>".User::active_users_within_days(60)."</td>\n"; echo "</tr>\n\n"; /* Display the active users in the last 90 days */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Users active within the last 90 days:</td>\n"; echo " <td>".User::active_users_within_days(90)."</td>\n"; echo "</tr>\n\n"; /* Display the inactive users */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Inactive users (not logged in since six months):</td>\n"; echo " <td>".(User::objectGetEntriesCount()- User::active_users_within_days(183))."</td>\n"; echo "</tr>\n\n"; /* Display the users who were warned and pending deletion */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Inactive users pending deletion:</td>\n"; echo " <td>".User::get_inactive_users_pending_deletion()."</td>\n"; echo "</tr>\n\n"; /* Display the number of comments */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Comments:</td>\n"; echo " <td>".getNumberOfComments()."</td>\n"; echo "</tr>\n\n"; /* Display the number of application familes */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Application families:</td>\n"; echo " <td>".application::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of versions */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Versions:</td>\n"; echo " <td>".version::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of application maintainers */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Application maintainers:</td>\n"; echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n"; echo "</tr>\n\n"; /* Display the number of test reports */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Test reports:</td>\n"; echo " <td>".testData::objectGetEntriescount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of images */ -echo "<tr class=color4>\n"; +echo "<tr>\n"; echo " <td>Screenshots:</td>\n"; echo " <td>".screenshot::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; - -echo "</table>\n\n"; -echo "</div>\n"; +echo "</tbody>\n"; +echo "</table>\n\n"; -echo html_frame_end(" "); apidb_footer(); ?>

1 0

Jeremy Newman : h1 style
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: c65d0f96169481ceb0249cb85e72e9a2dfe05abc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c65d0f96169481ceb0249cb8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:55:50 2016 -0600 h1 style --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index e128681..405acac 100644 --- a/index.php +++ b/index.php @@ -18,7 +18,7 @@ apidb_header("Wine Application Database"); <div class="row"> <div class="col-md-6 col-lg-8"> -<h1>Welcome</h1> +<h1 class="whq-app-title">Welcome</h1> <p>This is the Wine Application Database (AppDB). Here you can get information on application compatibility with Wine.</p>

1 0

Jeremy Newman : add header
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 2610d358a88298eab4f158176357f6ef4c1d51b4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2610d358a88298eab4f15817… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:57:08 2016 -0600 add header --- votestats.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/votestats.php b/votestats.php index eba3279..938ff5a 100644 --- a/votestats.php +++ b/votestats.php @@ -20,6 +20,8 @@ if(empty($aClean['iCategoryId'])) apidb_header("Vote Stats - Top ".$aClean['iTopNumber']." Applications"); +echo "<h1 class=\"whq-app-title\">Vote Stats - Top ".$aClean['iTopNumber']." Applications</h1>\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>";

1 0

Jeremy Newman : cleanup and bootstrapify the login process
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 44b4c98d6a5855fa38941134ab6e9a480f6cf4c7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=44b4c98d6a5855fa38941134… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 11:45:16 2016 -0600 cleanup and bootstrapify the login process * added a account created page * moved form_new to form_login_new --- account.php | 21 ++++++---- include/form_login.php | 93 ++++++++++++++++++++++-------------------- include/form_login_created.php | 15 +++++++ include/form_login_new.php | 44 ++++++++++++++++++++ include/form_new.php | 49 ---------------------- 5 files changed, 120 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=44b4c98d6a5855fa3894…

1 0

Jeremy Newman : set rating color on column
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 008816f6ef04b9e0866d2d5032f8f3b0b20732b2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=008816f6ef04b9e0866d2d50… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 12:03:09 2016 -0600 set rating color on column --- include/testData.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/include/testData.php b/include/testData.php index aed90c0..352428f 100644 --- a/include/testData.php +++ b/include/testData.php @@ -544,6 +544,7 @@ class testData{ $oTableRowHeader->AddTextCell("Runs?"); $oTableRowHeader->AddTextCell("Rating"); $oTableRowHeader->AddTextCell("Submitter"); + $oTableRowHeader->AddTextCell(""); $oTable->SetHeader($oTableRowHeader); return $oTable; } @@ -567,18 +568,15 @@ class testData{ if ($this->iTestingId == $iCurrentId) { $sTRClass = $bgcolor; - $oTableCell = new TableCell("<b>Current</b>"); $oTableCell->SetAlign("center"); - } else /* make all non-current rows clickable so clicking on them selects the test as current */ + } + else { - $sTRClass = $bgcolor; - + /* make all non-current rows clickable so clicking on them selects the test as current */ $sUrl = $sLink.$this->iTestingId; - if($bShowAll) $sUrl .= '&bShowAll=true'; - $oTableRowClick = new TableRowClick($sUrl); // add the table element indicating that the user can show the row by clicking on it @@ -588,29 +586,29 @@ class testData{ } $oTableRow->AddCell($oTableCell); - $oTableRow->SetClass($sTRClass); - $oTableRow->AddTextCell($oDistribution->objectMakeLink()); $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate))); $oTableRow->AddTextCell($this->sTestedRelease.' '); $oTableRow->AddTextCell($this->sInstalls.' '); $oTableRow->AddTextCell($this->sRuns.' '); - $oTableRow->AddTextCell($this->sTestedRating.' '); + $oTableCell = new TableCell($this->sTestedRating); + $oTableCell->SetClass($bgcolor); + $oTableRow->AddCell($oTableCell); $oTableRow->AddTextCell($oSubmitter->objectMakeLink().' '); if ($this->iTestingId && $_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { $oObject = new objectManager('testData'); if($oApp->canEdit()) - $shChangeParentLink = '<a href="'.$oObject->makeUrl('showChangeParent', $this->iTestingId, 'Move test report to another version').'&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Move</a>'."\n"; + $shChangeParentLink = '<a href="'.$oObject->makeUrl('showChangeParent', $this->iTestingId, 'Move test report to another version').'&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'" class="btn btn-default button-xs">Move</a>'."\n"; else $shChangeParentLink = ''; $oTableRow->AddTextCell('<a href="'.$oObject->makeUrl('edit', $this->iTestingId, - 'Edit Test Results').'&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">'. - 'Edit</a>   '."\n". + 'Edit Test Results').'&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'" class="btn btn-default button-xs">'. + 'Edit</a> '."\n". $shChangeParentLink. '<a href="'.$oObject->makeUrl('delete', $this->iTestingId, 'Delete+Test+Results'). - '&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Delete</a></td>'."\n"); + '&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'" class="btn btn-default button-xs">Delete</a></td>'."\n"); } // if this is a clickable row, set the appropriate property

1 0

Jeremy Newman : rewrite the ability for table rows to be clickable
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 89e8e071fbec44c565d7d75def2a1baa1e52af99 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=89e8e071fbec44c565d7d75d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:13:31 2016 -0600 rewrite the ability for table rows to be clickable also removed some unused js functions --- styles.css | 1 + utils.js | 42 +++++++++++------------------------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/styles.css b/styles.css index 9581b48..d9e4073 100644 --- a/styles.css +++ b/styles.css @@ -339,6 +339,7 @@ DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } .clear { clear: both; } .inline { display: inline-block; } .small { font-size: 8pt; } +.cursor-pointer { cursor: pointer; } /* IMG options */ IMG { border: 0; text-decoration: none !important; } diff --git a/utils.js b/utils.js index bb76de9..e27cf80 100644 --- a/utils.js +++ b/utils.js @@ -55,6 +55,17 @@ $(document).ready(function() }); }); + // load table row by clicking anywhere on the row + $("table").find("tr[data-donav]").each(function() + { + var sURL = $(this).data('donav'); + $(this).addClass('cursor-pointer'); + $(this).click(function() + { + document.location = sURL; + }); + }); + // remove alert messages by clicking $("#whq-alert").click(function(){ $(this).fadeOut("slow"); }); @@ -100,35 +111,4 @@ function openWin(fileToOpen,nameOfWindow,width,height) { myWindow.document.close(); } -// confirmation message (FIXME: replace with jquery utils: dialog) -function deleteURL(text, url) { - if (confirm(text)) { - self.location = url; - } -} - -// row color change -function ChangeTr(tableRow, bRowActive, sHighlightColor, sInactiveColor, - sTextDecorationHighlight, sTextDecorationInactive) -{ - if (bRowActive) - { - tableRow.style.backgroundColor = sHighlightColor; - tableRow.style.cursor = "hand"; - tableRow.style.textDecoration = sTextDecorationHighlight; - } - else - { - tableRow.style.backgroundColor = sInactiveColor; - tableRow.style.cursor = "pointer"; - tableRow.style.textDecoration = sTextDecorationInactive; - } -} - -// doNav -function DoNav(sUrl) -{ - document.location.href = sUrl; -} - // done \ No newline at end of file

1 0

Jeremy Newman : tweaks
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 0c715580706e9a27ffbd14beaf99176cb143bc6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c715580706e9a27ffbd14be… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:23:40 2016 -0600 tweaks --- votestats.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/votestats.php b/votestats.php index 938ff5a..fee042b 100644 --- a/votestats.php +++ b/votestats.php @@ -69,6 +69,7 @@ if(!empty($aClean['iCategoryId'])) /*******************************************************************/ /* add options for all of the categories that we are recursed into */ +echo "<br>\n"; echo "<b>Section:</b>"; echo '<select name="iCategoryId" class="form-control form-control-inline">'; @@ -116,8 +117,9 @@ if($subs) echo stripslashes($oSubcat->sName); } } -echo '</select>'; -echo ' <input type="submit" value="Refresh" class="btn btn-default">'; +echo "</select>\n"; +echo "<br>\n"; +echo '<button type="submit" class="btn btn-default"><i class="fa fa-refresh"></i> Refresh</button>'; echo '</form>'; /***************************************************/ @@ -164,7 +166,6 @@ if($hResult) echo html_frame_start(); $oTable = new Table(); - $oTable->setWidth("100%"); $oTable->SetClass("whq-table"); $oTableRow = new TableRow();

1 0