November 2016 - Wine-Commits

Jeremy Newman : each menu block is a ul
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 137606e6b945ffe2de33fbab14103ed69935841b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=137606e6b945ffe2de33fbab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 09:46:14 2016 -0600 each menu block is a ul note: not sure why a oTable call was here, so removed it --- include/htmlmenu.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/htmlmenu.php b/include/htmlmenu.php index 3bb9222..4ad542b 100644 --- a/include/htmlmenu.php +++ b/include/htmlmenu.php @@ -10,14 +10,13 @@ class htmlmenu { if (!empty($form)) echo "<form action=\"$form\" method=\"post\">\n"; + echo '<ul>'; echo '<li class="top"><p>'.$name.'</p></li>'; } // add a table row public function add($sName, $shUrl = null, $sAlign = "left") { - $oTableRow = new TableRow(); - if($shUrl) { echo "<li><p><a href=\"{$shUrl}\">{$sName}</a></p></li>\n"; @@ -37,8 +36,7 @@ class htmlmenu // menu complete public function done($form = null) { - echo '<li class="bot"></li>'; - + echo '</ul>'; if (!empty($form)) echo "</form>\n"; }

1 0

Jeremy Newman : improve category breadcrumb bar
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 Nov. 21, 2016

Nov. 21, 2016

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

1 0

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

Nov. 21, 2016

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

1 0

Jeremy Newman : boostrapify and cleanup html
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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

1 0

Jeremy Newman : wrap body in container fluid
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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

1 0

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

Nov. 21, 2016

Module: appdb Branch: master Commit: 4d982243bb797e1b8754d849e59e6428adb9d4a8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4d982243bb797e1b8754d849… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 09:43:23 2016 -0600 cleanup and bootstrapify --- include/db_filter_ui.php | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index 4c71465..f0d2b33 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -174,7 +174,7 @@ class FilterInterface $sId = $iId; $shEditor = "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$oFilter->getOperatorId()}\">"; - $shEditor .= "<input type=\"hidden\" name=\"s{$sColumn}Data$sId\" value=\"{$oFilter->getData()}\" />"; + $shEditor .= "<input type=\"hidden\" name=\"s{$sColumn}Data$sId\" value=\"{$oFilter->getData()}\">"; return $shEditor; } @@ -198,14 +198,14 @@ class FilterInterface $sData = $oFilter->getData(); } - $shRet = "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"$iOp\" />"; + $shRet = "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"$iOp\">"; if($sData == 'true') $sChecked = ' checked="checked"'; else $sChecked = ''; - $shRet .= "<input value=\"true\" $sChecked name=\"s{$sColumn}Data$sId\" type=\"checkbox\" />"; + $shRet .= "<input value=\"true\" $sChecked name=\"s{$sColumn}Data$sId\" type=\"checkbox\">"; $shRet .= ' '.$oColumn->getDisplayName(); return $shRet; @@ -225,14 +225,14 @@ class FilterInterface If the filter is already active then there are more than one; one to remove */ if($iId == -1 && sizeof($aTypes) == 1) { - echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />"; + echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\">"; /* Printing 'equal to' sounds weird if it is the only choice */ if($aTypes[0] != FILTER_EQUALS) $shEditor .= $oColumn->getOpName($aTypes[0]); } else if ($aTypes[0] != FILTER_OPTION_ENUM) { - $shEditor .= "<select name='i{$sColumn}Op$sId'>"; + $shEditor .= "<select name='i{$sColumn}Op$sId' class='form-control form-control-inline'>"; if($iId != -1) { @@ -248,18 +248,18 @@ class FilterInterface $sSel = " selected='selected'"; else $sSel = ''; - $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br />'; + $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br>'; } $shEditor .= '</select> '; } else { - echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />"; + echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\">"; } switch($oColumn->getValueType()) { case FILTER_VALUES_NORMAL: - $shEditor .= "<input type='text' value=\"{$oFilter->getData()}\" name='s{$sColumn}Data$sId' size='30' />"; + $shEditor .= "<input type='text' value=\"{$oFilter->getData()}\" name='s{$sColumn}Data$sId' size='30' class='form-control form-control-inline'>"; break; case FILTER_VALUES_ENUM: case FILTER_VALUES_OPTION_ENUM: @@ -278,7 +278,7 @@ class FilterInterface $sData = $oFilter->getData(); - $shEditor = "<select name=\"s{$sColumn}Data$sId\">"; + $shEditor = "<select name=\"s{$sColumn}Data$sId\" class=\"form-control form-control-inline\">"; if($sData) $shEditor .= "<option value=\"\">-- remove --</option>"; @@ -314,7 +314,7 @@ class FilterInterface $shEditor .= $this->getUrlElement($aCounts[$sColumn], $oFilter); - $shEditor .= '<br />'; + $shEditor .= '<br>'; $aCounts[$sColumn]++; } @@ -337,7 +337,7 @@ class FilterInterface $shEditor .= $this->getHiddenInputTag($aCounts[$sColumn], $oFilter); - $shEditor .= '<br />'; + $shEditor .= '<br>'; $aCounts[$sColumn]++; } @@ -352,7 +352,7 @@ class FilterInterface $aCounts = array(); if(sizeof($this->oFilterSet->getFilters())) - $shCurrentItemsEditor .= '<br /><b>Active filters</b><br />'; + $shCurrentItemsEditor .= '<p><b>Active filters</b></p>'; foreach($this->oFilterSet->getFilters() as $oFilter) { $sColumn = $oFilter->getColumn(); @@ -364,16 +364,14 @@ class FilterInterface $shCurrentItemsEditor .= $this->getOptionBoolEditor($aCounts[$sColumn], $oFilter); else $shCurrentItemsEditor .= $this->getItemEditor($aCounts[$sColumn], $oFilter); - $shCurrentItemsEditor .= '<br />'; + $shCurrentItemsEditor .= '<br>'; $aCounts[$sColumn]++; } - $shNewItemsEditor .= '<b>Add new filter</b> <i>(You don’t have to fill out all rows.)</i><br />'; - /* Show errors, if any */ if($this->sErrors) - $shNewItemsEditor .= "<font color=\"red\">{$this->sErrors}</font>"; + $shNewItemsEditor .= "<span color=\"text-danger\">{$this->sErrors}</span>"; foreach($this->aFilterInfo as $oOption) { @@ -384,14 +382,14 @@ class FilterInterface { if(!array_key_exists($oOption->getColumn(), $aCounts)) $shNewItemsEditor .= $this->getOptionBoolEditor(-1, $oDummyFilter); - $shNewItemsEditor .= '<br />'; + $shNewItemsEditor .= '<br>'; } else { /* Make necessary checks for filters that are only supposed to be shown once */ if($oOption->getValueType() != FILTER_VALUES_OPTION_ENUM || !array_key_exists($oOption->getColumn(), $aCounts)) { $shNewItemsEditor .= $this->getItemEditor(-1, $oDummyFilter); - $shNewItemsEditor .= '<br />'; + $shNewItemsEditor .= '<br>'; } } } @@ -463,7 +461,7 @@ class FilterInterface { /* The user probably meant to add a filter, but forgot to seelect a filter criterion */ - $this->sErrors .= 'You need to select a filter criterion from the drop-down list<br />'; + $this->sErrors .= 'You need to select a filter criterion from the drop-down list<br>'; } }

