November 2016 - Wine-Commits

Jeremy Newman : cleanup and bootstrapify
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 : fix rating row colors
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: d3a06f4fc89cf28fbb899b6c4ffc6af7abfd5f87 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d3a06f4fc89cf28fbb899b6c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:23:09 2016 -0600 fix rating row colors --- styles.css | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/styles.css b/styles.css index fc96fb9..d9dea97 100644 --- a/styles.css +++ b/styles.css @@ -673,19 +673,36 @@ table tr.rowtitle td:last-child { .color4 { background-color: #999999 } /* Colors for supported apps table */ -.platinum {background-color: #ECECEC; } -.gold { background-color: #FFF600 } -.silver { background-color: silver; } -.bronze { background-color: #FCBA0A; } -.garbage { background-color: #999966; } +.platinum { background-color: #cccccc; } +.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.Platinum a, tr.Platinum a:visited { color: #ffcccc; } +tr.Platinum:nth-child(odd) td { background-color: #333333 !important; color: #ffffff !important; } +tr.Platinum:nth-child(even) td { background-color: #666666 !important; color: #ffffff !important; } + +tr.Gold:nth-child(odd) td { background-color: #FFF600 !important; } +tr.Gold:nth-child(even) td { background-color: #fffcb3 !important; } + +tr.Silver:nth-child(odd) td { background-color: #C0C0C0 !important; } +tr.Silver:nth-child(even) td { background-color: #e6e6e6 !important; } + +tr.Bronze:nth-child(odd) td { background-color: #FCBA0A !important; } +tr.Bronze:nth-child(even) td { background-color: #FCBA0A !important; } + +tr.Garbage:nth-child(odd) td { background-color: #999966 !important; } +tr.Garbage:nth-child(even) td { background-color: #ebebe0 !important; } /* labels */ -TD.label { font-weight: bold } +TD.label { font-weight: bold } /* for inwine/intwine */ -TD.yes { color: #00B100; font-style: italic; text-align: center } -TD.no { color: #B10000; font-style: italic; text-align: center } -TD.stub { color: #0000B1; font-style: italic; text-align: center } +TD.yes { color: #00B100; font-style: italic; text-align: center } +TD.no { color: #B10000; font-style: italic; text-align: center } +TD.stub { color: #0000B1; font-style: italic; text-align: center } /* width of the application column in the top 'X' lists on the main page */ TD.app_name { padding:10px; width: 150px }

1 0

Jeremy Newman : reformat and cleanup notes area on apps
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 2f08345a5b1f27d9abd33b879773c661427d8fdc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2f08345a5b1f27d9abd33b87… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:19:46 2016 -0600 reformat and cleanup notes area on apps --- include/note.php | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/include/note.php b/include/note.php index 1b803df..ca914ac 100644 --- a/include/note.php +++ b/include/note.php @@ -288,26 +288,15 @@ class Note { $shReturnTo = $aVars['shReturnTo']; } - $shOutput = html_frame_start("","98%",'',0); - - $shOutput .= "<table width=\"100%\" border=\"0\" cellspacing=\"0\">\n"; - $shOutput .= "<tr class=\"".$sClass."\" align=\"center\" valign=\"top\"><td> </td></tr><tr class=\"notetitle\" valign=\"top\" align=\"center\"><td>".$sTitle."</td></tr>\n"; - $shOutput .= "<tr><td class=\"note\">\n"; - $shOutput .= $this->shDescription; - $shOutput .= "</td></tr>\n"; - + $shOutput = ""; if((!$aVars || $aVars['bEditing'] != "true") && $this->canEdit()) { - $shOutput .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>"; $shOutput .= "<form method=\"post\" name=\"message\" action=\"objectManager.php?sClass=note&sAction=edit&iId=".$this->iNoteId."&sReturnTo=".urlencode($shReturnTo)."\">"; - $shOutput .= '<input type="submit" value="Edit note" class="button">'; - $shOutput .= '</form></td></tr>'; + $shOutput .= '<button type="submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> Edit note</button>'; + $shOutput .= '</form>'; } - $shOutput .= "</table>\n"; - $shOutput .= html_frame_end(); - - echo $shOutput; + echo html_note("<span class=\"note-{$sClass}\">{$sTitle}</span>", $this->shDescription, $shOutput, 'default panel-scroll'); } public static function displayNotesForEntry($iVersionId, $iAppId = null) @@ -320,8 +309,9 @@ class Note { $oApp = $oVersion->objectGetParent(); $oTag = new TagNoteVersion($iVersionId); - $aNotes = $oTag->getTaggedEntries(); - } else if($iAppId) + $aNotes = $oTag->getTaggedEntries(); + } + else if($iAppId) { $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND (versionId = '?' OR versionId = '?')", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP);

1 0

Jeremy Newman : html_note now is formatted with bootstrap panel
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 9cdeb34124e8ef6d30fc19b6a15c42bb02331b55 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9cdeb34124e8ef6d30fc19b6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:08:54 2016 -0600 html_note now is formatted with bootstrap panel --- include/html.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/html.php b/include/html.php index fe46455..3af125c 100644 --- a/include/html.php +++ b/include/html.php @@ -198,18 +198,15 @@ function make_inx_option_list($varname, $inx = null) } -/* Displays a note box */ -function html_note($shTitle, $shBody) +/* Displays a note box using bootstrap panel */ +/* mode: default, primary, success, info, warning, danger */ +function html_note($heading = '', $body = '', $footer = '', $mode = 'default') { - $shRet = '<div class="note_container">'; - $shRet .= '<div class="note_title">'; - $shRet .= $shTitle; - $shRet .= '</div>'; - $shRet .= '<div class="note_body">'; - $shRet .= $shBody; - $shRet .= '</div></div>'; - - return $shRet; + return "<div class=\"panel panel-{$mode}\">\n". + ($heading ? "<div class=\"panel-heading\">{$heading}</div>\n" : ''). + ($body ? "<div class=\"panel-body\">{$body}</div>\n" : ''). + ($footer ? "<div class=\"panel-heading\">{$footer}</div>\n" : ''). + "</div>\n"; } function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '', $bLineBreaks = true)

