November 2016 - Wine-commits

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

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