wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

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 : 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 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 : make rating just the column color not the entire row
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 28bb4dde054e6c0b601c674cd36e13092fa00bd8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=28bb4dde054e6c0b601c674c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:40:07 2016 -0600 make rating just the column color not the entire row this simply looks better to me ;) --- styles.css | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/styles.css b/styles.css index d9dea97..20fdcaa 100644 --- a/styles.css +++ b/styles.css @@ -673,28 +673,27 @@ table tr.rowtitle td:last-child { .color4 { background-color: #999999 } /* Colors for supported apps table */ -.platinum { background-color: #cccccc; } +.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.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: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; } -tr.Gold:nth-child(odd) td { background-color: #FFF600 !important; } -tr.Gold:nth-child(even) td { background-color: #fffcb3 !important; } +tr:nth-child(odd) td.Gold { background-color: #FFF600 !important; } +tr:nth-child(even) td.Gold { 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:nth-child(odd) td.Silver { background-color: #C0C0C0 !important; } +tr:nth-child(even) td.Silver { 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:nth-child(odd) td.Bronze { background-color: #FCBA0A !important; } +tr:nth-child(even) td.Bronze { background-color: #FCBA0A !important; } -tr.Garbage:nth-child(odd) td { background-color: #999966 !important; } -tr.Garbage:nth-child(even) td { background-color: #ebebe0 !important; } +tr:nth-child(odd) td.Garbage { background-color: #999966 !important; } +tr:nth-child(even) td.Garbage { background-color: #ebebe0 !important; } /* labels */ TD.label { font-weight: bold }

1 0

Jeremy Newman : fix rating row colors
by Jeremy Newman 21 Nov '16

21 Nov '16

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 : cleanup and add icons to a few more buttons
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 27f8d829cae8dede5a3ac69dc65e8e60438c0e6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=27f8d829cae8dede5a3ac69d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 10:04:17 2016 -0600 cleanup and add icons to a few more buttons --- include/application.php | 4 ++-- include/objectManager.php | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/application.php b/include/application.php index 1817545..febc92d 100644 --- a/include/application.php +++ b/include/application.php @@ -830,7 +830,7 @@ class Application { { $mtrscmds .= '<form method="post" name="sEdit" action="admin/editAppFamily.php">'. '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">'. - '<input type="submit" value="Edit Application" class="btn btn-default"></form>'. + '<input type="submit" value="Edit Application" class="btn btn-default btn-sm btn-skinny"></form>'. '<form method="post" action="objectManager.php?sClass=note&sAction=add&sTitle=Add+note&iAppId='.$this->iAppId.'&sNoteTitle=HOWTO&sReturnTo='.urlencode($this->objectMakeUrl()).'">'. '<input type="submit" value="Add note/how-to" class="btn btn-default btn-sm btn-skinny">'. '</form>'; @@ -846,7 +846,7 @@ class Application { if($_SESSION['current']->hasPriv("admin")) { $url = BASE."objectManager.php?sClass=application&bIsQueue=false&sAction=delete&iId=".$this->iAppId; - $mtrscmds .= "<form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete app\" class=\"btn btn-default\"></form>"; + $mtrscmds .= "<form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete app\" class=\"btn btn-default btn-sm btn-skinny\"></form>"; $mtrscmds .= '<form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit bundle" class="btn btn-default btn-sm btn-skinny"></form>'; } } else diff --git a/include/objectManager.php b/include/objectManager.php index 528a65c..126dfac 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -218,7 +218,7 @@ class ObjectManager '" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> delete</a>'; } - $oTableCell = new TableCell('<a href="'.$this->makeUrl("edit", $oObject->objectGetId()). + $oTableCell = new TableCell('<a href="'.$this->makeUrl("edit", $oObject->objectGetId()).'" '. 'class="btn btn-default btn-sm"><i class="fa fa-pencil-square-o"></i> '.$sEditLinkLabel.'</a>'.$shDeleteLink); $this->oTableRow->AddCell($oTableCell); } @@ -310,10 +310,8 @@ class ObjectManager /* Show a link to the 'purge rejected entries' page if we are an admin */ if($_SESSION['current']->hasPriv('admin') && $this->getOptionalSetting('objectAllowPurgingRejected', FALSE)) { - echo '<div class="text-center">'; $oM = new objectManager($this->sClass, 'Purge Rejected Entries'); - echo '<a href="'.$oM->makeUrl('purgeRejected').'">Purge rejected entries</a>'; - echo '</div>'; + echo '<p><a href="'.$oM->makeUrl('purgeRejected').'" class="btn btn-default"><i class="fa fa-recycle"></i> Purge rejected entries</a></p>'; } $sQueued = $this->getQueueString($this->getIsQueue(), $this->sState == 'rejected'); @@ -331,7 +329,7 @@ class ObjectManager if($oObject->canEdit() && $this->GetOptionalSetting("objectShowAddEntry", FALSE)) { echo "<p><a href=\"".$this->makeUrl("add", false, - "Add $this->sClass")."\">Add entry</a></p>\n"; + "Add $this->sClass")."\" class=\"btn btn-default\"><i class=\"fa fa-plus-square-o\"></i> Add entry</a></p>\n"; } // Display bottom of page selectors current page, if applicable @@ -1213,7 +1211,7 @@ class ObjectManager } } echo "<a href=\"".$this->makeUrl("showChangeParent", $this->iId, - "Move to another parent entry")."\">$sLinkText</a>\n"; + "Move to another parent entry")."\" class=\"btn btn-default\"><i class=\"fa fa-arrows-alt\"></i> $sLinkText</a>\n"; } } @@ -1226,7 +1224,7 @@ class ObjectManager method_exists($oObject, "objectGetId") && $oObject->canEdit()) { echo "<a href=\"".$this->makeUrl("showMoveChildren", $this->iId, - "Move Child Objects")."\">Move child objects</a>\n"; + "Move Child Objects")."\" class=\"btn btn-default\"><i class=\"fa fa-arrows\"></i> Move child objects</a>\n"; return true; } @@ -1319,7 +1317,7 @@ class ObjectManager // display the move children entry if($this->displayMoveChildren($oObject)) - echo "     "; + echo " "; $this->displayChangeParent($oObject); if(!$aVars) @@ -1327,12 +1325,12 @@ class ObjectManager else $oObject->display($aVars); + echo html_back_link(1, $sBackLink); + // display the move children entry if($this->displayMoveChildren($oObject)) - echo "     "; + echo " "; $this->displayChangeParent($oObject); - - echo html_back_link(1, $sBackLink); } /* Process form data generated by adding or updating an entry */

1 0

Jeremy Newman : update forms for new post, and post reply
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: f443d90e7ce3d765188d9b9104d131fabf58daf5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f443d90e7ce3d765188d9b91… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 09:51:45 2016 -0600 update forms for new post, and post reply * boostrapify, cleanup, and reformat * disable nested form for reply preview --- include/comment.php | 123 +++++++++++++++++++++++++--------------------- include/objectManager.php | 21 +++----- 2 files changed, 74 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=f443d90e7ce3d765188d…

1 0

Jeremy Newman : do not wrap back link in p tag
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 9b857d1f559b916c02f3b5cd58f34353333a4335 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9b857d1f559b916c02f3b5cd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 09:50:47 2016 -0600 do not wrap back link in p tag --- include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html.php b/include/html.php index 3af125c..cc3b309 100644 --- a/include/html.php +++ b/include/html.php @@ -150,7 +150,7 @@ function html_back_link($howmany = 1, $url = "") { $url = 'javascript:history.back('.$howmany.');'; } - return '<p><a href="'.htmlentities($url).'" class="btn btn-default"><i class="fa fa-arrow-left"></i> Back</a></p>'."\n"; + return ' <a href="'.htmlentities($url).'" class="btn btn-default"><i class="fa fa-arrow-left"></i> Back</a> '."\n"; }

1 0

Jeremy Newman : cleanup and bootstrapify the comments section
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: de44e9fdbbc3a7d9d9d05060b9541f80c68a1a91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=de44e9fdbbc3a7d9d9d05060… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 16:58:39 2016 -0600 cleanup and bootstrapify the comments section --- include/comment.php | 92 +++++++++++++++++------------------------------------ styles.css | 71 ++++++++++++----------------------------- 2 files changed, 50 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=de44e9fdbbc3a7d9d9d0…

1 0

Jeremy Newman : fix typo
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: b53388d46803670adc307f5ca82f70a03c80936f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b53388d46803670adc307f5c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 16:58:23 2016 -0600 fix typo --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index b93b077..7427a31 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -745,7 +745,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) { //display row 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 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 class=\"text-center\">".$oBuglink->sBug_status."</td>","\n"; echo "<td class=\"text-center\">".$oBuglink->sResolution."</td>","\n";

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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