1 0

Andre Hentschel : Get rid of some old dead code
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 5bf8291b879f33a88029a8fc48491dcf401d6b83 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5bf8291b879f33a88029a8fc… Author: Andre Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 18 13:51:24 2016 -0600 Get rid of some old dead code --- include/appdb.php | 9 --------- include/html.php | 15 --------------- include/tableve.php | 27 --------------------------- 3 files changed, 51 deletions(-) diff --git a/include/appdb.php b/include/appdb.php index c24d94c..4a92df6 100644 --- a/include/appdb.php +++ b/include/appdb.php @@ -6,7 +6,6 @@ /* * TODO: * + replace all apidb_ calls with appdb_ - * + apidb_url and apidb_fullurl should be merged * + addmsg should be removed, and calls replaced with session->addmsg */ @@ -213,14 +212,6 @@ function appdb_clear_buffer() } /** - * return url with docroot prepended - */ -function apidb_url($path) -{ - return BASE.$path; -} - -/** * return FULL url with docroot prepended */ function apidb_fullurl($path = "") diff --git a/include/html.php b/include/html.php index cc3b309..20b359c 100644 --- a/include/html.php +++ b/include/html.php @@ -84,21 +84,6 @@ function html_ahref($label, $url, $extra = "") } } -function html_imagebutton($text, $url, $extra = "") -{ - static $i = 1; - - $i++; - $img1 = apidb_url("util/button.php?text=".urlencode($text)."&pressed=0"); - $img2 = apidb_url("util/button.php?text=".urlencode($text)."&pressed=1"); - - $java = "onMouseDown = 'document.img$i.src = \"$img2\"; return true;' "; - $java .= "onMouseUp = 'document.img$i.src = \"$img1\"; return true;' "; - - return "\n<a href=\"$url\" $extra $java>\n <img src=\"$img1\" name=\"img$i\" alt=\"$text\"> </a>\n"; -} - - function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 0) { $style = ""; diff --git a/include/tableve.php b/include/tableve.php index 9a4e11a..73a1c38 100644 --- a/include/tableve.php +++ b/include/tableve.php @@ -268,8 +268,6 @@ class TableVE { echo "$value  \n"; break; } - - $this->entry_add_extra($field, $value); } function view_entry_output_field($field, $value, $len) @@ -319,33 +317,8 @@ class TableVE { echo "$value  \n"; break; } - - $this->entry_add_extra($field, $value); } - - /* - * add extra stuff to certain fields - */ - function entry_add_extra($field, $value) - { - /* - * add extra stuff to certain fields - */ - - if($field->name == "mslink" && $value) - { - echo html_imagebutton("Go!", $value); - } - - if($field->name == "apiname") - { - echo html_imagebutton("Wine LXR", "http://twine.codeweavers.com/lxr/ident?i=$value"); - echo html_imagebutton("Wine API", "http://www.winehq.com/WineAPI/$value.html"); - } - } - - /* * required field for each table. * When editing a query this field needs to be present in the query

1 0

Jeremy Newman : cleanup html, fix link to help
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 : remove old highlight code
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 : form-control-inline should be auto width
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: dae8be61e591557506fafb446c26039a97ef865b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dae8be61e591557506fafb44… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:08:17 2016 -0600 form-control-inline should be auto width --- styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles.css b/styles.css index d00d51f..9426e95 100644 --- a/styles.css +++ b/styles.css @@ -39,7 +39,7 @@ PRE { /* make a form control inline */ input.form-control-inline { display: inline; - width: 100%; + width: auto; } select.form-control-inline { display: inline;

1 0

Jeremy Newman : merge all the stylesheets, clean up the css for tables and frames
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 4fe237e96cb9df7ca88bdebdb8502a2bc053090b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4fe237e96cb9df7ca88bdebd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 10:52:13 2016 -0600 merge all the stylesheets, clean up the css for tables and frames try to repicate the old look for now on tables, as bootstrap really changes things up. add some frame_table classes for the changes in html.php --- apidb.css | 108 ----------------- application.css | 89 -------------- include/header.php | 4 +- styles.css | 340 +++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 282 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=4fe237e96cb9df7ca88b…

1 0

Jeremy Newman : small layout tweaks
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 23130b845698e29299242be6f599b45fed865fe6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=23130b845698e29299242be6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 10:52:02 2016 -0600 small layout tweaks --- preferences.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/preferences.php b/preferences.php index 103ba72..0319225 100644 --- a/preferences.php +++ b/preferences.php @@ -180,9 +180,7 @@ if(isset($aClean['sSubmit']) && $aClean['sSubmit'] == "Update") } } -apidb_header("User Preferences"); - -echo "<div class='default_container'>\n"; +apidb_header(); echo "<form method=\"post\" action=\"preferences.php\">\n"; @@ -195,7 +193,7 @@ if( isset($aClean['iUserId']) && $oUser->iUserId == $aClean['iUserId']) echo "<input type=\"hidden\" name=\"iUserId\" value=\"".$aClean['iUserId']."\">\n"; } -echo html_frame_start("Preferences for ".$oUser->sRealname, "80%"); +echo html_frame_start("Preferences for ".$oUser->sRealname); // build a table $oTable = new Table(); @@ -226,10 +224,9 @@ if( !isset($aClean['iUserId']) || $oUser->iUserId != $aClean['iUserId']) echo $oTable->GetString(); echo html_frame_end(); -echo "<br> <div align=center> <input type=\"submit\" name='sSubmit' value=\"Update\"> </div> <br>\n"; +echo "<div><input type=\"submit\" name='sSubmit' value=\"Update\" class=\"btn btn-primary\"></div>\n"; echo "</form>\n"; -echo "</div>\n"; apidb_footer(); ?>

1 0