Merge pull request #14 from hmrc/APIS-3676

FluentSynergyDW · web-flow · commit e9525aeb9a9a · 2018-08-06T13:34:34.000+01:00
APIS-3676 - external links
diff --git a/app/uk/gov/hmrc/apidocumentation/views/authorisationUserRestrictedEndpoints.scala.html b/app/uk/gov/hmrc/apidocumentation/views/authorisationUserRestrictedEndpoints.scala.html
@@ -143,7 +143,7 @@ <h5 id="auth-endpoint-example" class="heading-small faded-text">Example</h5>
                 </tr>
                 <tr>
                     <td><span class="code--slim">state</span> (optional)</td>
-                    <td>An opaque value used to maintain state between the request and callback and to prevent tampering as described in the <a href="https://tools.ietf.org/html/rfc6749#section-10.12" target="_blank">Oauth 2.0 specification (opens in a new tab)</a>. This is passed back to your application via the <span class="code--slim">redirect_uri</span>.</td>
+                    <td>An opaque value used to maintain state between the request and callback and to prevent tampering as described in the <a href="https://tools.ietf.org/html/rfc6749#section-10.12" target="_blank">OAuth 2.0 specification (opens in a new tab)</a>. This is passed back to your application via the <span class="code--slim">redirect_uri</span>.</td>
                 </tr>
                 <tr>
                     <td><span class="code--slim">redirect_uri</span></td>
diff --git a/app/uk/gov/hmrc/apidocumentation/views/cookies.scala.html b/app/uk/gov/hmrc/apidocumentation/views/cookies.scala.html
@@ -196,7 +196,7 @@ <h3 class="heading-small">@Messages("help.cookies.hotjar")</h3>
             </tbody>
         </table>
         <p>You can opt-out from having Hotjar collect your information by <a
-                href="https://www.hotjar.com/opt-out" target="_blank">visiting their opt out page (link opens in a new tab)</a> clicking 'Disable Hotjar'.</p>
+                href="https://www.hotjar.com/opt-out" target="_blank">visiting their opt out page (opens in a new tab)</a> clicking 'Disable Hotjar'.</p>
 
          <h3 class="heading-small">@Messages("help.cookies.optimizely")</h3>
         <div>
@@ -224,11 +224,11 @@ <h3 class="heading-small">@Messages("help.cookies.optimizely")</h3>
             </tbody>
         </table>
         <p>You can opt out from having Optimizely collect your information by  <a
-         href="https://www.optimizely.com/legal/opt-out/" target="_blank">visiting their opt out page (link opens in a new tab)</a> and entering our Developer Hub URL in their opt out form:<br><br><code>https://developer.service.hmrc.gov.uk/api-documentation</code> </p>
+         href="https://www.optimizely.com/legal/opt-out/" target="_blank">visiting their opt out page (opens in a new tab)</a> and entering our Developer Hub URL in their opt out form:<br><br><code>https://developer.service.hmrc.gov.uk/api-documentation</code> </p>
 
         <h3 class="heading-small">@Messages("help.cookies.sm")</h3>
        <p>We use <a
-         href="http://www.surveymonkey.com/" target="_blank">SurveyMonkey (link opens in a new tab)</a> to collect responses to our survey. If you take part, SurveyMonkey saves cookies to your computer to track your progress.</p>
+         href="http://www.surveymonkey.com/" target="_blank">SurveyMonkey (opens in a new tab)</a> to collect responses to our survey. If you take part, SurveyMonkey saves cookies to your computer to track your progress.</p>
 
         <table>
             <thead>
@@ -267,6 +267,6 @@ <h3 class="heading-small">@Messages("help.cookies.sm")</h3>
             </tbody>
         </table>
         <p>You can find out more  <a
-                href="https://help.surveymonkey.com/articles/en_US/kb/About-the-cookies-we-use" target="_blank">about the cookies that SurveyMonkey uses (link opens in a new tab)</a> and how to opt out.</p>
+                href="https://help.surveymonkey.com/articles/en_US/kb/About-the-cookies-we-use" target="_blank">about the cookies that SurveyMonkey uses (opens in a new tab)</a> and how to opt out.</p>
     </div>
-}
+}
diff --git a/app/uk/gov/hmrc/apidocumentation/views/privacy.scala.html b/app/uk/gov/hmrc/apidocumentation/views/privacy.scala.html
@@ -41,8 +41,8 @@ <h2 class="heading-medium">Your personal information</h2>
             </p>
             <p>
                 If you want to see what information we store about taxpayers, you can also
-                read <a href="https://www.tax.service.gov.uk/help/privacy" target="_blank">
-                HMRC's Privacy Notice (opens in a new tab)</a>.
+                read <a href="https://www.tax.service.gov.uk/help/privacy">
+                HMRC's Privacy Notice</a>.
             </p>
         </section>
         <section>
