wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Jeremy Newman : new layout for apps and app versions, bootstrapify and reformat
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: a347cc3ef3a4d9043f64307c7993af1ce1b47397 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a347cc3ef3a4d9043f64307c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:20:02 2016 -0600 new layout for apps and app versions, bootstrapify and reformat --- include/application.php | 156 ++++++++++---------- include/version.php | 370 +++++++++++++++++++++++------------------------- styles.css | 84 ++++++++++- 3 files changed, 340 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=a347cc3ef3a4d9043f64…

1 0

Jeremy Newman : reformat and cleanup notes area on apps
by Jeremy Newman 21 Nov '16

21 Nov '16

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 : cleanup embedded test data table for apps
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 44b6bbed9e472cb679a7d340b840e26fe3cd5eb7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=44b6bbed9e472cb679a7d340… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:19:25 2016 -0600 cleanup embedded test data table for apps --- include/testData.php | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/include/testData.php b/include/testData.php index 326de0c..aed90c0 100644 --- a/include/testData.php +++ b/include/testData.php @@ -521,28 +521,17 @@ class testData{ function ShowTestResult() { - echo '<p><b>What works</b><br>',"\n"; - echo $this->shWhatWorks,"\n"; - echo '<p><br><b>What does not</b><br>',"\n"; - echo $this->shWhatDoesnt,"\n"; - echo '<p><br><b>What was not tested</b><br>',"\n"; - echo $this->shWhatNotTested,"\n"; - echo '<p><br><b>Additional Comments</b><br><pre>',"\n"; - echo $this->sComments,"\n"; - echo '</pre>',"\n"; + return "<p><b>What works</b></p>\n<p>{$this->shWhatWorks}</p>\n". + "<p><b>What does not</b></p>\n<p>{$this->shWhatDoesnt}</p>\n". + "<p><b>What was not tested</b></p>\n<p>{$this->shWhatNotTested}</p>\n". + "<p><b>Additional Comments</b></p>\n<pre>{$this->sComments}</pre>\n"; } function CreateTestTable() { - echo '<div class="info_container">',"\n"; - echo '<div class="title_class">Test Results</div>',"\n"; - echo '<div class="info_contents">',"\n"; - // create the table $oTable = new Table(); - $oTable->SetClass("historyTable"); - $oTable->SetBorder(1); - $oTable->SetWidth("100%"); + $oTable->SetClass("whq-table whq-table-full"); // setup the table header $oTableRowHeader = new TableRow(); @@ -556,7 +545,6 @@ class testData{ $oTableRowHeader->AddTextCell("Rating"); $oTableRowHeader->AddTextCell("Submitter"); $oTable->SetHeader($oTableRowHeader); - return $oTable; } @@ -679,31 +667,25 @@ class testData{ $iIndex++; } - echo $oTable->GetString(); - - echo '<br>',"\n"; // put a space after the test results table and the button - - echo '<form method=get action="objectManager.php">'."\n"; + $output = ""; + $output .= $oTable->GetString(); + $output .= '<form method="get" action="objectManager.php">'."\n"; if($rowsUsed >= $iDisplayLimit && $bShowAll) { - $sShowButtonText = "Limit to $iDisplayLimit tests"; - } else + $sShowButtonText = "Limit to <b>$iDisplayLimit</b> tests"; + } + else { $sShowButtonText = "Show all tests"; - echo '<input type="hidden" name="bShowAll" value="true">'; + $output .= '<input type="hidden" name="bShowAll" value="true">'; } $oManager = new objectManager("version", null, $this->iVersionId); - - echo $oManager->makeUrlFormData(); - - echo "\t".'<input class="button" type=submit value="'.$sShowButtonText.'">'."\n"; - - echo '</form>'."\n"; - - echo '</div>',"\n"; // end of the 'info_contents' div - echo '</div>',"\n"; // end of the 'info_container' div + $output .= $oManager->makeUrlFormData(); + $output .= '<button type="submit" class="btn btn-default">'.$sShowButtonText."</button>\n"; + $output .= "</form>\n"; + return $output; } /* Convert a given rating string to a numeric scale */

1 0

Jeremy Newman : cleanup embedded bugs table
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 8f95f82c88bfe71a21f08b26c0403dfc6d85524c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f95f82c88bfe71a21f08b26… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:19:05 2016 -0600 cleanup embedded bugs table --- include/bugs.php | 81 ++++++++++++++++++++++---------------------------------- 1 file changed, 32 insertions(+), 49 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index bc30ab8..b93b077 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -722,99 +722,82 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) } //start format table - if($_SESSION['current']->isLoggedIn()) - { - echo "<form method=post action='".APPDB_ROOT."objectManager.php'>\n"; - } - echo html_frame_start("Known bugs","98%",'',0); - echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; - echo "<tr class=color4>\n"; - echo " <td align=center width=\"80\">Bug #</td>\n"; + echo "<table class=\"whq-table whq-table-full\">\n\n"; + echo "<thead><tr>\n"; + echo " <td class=\"text-center\" width=\"80\">Bug #</td>\n"; echo " <td>Description</td>\n"; - echo " <td align=center width=\"80\">Status</td>\n"; - echo " <td align=center width=\"80\">Resolution</td>\n"; - echo " <td align=center width=\"80\">Other apps affected</td>\n"; + echo " <td class=\"text-center\" width=\"80\">Status</td>\n"; + echo " <td class=\"text-center\" width=\"80\">Resolution</td>\n"; + echo " <td class=\"text-center\" width=\"80\">Other apps affected</td>\n"; if($bCanEdit == true) { - echo " <td align=center width=\"80\">Delete</td>\n"; - echo " <td align=center width=\"80\">Checked</td>\n"; + echo " <td class=\"text-center\"width=\"80\">Delete</td>\n"; + echo " <td class=\"text-center\"width=\"80\">Checked</td>\n"; } - echo "</tr>\n\n"; + echo "</tr></thead><tbody>\n\n"; - $c = 0; foreach($aBuglinkIds as $iBuglinkId) { $oBuglink = new Bug($iBuglinkId); - if ( - (!isset($aClean['sAllBugs']) && $oBuglink->isOpen() ) - || - isset($aClean['sAllBugs']) - ) + if ((!isset($aClean['sAllBugs']) && $oBuglink->isOpen() ) || isset($aClean['sAllBugs'])) { - // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - //display row - echo "<tr class=$bgcolor>\n"; - echo "<td align=center><a href='".BUGZILLA_ROOT."show_bug.cgi?id=".$oBuglink->iBug_id."'>".$oBuglink->iBug_id."</a></td>\n"; + echo "<tr>\n"; + echo "<td class=\"text-center\"><a href='".BUGZILLA_ROOT."show_bug.cgi?id={$oBuglink->iBug_id}><i class=\"fa fa-bug\"></i> {$oBuglink->iBug_id}</a></td>\n"; echo "<td>".$oBuglink->sShort_desc."</td>\n"; - echo "<td align=center>".$oBuglink->sBug_status."</td>","\n"; - echo "<td align=center>".$oBuglink->sResolution."</td>","\n"; - echo "<td align=center><a href='viewbugs.php?bug_id=".$oBuglink->iBug_id."'>View</a></td>\n"; - - + echo "<td class=\"text-center\">".$oBuglink->sBug_status."</td>","\n"; + echo "<td class=\"text-center\">".$oBuglink->sResolution."</td>","\n"; + echo "<td class=\"text-center\"><a href=\"viewbugs.php?bug_id={$oBuglink->iBug_id}\" class=\"btn btn-default\">View</a></td>\n"; + if($bCanEdit == true) { $oM = new objectManager("bug"); $oM->setReturnTo($oVersion->objectMakeUrl()); - echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete'>delete</a>]</td>\n"; + echo "<td class=\"text-center\"><a href=\"".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete\" class=\"btn btn-default btn-skinny\"><i class=\"fa fa-trash-o\"></i></a></td>\n"; if ($oBuglink->bQueued) { - echo "<td align=center>[<a href='".$oM->makeUrl("edit", $oBuglink->iLinkId)."&sSubmit=Submit&bIsQueue=true'>OK</a>]</td>\n"; - } else + echo "<td class=\"text-center\"><a href=\"".$oM->makeUrl("edit", $oBuglink->iLinkId)."&sSubmit=Submit&bIsQueue=true\" class=\"btn btn-default btn-skinny\"><i class=\"fa fa-check\"></i></a></td>\n"; + } + else { - echo "<td align=center>Yes</td>\n"; + echo "<td class=\"text-center\">Yes</td>\n"; } } echo "</tr>\n\n"; - - - $c++; } } + echo '</tbody></table>',"\n"; + if($_SESSION['current']->isLoggedIn()) { + echo "<form method=post action='".APPDB_ROOT."objectManager.php'>\n"; echo '<input type="hidden" name="iVersionId" value="'.$iVersionId.'">',"\n"; - echo '<tr class=color3><td align=center>',"\n"; $sBuglinkId = isset($aClean['buglinkId']) ? $aClean['buglinkId'] : ''; - echo '<input type="text" name="iBuglinkId" value="'.$sBuglinkId.'" size="8"></td>',"\n"; + echo '<input type="text" name="iBuglinkId" value="'.$sBuglinkId.'" size="8">',"\n"; echo '<input type="hidden" name="sSubmit" value="Submit">',"\n"; echo '<input type="hidden" name="sClass" value="bug">',"\n"; echo '<input type="hidden" name="sReturnTo" value="'.$oVersion->objectMakeUrl().'">',"\n"; - echo '<td><input type="submit" name="sSub" value="Submit a new bug link."></td>',"\n"; - echo '<td colspan=6></td></tr></form>',"\n"; + echo '<button type="submit" name="sSub" class="btn btn-default"><i class=\"fa fa-bug\"></i> Submit a new bug link</button>',"\n"; + echo '</form>',"\n"; } - echo '</table>',"\n"; // show only open link if ( isset( $aClean['sAllBugs'] ) ) { - $sURL = str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'] ); - $sLink = '<a href="' . htmlentities($sURL) . '">Show open bugs</a>'; + $sURL = htmlentities(str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'])); + $sLink = "<a href=\"{$sURL}\" class=\"btn btn-default\"><i class=\"fa fa-bug\"></i> Show <b>open</b> bugs</a>"; } // show all link else { - $sURL = $_SERVER['REQUEST_URI'] . '&sAllBugs'; - $sLink = '<a href="' . htmlentities($sURL) . '">Show all bugs</a>'; + $sURL = htmlentities($_SERVER['REQUEST_URI'] . '&sAllBugs'); + $sLink = "<a href=\"{$sURL}\" class=\"btn btn-default\"><i class=\"fa fa-bug\"></i> Show <b>all</b> bugs</a>"; } - - echo '<div style="text-align:right;">' . $sLink .'</div>'; - echo html_frame_end(); + echo "<p>{$sLink}</p>\n"; } ?>

1 0

Jeremy Newman : html_note now is formatted with bootstrap panel
by Jeremy Newman 21 Nov '16

21 Nov '16

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

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 : 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 : 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 : 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 : 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

← Newer
1
...
17
18
19
20
21
22
23
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016