Merge pull request #7 from hmrc/API-1345

API-1345 Logout button removed from start page

Author: haroonzone

app/connectors/DownstreamMicroserviceException.scala

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package connectors
+
+case class DownstreamMicroserviceException(url: String, t: Throwable) extends RuntimeException(s"Error obtained while calling: [$url]", t)

app/connectors/package.scala

@@ -19,6 +19,4 @@ package object connectors {
   private[connectors] def recovery(url: String): PartialFunction[Throwable, Nothing] = {
     case e: Throwable => throw DownstreamMicroserviceException(url, e)
   }
-
-  case class DownstreamMicroserviceException(url: String, t: Throwable) extends RuntimeException(s"Error obtained while calling: [$url]", t)
 }

app/views/govuk_wrapper.scala.html

@@ -8,7 +8,8 @@
   contentHeader: Option[Html] = None,
   mainContent: Html = HtmlFormat.empty,
   serviceInfoContent: Html = HtmlFormat.empty,
-  scriptElem: Option[Html] = None)(implicit request: Request[_])
+  scriptElem: Option[Html] = None,
+  headerNavLinks: Option[Html] = None)(implicit request: Request[_])
 
 @import layouts.{govuk_template => hmrcGovUkTemplate}
 @import uk.gov.hmrc.play.views.html.{layouts => uiLayouts}
@@ -22,17 +23,12 @@
     <meta name="format-detection" content="telephone=no" />
 }
 
-@headerNavLinks = {
-    <li><a id="logOutNavHref" href="@appConfig.signOutUrl"
-    data-journey-click="primary-navigation:Click:Sign out">@Messages("message.signout")</a></li>
-}
-
 @insideHeader = {
     @uiLayouts.header_nav(
       navTitle = Some("Applications permissions withdrawal"),
       navTitleLink = None,
       showBetaLink = false,
-      navLinks = Some(headerNavLinks))
+      navLinks = headerNavLinks)
 }
 
 @afterHeader = {}

app/views/logout_link.scala.html

@@ -0,0 +1,2 @@
+@import config.FrontendAppConfig
+<li><a id="logOutNavHref" href="@FrontendAppConfig.signOutUrl" data-journey-click="primary-navigation:Click:Sign out">@Messages("message.signout")</a></li>

app/views/main_template.scala.html

@@ -1,5 +1,6 @@
 @import config.FrontendAppConfig
 @(title: String,
+  headerNavLinks: Option[Html] = Some(logout_link()),
   sidebarLinks: Option[Html] = None,
   contentHeader: Option[Html] = None,
   bodyClasses: Option[String] = None,
@@ -26,6 +27,7 @@
                contentHeader = contentHeader,
                mainContent = mainContent,
                serviceInfoContent = serviceInfoContent,
-               scriptElem = scriptElem
+               scriptElem = scriptElem,
+               headerNavLinks = headerNavLinks
 )
 

app/views/revocation/authorizedApplications.scala.html

@@ -50,6 +50,6 @@ <h1>Authorised software applications</h1>
     </div>
 }
 
-@main_template(title = "Authorised software applications", bodyClasses = None) {
+@main_template(title = "Authorised software applications") {
     @body
 }

app/views/revocation/permissionWithdrawn.scala.html

@@ -17,6 +17,6 @@ <h1>Permission withdrawn</h1>
     </div>
 }
 
-@main_template(title = "Permission withdrawn", bodyClasses = None) {
+@main_template(title = "Permission withdrawn") {
     @body
 }

app/views/revocation/start.scala.html

@@ -18,6 +18,6 @@ <h1>Withdraw permission to software accessing HMRC data</h1>
     </div>
 }
 
-@main_template(title = "Withdraw permission to software accessing HMRC data", bodyClasses = None) {
+@main_template(title = "Withdraw permission to software accessing HMRC data", headerNavLinks = None) {
     @body
 }

app/views/revocation/withdrawPermission.scala.html

@@ -20,6 +20,6 @@ <h1>Withdraw permission</h1>
     }
 }
 
-@main_template(title = "Withdraw permission", bodyClasses = None) {
+@main_template(title = "Withdraw permission") {
     @body
 }