1 0

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

Nov. 21, 2016

Module: appdb Branch: master Commit: 3576723f460db58de77ccec3483fd7a0b771122d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3576723f460db58de77ccec3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 09:27:26 2016 -0600 cleanup and bootstrapify --- index.php | 62 +++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/index.php b/index.php index 6fe93e3..e128681 100644 --- a/index.php +++ b/index.php @@ -14,13 +14,17 @@ require(BASE."include/incl.php"); apidb_header("Wine Application Database"); ?> - <img style="float:right;" src="images/appdb_montage.jpg" width=391 height=266 alt="Wine AppDB"> + +<div class="row"> + <div class="col-md-6 col-lg-8"> <h1>Welcome</h1> <p>This is the Wine Application Database (AppDB). Here you can get information on application compatibility with Wine.</p> + <?php + $str_benefits=" <ul> <li>Ability to <a href=\"https://wiki.winehq.org/AppDB_Voting_Help\" title=\"help on voting\">vote</a> on your favorite applications</li> @@ -32,21 +36,22 @@ $str_benefits=" <li>Submit new screenshots</li> </ul> "; -if(!$_SESSION['current']->isLoggedIn()) + +if (!$_SESSION['current']->isLoggedIn()) { - echo " - <p>Most of the features of the Application Database require that you have a user account and - are logged in. Some of the benefits of membership are:<p> + echo "<p>Most of the features of the Application Database require that you have a user account and + are logged in. Some of the benefits of membership are:</p> $str_benefits - <p>So, what are you waiting for? [<a href=\"".login_url()."\">Log in</a>] - or [<a href=\"account.php?sCmd=new\">register</a>] now! Your help in + <p>So, what are you waiting for? <a href=\"".login_url()."\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-sign-in\"></i> Log in</a> + or <a href=\"account.php?sCmd=new\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-user-plus\"></i> register</a> now! Your help in stomping out Wine issues will be greatly appreciated.</p>"; -} else +} +else { echo " - <p>As an Application Database member you enjoy some exclusive benefits like:<p> + <p>As an Application Database member you enjoy some exclusive benefits like:</p> $str_benefits @@ -66,27 +71,34 @@ if(!$_SESSION['current']->isLoggedIn()) $hResult = query_parameters($voteQuery); $oRow = query_fetch_object($hResult); - echo "There are <b>$iNumApps</b> applications currently in the database,"; + echo "<p>There are <b>$iNumApps</b> applications currently in the database,\n"; // don't mention the top application if there are no votes yet - if( !empty($oRow) ) + if (!empty($oRow)) { if($oRow->versionId) { $shVoteAppLink = version::fullNameLink($oRow->versionId); echo " with $shVoteAppLink being the\n"; echo "top <a href='votestats.php'>voted</a> application.\n"; - } 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 "</p>\n"; ?> -<br><br> +</div> + <div class="col-md-6 col-lg-4"> + <img src="images/appdb_montage.jpg" class="fill-width" alt="Wine AppDB"> + </div> +</div> -<div class="topx_style platinum"> +<div class="row topx_style platinum"> <div class="rating_header"> <div class="rating_title"> Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Platinum&sOrderBy=appName&bAscending=true">Platinum</a> List @@ -95,18 +107,22 @@ if(!$_SESSION['current']->isLoggedIn()) </div> <div> <table class="platinum" width="100%"> + <thead> <tr class="rowtitle"> - <th width="10%">Application</th><th width="80%">Description</th><th width="10%">Screenshot</th> + <td width="10%">Application</td><td width="80%">Description</td><td width="10%">Screenshot</td> </tr> + </thead> + <tbody> <?php outputTopXRowAppsFromRating('Platinum', 10); ?> + </tbody> </table> </div> </div> <br> -<div class="topx_style gold"> +<div class="row topx_style gold"> <div class="rating_header"> <div class="rating_title"> Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Gold&sOrderBy=appName&bAscending=true">Gold</a> List @@ -115,18 +131,22 @@ if(!$_SESSION['current']->isLoggedIn()) </div> <div> <table class="gold" width="100%"> + <thead> <tr class="rowtitle"> - <th width="10%">Application</th><th width="80%">Description</th><th width="10%">Screenshot</th> + <td width="10%">Application</td><td width="80%">Description</td><td width="10%">Screenshot</td> </tr> + </thead> + <tbody> <?php outputTopXRowAppsFromRating('Gold', 10); ?> + </tbody> </table> </div> </div> <br> -<div class="topx_style silver"> +<div class="row topx_style silver"> <div class="rating_header"> <div class="rating_title"> Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Silver&sOrderBy=appName&bAscending=true">Silver</a> List @@ -135,12 +155,16 @@ if(!$_SESSION['current']->isLoggedIn()) </div> <div> <table class="silver" width="100%"> + <thead> <tr class="rowtitle"> - <th width="10%">Application</th><th width="80%">Description</th><th width="10%">Screenshot</th> + <td width="10%">Application</td><td width="80%">Description</td><td width="10%">Screenshot</td> </tr> + </thead> + <tbody> <?php outputTopXRowAppsFromRating('Silver', 10); ?> + </tbody> </table> </div> </div>

1 0

Jeremy Newman : clean up table styles, add some bootstrap overrides.
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 2aa8c7b5df8c3cc115fdfe049f6a3acd826e374f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2aa8c7b5df8c3cc115fdfe04… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 09:26:53 2016 -0600 clean up table styles, add some bootstrap overrides. --- styles.css | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/styles.css b/styles.css index e895532..d00d51f 100644 --- a/styles.css +++ b/styles.css @@ -9,6 +9,10 @@ ===================================================================================================================== */ +HTML { + height: 100%; +} + /* Body Document Defaults */ BODY { background-color: #000000 !important; @@ -22,7 +26,7 @@ BODY { /* ===================================================================================================================== - bootstrap tweaks + bootstrap tweaks, bs is awesome, but there are a few tweaks needed. ===================================================================================================================== */ @@ -32,6 +36,27 @@ PRE { border: none; border-radius: none; } +/* make a form control inline */ +input.form-control-inline { + display: inline; + width: 100%; +} +select.form-control-inline { + display: inline; + width: auto; +} + +/* thin buttons, good for inline */ +.btn-skinny { + padding-top: 0.15em !important; + padding-bottom: 0.15em !important; +} + +/* fix button text on a tags */ +a.btn, a.btn:visited { + color: inherit; +} + /* ===================================================================================================================== PAGE LAYOUT @@ -300,9 +325,13 @@ P.newstitle A:hover { color: #FF6666; text-decoration: none; } DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } /* stuff */ -img { border: 0; } .clear { clear: both; } +/* IMG options */ +IMG { border: 0; text-decoration: none !important; } +IMG.absmiddle { vertical-align: top; } +IMG.fill-width { width: 100%; } + /* Link Colors */ A { color: #A50D0D; } A:visited { color: #FF0000; } @@ -458,7 +487,42 @@ table { border-spacing: 0.25em; border-collapse: separate; } -table td { padding: 0.25em; } +table td { + padding: 0.25em; +} + +/* wine hq table style */ +table.whq-table { + border-spacing: 0.25em; + border-collapse: separate; +} +table.whq-table-full { + width: 100%; +} +table.winehq td { + padding: 0.25em; +} +table.whq-table thead tr td { + background-color: #95493A; + border: 1px solid #732010; + font-weight: bold; + color: #ffffff; +} +table.whq-table thead tr td a { + color: #ffffff; +} +table.whq-table thead tr td:first-child { + border-top-left-radius: 5px; +} +table.whq-table thead tr td:last-child { + border-top-right-radius: 5px; +} +table.whq-table tbody tr td { + background-color: #ffffff; +} +table.whq-table tbody tr:nth-child(odd) td { + background-color: #ddd; +} /* box */ .box-title { @@ -503,7 +567,19 @@ TD.button { background-color: #BDDAE5 } TD.button2 { background-color: #ABB2D5; } /* misc table styles */ -.rowtitle { background-color: black; color: white; font-weight: bold; } +table tr.rowtitle td { + background-color: #95493A; + border: 1px solid #732010; + font-weight: bold; + color: #ffffff; + padding: 0.25em; +} +table tr.rowtitle td:first-child { + border-top-left-radius: 5px; +} +table tr.rowtitle td:last-child { + border-top-right-radius: 5px; +} /* misc backgrounds from color name */ .white { background-color: #FFFFFF; } @@ -620,10 +696,14 @@ div.session_note { border: 1px solid; margin-bottom: 5px;} /* 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; } -div.imgarea { text-align:center; text-align:center; - margin-top:0px; - margin-bottom:0px; - padding:0px;} +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 : remove old design images, will load directly from main site in new deisgn
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: db6ddc55db28b3ad1385b8ca4647f978c137e1b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=db6ddc55db28b3ad1385b8ca… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 08:57:27 2016 -0600 remove old design images, will load directly from main site in new deisgn --- images/bg.jpg | Bin 86167 -> 0 bytes images/cw_logo_sm.png | Bin 4383 -> 0 bytes images/side_menu_bg.png | Bin 226 -> 0 bytes images/side_menu_bot.png | Bin 564 -> 0 bytes images/side_menu_top.png | Bin 3287 -> 0 bytes images/tab_h.png | Bin 584 -> 0 bytes images/tab_s.png | Bin 614 -> 0 bytes images/tab_u.png | Bin 616 -> 0 bytes images/winehq_logo_glass_sm.png | Bin 14291 -> 0 bytes images/winehq_logo_text.png | Bin 6870 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/bg.jpg b/images/bg.jpg deleted file mode 100644 index 16bb0b5..0000000 Binary files a/images/bg.jpg and /dev/null differ diff --git a/images/cw_logo_sm.png b/images/cw_logo_sm.png deleted file mode 100644 index 3099535..0000000 Binary files a/images/cw_logo_sm.png and /dev/null differ diff --git a/images/side_menu_bg.png b/images/side_menu_bg.png deleted file mode 100644 index c8cbcc0..0000000 Binary files a/images/side_menu_bg.png and /dev/null differ diff --git a/images/side_menu_bot.png b/images/side_menu_bot.png deleted file mode 100644 index 8bc9b5d..0000000 Binary files a/images/side_menu_bot.png and /dev/null differ diff --git a/images/side_menu_top.png b/images/side_menu_top.png deleted file mode 100644 index 047c4c0..0000000 Binary files a/images/side_menu_top.png and /dev/null differ diff --git a/images/tab_h.png b/images/tab_h.png deleted file mode 100644 index 59620cd..0000000 Binary files a/images/tab_h.png and /dev/null differ diff --git a/images/tab_s.png b/images/tab_s.png deleted file mode 100644 index 54d367b..0000000 Binary files a/images/tab_s.png and /dev/null differ diff --git a/images/tab_u.png b/images/tab_u.png deleted file mode 100644 index ff84b7a..0000000 Binary files a/images/tab_u.png and /dev/null differ diff --git a/images/winehq_logo_glass_sm.png b/images/winehq_logo_glass_sm.png deleted file mode 100644 index 949334b..0000000 Binary files a/images/winehq_logo_glass_sm.png and /dev/null differ diff --git a/images/winehq_logo_text.png b/images/winehq_logo_text.png deleted file mode 100644 index 29b6ecb..0000000 Binary files a/images/winehq_logo_text.png and /dev/null differ

1 0