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

[Matthew Allen]

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

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

422. By Matthew Allen on 2016-01-20

Removed duplicate CSS

=== modified file 'modules/qatracker/qatracker.functions.php'
--- modules/qatracker/qatracker.functions.php	2015-12-15 00:12:59 +0000
+++ modules/qatracker/qatracker.functions.php	2016-01-20 08:23:26 +0000
@@ -144,14 +144,6 @@
             '#suffix' => '</b>',
         );
     }
-    else {
-        $form[] = array(
-            '#type' => 'markup',
-            '#prefix' => '<b>',
-            '#markup' => t('You are currently on: @title', array('@title' => $site->title)),
-            '#suffix' => '</b>',
-        );
-    }
     return $form;
 }
 

=== modified file 'modules/qatracker/user/qatracker.user.results.php'
--- modules/qatracker/user/qatracker.user.results.php	2016-01-12 19:44:35 +0000
+++ modules/qatracker/user/qatracker.user.results.php	2016-01-20 08:23:26 +0000
@@ -35,6 +35,18 @@
     );
     drupal_add_html_head($formcss, 'formcss');
 
+    // Add custom css to fix1536022
+
+    $formcss1536022 = 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_fix1536022.css',
+      ),
+    );
+    drupal_add_html_head($formcss1536022, 'formcss1536022');
+
 
     $site = qatracker_get_current_site();
     $items = qatracker_site_header($site);
@@ -159,7 +171,6 @@
 
     $items[] = array(
         '#type' => 'markup',
-        '#prefix' => '<br /><br />',
         '#markup' => l(
             theme(
                 "image",
@@ -176,7 +187,7 @@
     # Link to testcase
     $items[] = array(
         '#type' => 'markup',
-        '#prefix' => '<br />',
+        '#prefix' => '<div class="linkSpacer"></div>',
         '#markup' => l(
             theme(
                 "image",
@@ -194,7 +205,7 @@
     if ($build->product_buginstruction) {
         $items[] = array(
             '#type' => 'markup',
-            '#prefix' => '<br />',
+            '#prefix' => '<div class="linkSpacer"></div>',
             '#markup' => l(
                 theme(
                     "image",

=== added file 'modules/qawebsite/misc/qawebsite_fix1536022.css'
--- modules/qawebsite/misc/qawebsite_fix1536022.css	1970-01-01 00:00:00 +0000
+++ modules/qawebsite/misc/qawebsite_fix1536022.css	2016-01-20 08:23:26 +0000
@@ -0,0 +1,8 @@
+div.tabs {
+	display: none;
+}
+
+div.linkSpacer {
+	display: inline;
+	padding-right: 20px;
+}