diff --git a/app/uk/gov/hmrc/apidocumentation/views/reference.scala.html b/app/uk/gov/hmrc/apidocumentation/views/reference.scala.html
@@ -484,7 +484,7 @@ <h3 class="heading-medium">Header Contents</h3>
 
         <p>
             Header contents must use the character set USASCII, with other characters URL encoded as in
-            <a href="https://www.ietf.org/rfc/rfc3986.txt">RFC3986 (opens in a new tab)</a>.
+            <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC3986 (opens in a new tab)</a>.
             Other restrictions on header values are shown in the header definitions table.
         </p>
 
@@ -747,7 +747,7 @@ <h3 class="heading-medium">Header Contents</h3>
                             ", for=&lt;IP request came from&gt;;by=&lt;current IP&gt;"
                         </p>
                         <p>
-                            For more details on this header field, see IETF <a href="https://tools.ietf.org/html/rfc7239">RFC7239 (opens in a new tab)</a>.</p>
+                            For more details on this header field, see IETF <a href="https://tools.ietf.org/html/rfc7239" target="_blank">RFC7239 (opens in a new tab)</a>.</p>
                         <p>For example, <code class="code--slim">for=10.1.2.3;by=198.51.100.0</code></p>
                     </td>
                 </tr>
diff --git a/app/uk/gov/hmrc/apidocumentation/views/termsAndConditions.scala.html b/app/uk/gov/hmrc/apidocumentation/views/termsAndConditions.scala.html
@@ -80,16 +80,15 @@ <h2 class="heading-medium">Using our website</h2>
         <h2 class="heading-medium">Online services</h2>
         <p>
             For detailed guidance regarding online security and protection, please follow the link
-            <a href="http://www.hmrc.gov.uk/security/index.htm" target ="_blank">
-            Online security - making your online experience as secure as possible (link opens in a new window)</a>.
+            <a href="http://www.hmrc.gov.uk/security/index.htm">
+            Online security - making your online experience as secure as possible</a>.
         </p>
     </section>
     <section>
         <h2 class="heading-medium">Copyright and intellectual property rights</h2>
         <p>The material featured on this site is subject to Crown Copyright and/or
             third party copyright, details of which can be found in our
-            <a href="http://www.hmrc.gov.uk/copyright/index.htm" target ="_blank">
-                copyright notice (link opens in a new window)</a>.
+            <a href="http://www.hmrc.gov.uk/copyright/index.htm">copyright notice</a>.
         </p>
         <p>The names, images and logos identifying HMRC are our proprietary marks.
             Copying our logos and/or any other third party logos accessed through this site
diff --git a/app/uk/gov/hmrc/apidocumentation/views/usingTheHub.scala.html b/app/uk/gov/hmrc/apidocumentation/views/usingTheHub.scala.html
@@ -36,7 +36,7 @@ <h2 class="heading-medium">1. Before you start</h2>
     </p>
     <p>Read our <a href="/api-documentation/docs/terms-of-use">terms of use</a>.</p>
     <p>Read up on <a href="https://developer.service.hmrc.gov.uk/api-documentation/docs/authorisation">authorisation</a>,
-    especially the <a rel="external" href="https://oauth.net/2/" target="_blank">OAuth 2.0 specification (opens in a new tab)</a>.</p>
+    especially the <a href="https://oauth.net/2/" target="_blank">OAuth 2.0 specification (opens in a new tab)</a>.</p>
 </section>
 
 <section id="register_account">
@@ -74,4 +74,4 @@ <h2 class="heading-medium">5. Start using live data</h2>
     </p>
 </section>
 
-}
+}
diff --git a/conf/messages b/conf/messages
@@ -45,7 +45,7 @@ help.cookies.how_used.measuring_usage.cookies_used.table.gds.name=GDS_successEve
 help.cookies.how_used.measuring_usage.cookies_used.table.gds.purpose=These help us identify how you use GOV.UK so we can make the site better
 help.cookies.how_used.measuring_usage.cookies_used.table.gds.expires=4 months
 help.cookies.how_used.measuring_usage.opt_out.info=You can {0}.
-help.cookies.how_used.measuring_usage.opt_out.link.text=opt out of Google Analytics cookies (link opens in a new tab)
+help.cookies.how_used.measuring_usage.opt_out.link.text=opt out of Google Analytics cookies (opens in a new tab)
 help.cookies.how_used.measuring_usage.opt_out.link.url=https://tools.google.com/dlpage/gaoptout
 help.cookies.how_used.optimizely.heading=Comparing different versions of a webpage (Optimizely)
 help.cookies.how_used.optimizely.info=Optimizely software is used to test different versions of a webpage (or webpages) to see which performs better. This is done to help make improvements and ensure the site is meeting the needs of its users.
