Merge lp:~whosdaz/ubuntu-qa-website/fix1531980 into lp:ubuntu-qa-website

[Matthew Allen]

Rearranged the results page as per lp:1531980.

New order is now:

* bugs to look for
* add a test result
* reports completed by other users

[lp:~whosdaz/ubuntu-qa-website/fix1531980]

416. By Matthew Allen on 2016-01-09

Fixed order as per disccusion with Balloons

[Nicholas Skaggs (nskaggs)]

I've asked for some images to help make the decision

review: Needs Fixing

[Matthew Allen (whosdaz)]

Changes can be seen at the Imgur link below.
http://i.imgur.com/6evjTYT.png

[Nicholas Skaggs (nskaggs)]

flocculant, what do you think? Checkout the image

[Nicholas Skaggs (nskaggs)]

From IRC:

balloons Condensing / tweaking the UI layout would help too I think
11:55 balloons the add a test result has elements laid out all vertically
11:56 balloons anyways, it's sort of overlapping with making sweeping changes to the UI
11:56 MatthewAllen you could potentially have the submit a result section as a button that opens as a pop-up
11:56 MatthewAllen which would free up a decent amount of space, and it could be added with the link to download and additional info
11:58 balloons ohh, popups are a nice idea
11:58 balloons again, feel free to give fresh eyes and fresh ideas to the page :-)
11:59 MatthewAllen maybe I'll have a play with that, because I'm sure you could save that space with a popup
11:59 MatthewAllen and if you compress the tables, you could probally cut down size a bunch
12:00 balloons ok, so i'll just leave this as a comment on the MP. See what you can do with the vertical sizing

[Kev Bowring (flocculant)]

> flocculant, what do you think? Checkout the image

Looks the same as it does now to me. That is no change.

[Matthew Allen (whosdaz)]

> > flocculant, what do you think? Checkout the image
>
> Looks the same as it does now to me. That is no change.

If you compare the screenshot to the live version, where the submitted results are positioned has changed. So people going to publish results do not have to scroll past it. So it's shifted up once in the order of the sections.

[Kev Bowring (flocculant)]

http://iso.qa.ubuntu.com/qatracker/milestones/351/builds/110137/testcases/1301/results

Look there - all that's changed is an orphan frame and a small line of text has gone.

The bug list is not below Add a test result.

[Matthew Allen (whosdaz)]

> http://iso.qa.ubuntu.com/qatracker/milestones/351/builds/110137/testcases/1301
> /results
>
> Look there - all that's changed is an orphan frame and a small line of text
> has gone.
>
> The bug list is not below Add a test result.

If you have a look at a page that has results submitted - http://iso.qa.ubuntu.com/qatracker/milestones/351/builds/110045/testcases/1310/results

You can see that it is in the order:
 * Testcase instructions
 * Testcase result submitted by "adueppen" < this changed
 * Bugs to look for
 * Add a test result

Whereas, in the screenshot it is:
 * Testcase instructions
 * Bugs to look for
 * Add a test result
 * Testcase result submitted < this changed

[Kev Bowring (flocculant)]

and if you look at the bug report it clearly notes putting the bug list at the bottom.

[Matthew Allen (whosdaz)]

Oh I must be confused by your wording in the bug report :/ My bad.
So do you want the list of bugs to look for at the bottom?

As in

 * Testcase instructions
 * Testcase result submitted
 * Add a test result
 * Testcase bugs to look for

Perhaps if that's wrong, we could talk over IRC - I'm currently in the #Ubuntu-Google channel.

[Kev Bowring (flocculant)]

>
> So do you want the list of bugs to look for at the bottom?
>
> As in
>
> * Testcase instructions
> * Testcase result submitted
> * Add a test result
> * Testcase bugs to look for
>
>

That's right.

[Matthew Allen (whosdaz)]

