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

Proposed by Matthew Allen on 2016-01-20
Status: Merged
Merged at revision: 420
Proposed branch: lp:~whosdaz/ubuntu-qa-website/fix1536022
Merge into: lp:ubuntu-qa-website
Diff against target: 80 lines (+22/-11)
3 files modified
modules/qatracker/qatracker.functions.php (+0/-8)
modules/qatracker/user/qatracker.user.results.php (+14/-3)
modules/qawebsite/misc/qawebsite_fix1536022.css (+8/-0)
To merge this branch: bzr merge lp:~whosdaz/ubuntu-qa-website/fix1536022
Reviewer Review Type Date Requested Status
Ubuntu QA Website Developers 2016-01-20 Pending
Review via email: mp+283262@code.launchpad.net

Description of the Change

Removed the "You are currently in:" text along with making the links inline to save space as shown in the screenshot below, Overall this shaves about 100px of vertical space.

http://i.imgur.com/4SNDm0A.png

To post a comment you must log in.
422. By Matthew Allen on 2016-01-20

Removed duplicate CSS

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/qatracker/qatracker.functions.php'
2--- modules/qatracker/qatracker.functions.php 2015-12-15 00:12:59 +0000
3+++ modules/qatracker/qatracker.functions.php 2016-01-20 08:23:26 +0000
4@@ -144,14 +144,6 @@
5 '#suffix' => '</b>',
6 );
7 }
8- else {
9- $form[] = array(
10- '#type' => 'markup',
11- '#prefix' => '<b>',
12- '#markup' => t('You are currently on: @title', array('@title' => $site->title)),
13- '#suffix' => '</b>',
14- );
15- }
16 return $form;
17 }
18
19
20=== modified file 'modules/qatracker/user/qatracker.user.results.php'
21--- modules/qatracker/user/qatracker.user.results.php 2016-01-12 19:44:35 +0000
22+++ modules/qatracker/user/qatracker.user.results.php 2016-01-20 08:23:26 +0000
23@@ -35,6 +35,18 @@
24 );
25 drupal_add_html_head($formcss, 'formcss');
26
27+ // Add custom css to fix1536022
28+
29+ $formcss1536022 = array(
30+ '#tag' => 'link', // The #tag is the html tag - <link />
31+ '#attributes' => array( // Set up an array of attributes inside the tag
32+ 'rel' => 'stylesheet',
33+ 'type' => 'text/css',
34+ 'href' => '/modules/qawebsite/misc/qawebsite_fix1536022.css',
35+ ),
36+ );
37+ drupal_add_html_head($formcss1536022, 'formcss1536022');
38+
39
40 $site = qatracker_get_current_site();
41 $items = qatracker_site_header($site);
42@@ -159,7 +171,6 @@
43
44 $items[] = array(
45 '#type' => 'markup',
46- '#prefix' => '<br /><br />',
47 '#markup' => l(
48 theme(
49 "image",
50@@ -176,7 +187,7 @@
51 # Link to testcase
52 $items[] = array(
53 '#type' => 'markup',
54- '#prefix' => '<br />',
55+ '#prefix' => '<div class="linkSpacer"></div>',
56 '#markup' => l(
57 theme(
58 "image",
59@@ -194,7 +205,7 @@
60 if ($build->product_buginstruction) {
61 $items[] = array(
62 '#type' => 'markup',
63- '#prefix' => '<br />',
64+ '#prefix' => '<div class="linkSpacer"></div>',
65 '#markup' => l(
66 theme(
67 "image",
68
69=== added file 'modules/qawebsite/misc/qawebsite_fix1536022.css'
70--- modules/qawebsite/misc/qawebsite_fix1536022.css 1970-01-01 00:00:00 +0000
71+++ modules/qawebsite/misc/qawebsite_fix1536022.css 2016-01-20 08:23:26 +0000
72@@ -0,0 +1,8 @@
73+div.tabs {
74+ display: none;
75+}
76+
77+div.linkSpacer {
78+ display: inline;
79+ padding-right: 20px;
80+}

Subscribers

People subscribed via source and target branches