Merge pull request #18 from Jagordon/master

DDCNFF-895 Made AttorneyBanner Responsive
hmrc · Jul 1, 2015 · 4e040ab · 4e040ab
2 parents 2090202 + bf408ee
commit 4e040ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/main/resources/messages b/src/main/resources/messages
@@ -34,8 +34,8 @@ common.signOut=Sign out
 
 report.a.problem.link = Get help with this page.
 
-
 # Attorney Banner
-attorney.banner.user = This is <span class="heading-small">{0}</span>''s HMRC account
-attorney.banner.link = Return to your own account
 
+attorney.banner.link = Return to your own account
+attorney.banner.user = You''re in <span class="heading-small">{0}</span> tax account.
+attorney.banner.nan = name not defined
diff --git a/src/main/twirl/uk/gov/hmrc/play/views/layouts/attorney_banner.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/attorney_banner.scala.html
@@ -15,12 +15,17 @@
 *@
 @(name: Option[String], returnLinkUrl : String, returnLinkText: String)
 
-<div id="heightHolder">
-    <div class="attorneyBanner" id="attorneyBanner" data-focuses="attorneyBanner">
-        <p class="attorneyPara">
-            @Html(Messages("attorney.banner.user", name.getOrElse("Name Not Defined").toLowerCase.split(" ").map(_.toLowerCase.capitalize).mkString(" ")))
-            <a href="@returnLinkUrl" class="banner-links">@returnLinkText</a></p>
+<div class=" grid-wrapper attorneyContainer">
+    <div class="attorneyBanner grid" id="attorneyBanner">
+        <div class="grid grid-2-3">
+            <div class="inner-block">
+                @Html(Messages("attorney.banner.user", name.getOrElse(Messages("attorney.banner.nan"))))
+            </div>
+        </div>
+        <div class="grid grid-1-3">
+            <div class="inner-block">
+                <a href="@returnLinkUrl" class="banner-links">@returnLinkText</a>
+            </div>
+        </div>
     </div>
 </div>
-
-