Ok, I misunderstood you - sorry.
Will fix that up tomorrow then you can have another look.
On 11 Jan 2016 4:43 am, "flocculant" <email address hidden> wrote:

> >
> > So do you want the list of bugs to look for at the bottom?
> >
> > As in
> >
> > * Testcase instructions
> > * Testcase result submitted
> > * Add a test result
> > * Testcase bugs to look for
> >
> >
>
> That's right.
> --
>
> https://code.launchpad.net/~whosdaz/ubuntu-qa-website/fix1531980/+merge/282043
> You are the owner of lp:~whosdaz/ubuntu-qa-website/fix1531980.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: whosdaz
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~whosdaz/ubuntu-qa-website/fix1531980
> Launchpad-Project: ubuntu-qa-website
>

[lp:~whosdaz/ubuntu-qa-website/fix1531980]

417. By Matthew Allen on 2016-01-11

Fixed ordering of sections

[Matthew Allen (whosdaz)]

See the screenshot below to see my changes.
http://i.imgur.com/cJRDPV2.png

[Kev Bowring (flocculant)]

Thanks - that looks fine.

[Nicholas Skaggs (nskaggs)]

The vertical space still needs compressed.

Something like this: http://imgur.com/ckk6hpW

Perhaps even make the submit results button be next to the radio buttons for pass / fail. So long as it fits and looks ok, that would be my first choice.

review: Needs Fixing

[lp:~whosdaz/ubuntu-qa-website/fix1531980]

418. By Matthew Allen on 2016-01-11

Changed layout of the result submission form

419. By Matthew Allen on 2016-01-11

Added custom css for the form

[Matthew Allen (whosdaz)]

Made some changes as per your request.
Current page looks like: http://i.imgur.com/c8LmcZM.png

Will have a look at moving the submit button.

[Matthew Allen (whosdaz)]

Leaving it as is, as moving the submit button makes the form look quite odd.

[Nicholas Skaggs (nskaggs)]

The Critical bugs box has a red background now.. I see your css changes, but I'm curious why the red background.

flocculan, thoughts on the red background?

Also, I'm not sure the right positioning for critical bugs works -- it gets a little weird when you make a wide display. Thoughts on improving it?

http://imgur.com/45McOfu

review: Needs Fixing

[Matthew Allen (whosdaz)]

Sorry background was unintentional while testing, can fix.
Not sure what you want done about the bug boxes, maybe widen them to fit the display.

[Nicholas Skaggs (nskaggs)]

In talking on IRC, sounds like you should swap the critical and normal bug fields, and remove the red background. Widening to fit gets a bit weird too, but sure give it a try and try resizing it. See if it works better. I'll defer to you on which works better. With that, this gets my +1. I'll try and sneak it in the release if it's done :-)

[Kev Bowring (flocculant)]

I'll ignore the red now following comments.

I will add that regardless of size and ensuing weirdness - critical bugs needs to be on left, bugs on the right

[lp:~whosdaz/ubuntu-qa-website/fix1531980]

420. By Matthew Allen on 2016-01-12

Fixed layout of bug fields, and removed coloring

421. By Matthew Allen on 2016-01-12

Removed wrong tag

422. By Matthew Allen on 2016-01-12

Moved critical bugs to the left

[Nicholas Skaggs (nskaggs)]

TY. Looks good.

review: Approve

[Kev Bowring (flocculant)]

Thank you Matthew

[Alberto Salvia Novella (es20490446e)]

https://goo.gl/nnw1b4

=== modified file 'modules/qatracker/user/qatracker.user.results.php'
--- modules/qatracker/user/qatracker.user.results.php	2016-01-06 18:33:10 +0000
+++ modules/qatracker/user/qatracker.user.results.php	2016-01-12 19:45:06 +0000
@@ -23,6 +23,19 @@
     # FIXME: Turn off caching for now as it's a fairly trivial page to render
     drupal_page_is_cacheable(FALSE);
 
+    // Add custom css to style forms
+
+    $formcss = array(
+      '#tag' => 'link', // The #tag is the html tag - <link />
+      '#attributes' => array( // Set up an array of attributes inside the tag
+        'rel' => 'stylesheet', 
+        'type' => 'text/css',
+        'href' => '/modules/qawebsite/misc/qawebsite_form.css',
+      ),
+    );
+    drupal_add_html_head($formcss, 'formcss');
+
+
     $site = qatracker_get_current_site();
     $items = qatracker_site_header($site);
 
@@ -270,8 +283,6 @@
         );
     }
 
-    $user_result = Null;
-
     foreach ($result as $record) {
         # Skip removed results unless we're an admin
         if (!$admin && $record->status == 1) {
@@ -340,6 +351,8 @@
             }
         }
 
+
+
         # Get data about the user
         $account = user_load($record->reporterid);
         if (!$account) {
@@ -403,22 +416,28 @@
     }
     $items[] = new_table($rows, $status);
 
+
+    # Add a test result section (moved)
     if ($user_acl) {
         $items = array_merge($items, qatracker_user_results_form());
     }
     elseif ($user->uid == 0) {
-        $items['result'] = array(
+        $items[] = array(
             '#type' => 'fieldset',
             '#title' => 'Add a test result',
             '#attributes' => array('id' => array('add_result')),
         );
-        $items['result'][] = array(
+        $items[][] = array(
             '#type' => 'markup',
             '#prefix' => '<br /><div style="text-align:center;font-weight:bold;">',
             '#markup' => t("You need to be logged in to submit your test results."),
             '#suffix' => '</div>',
         );
     }
+    # End of add a test result section
+
+    $user_result = Null;
+
 
     return $items;
 }
@@ -533,7 +552,7 @@
         $bugs = t("None");
     }
 
-    $form['old bugs'] = create_bug_table();
+
 
     if ($user_result) {
         $form['qatracker_result'] = array(
@@ -579,6 +598,7 @@
         '#default_value' => implode(", ", $user_result->regular_bugs),
     );
 
+
     $form['qatracker_result']['comment'] = array(
         '#type' => 'textarea',
         '#title' => t('Comment'),
@@ -605,6 +625,16 @@
         );
     }
 
+
+    // Bug table section (moved)
+    // Add the header, as it cannot be in the prefix as it draws in the wrong location
+    $form[] = array(
+            '#type' => 'markup',
+            '#prefix' => '<h2> Bugs to look for </h2>',
+    );
+
+    $form['old bugs'] = create_bug_table();
+
     return $form;
 }
 
@@ -847,7 +877,6 @@
         '#theme' => "table",
         '#header' => $header,
         '#rows' => $rows,
-        '#prefix' => '<h2>'.t("Bugs to look for").'</h2>'
     );
 }
 

=== added file 'modules/qawebsite/misc/qawebsite_form.css'
--- modules/qawebsite/misc/qawebsite_form.css	1970-01-01 00:00:00 +0000
+++ modules/qawebsite/misc/qawebsite_form.css	2016-01-12 19:45:06 +0000
@@ -0,0 +1,21 @@
+.form-item-critical-bugs {
+	float:left;
+    width: 46%;
+}
+
+.form-item-regular-bugs {
+	float: left;
+	width: 46%;
+}
+
+.form-textarea {
+    height: 50px;
+}
+
+.form-actions {
+    padding-top: 0px;
+}
+
+.form-item-comment{
+	clear:both;
+}
\ No newline at end of file

=== modified file 'modules/qawebsite/misc/qawebsite_tooltip.css'
--- modules/qawebsite/misc/qawebsite_tooltip.css	2014-04-01 21:53:12 +0000
+++ modules/qawebsite/misc/qawebsite_tooltip.css	2016-01-12 19:45:06 +0000
@@ -36,4 +36,4 @@
 
 .blacklink {
 	display: inline-block;
-}
\ No newline at end of file
+}