Merge pull request #81 from companieshouse/release/4.35.0

KPJones15 · web-flow · commit 77b58ad98cc6 · 2019-09-18T13:39:09.000+01:00
Release/4.35.0
diff --git a/templates/base.tx b/templates/base.tx
@@ -195,7 +195,7 @@
     <div id="<% (! $disable_header_search) ? 'content-container' : 'search-container' %>">
 	% block content -> { ; }
     </div>
-    
+
   </main>
 
   <!--end main-->
diff --git a/templates/company/company_name_availability/form.html.tx b/templates/company/company_name_availability/form.html.tx
@@ -1,8 +1,8 @@
 % cascade base { title=> "Company Name Availability Checker - Companies House", classes=>"profile", disable_header_search => 1 }
 % around content -> {
-        
-        <div class="column-full-width">
-                <h1 class="main-title left" id="start-searching"">
+
+        <div class="column-full-width" id="content">
+                <h1 class="main-title left">
                     <label for="site-search-text" class="heading-xlarge">
                         Company name availability checker
                     </label>
@@ -44,7 +44,7 @@
                     </p>
 
                 % } elsif $total_results > 0 {
-                
+
                     <h2 class="heading-small">
                         The company name "<b><% $query | uc %></b>" is considered to be the 'same as' the existing names shown below:
                     </h2>
@@ -54,12 +54,12 @@
                 % if $show_error {
 
                     <h2 class="heading-small">
-                        Companies House are unable to check the availability of this name online, please telephone our Contact Centre on 
+                        Companies House are unable to check the availability of this name online, please telephone our Contact Centre on
                         +44 (0) 303 1234 500.
                     </h2>
-    
-                % } 
-                        
+
+                % }
+
                 <ul id="results" class="results-list">
                   % for $companies.items -> $item {
                     <li class="type-company">
@@ -70,7 +70,7 @@
                         <p><% $item.snippet | mark_raw %></p>
                         <p><% $c.cv_lookup('company_type', $item.company_type) %></p>
                     </li>
-                    %}                        
+                    %}
                 </ul>
         </div>
     </div>
diff --git a/templates/company/follow/list.html.tx b/templates/company/follow/list.html.tx
@@ -1,6 +1,7 @@
 % cascade base { title => 'Follow ' ~ $company.company_name , form_page => 1, classes => "transaction service" }
 % around content -> {
-	<div role="article" class="text follow-confirmation">
+  <div role="article" class="text follow-confirmation">
+        <div id="content" class="content-override"></div>
         <h1 class="heading-xlarge" id="follow-company-title"><% l('Follow a company') %></h1>
         <div class="text" id="follow-company-confirmation-prompt">
             <h2 class="heading-large"><% $company.company_name %> (<% $company.company_number %>)</h2>
@@ -24,7 +25,7 @@
                         % }
                     >Cancel</a>
                 </p>
-            </div>        
+            </div>
         </div>
     </div>
 % }
diff --git a/templates/includes/company/page_header.tx b/templates/includes/company/page_header.tx
@@ -1,5 +1,6 @@
 <div class="company-header">
-        <p id="company-name" class="heading-xlarge"><% $company.company_name %></p>
+        <div id="content" class="content-override"></div>
+        <p class="heading-xlarge"><% $company.company_name %></p>
         <p id="company-number">
         % if $company.type == 'uk-establishment' {
         <% l('UK establishment number') %>
diff --git a/templates/includes/transactions.tx b/templates/includes/transactions.tx
@@ -1,6 +1,7 @@
 <a class="link-back id="back-button" href="javascript:history.back()">Back</a>
 
 <header class="text">
+    <div id="content" class="content-override"></div>
     <h1 id="page-header"class="heading-xlarge">
         <% $title %>
     </h1>
diff --git a/templates/personal_appointments/get.html.tx b/templates/personal_appointments/get.html.tx
@@ -4,6 +4,7 @@
 <script src='//<% $cdn_url %>/javascripts/vendor/selection-buttons.js'></script> <!-- Needed for new GDS-style radio buttons and checkboxes -->
 <script src='//<% $cdn_url %>/javascripts/vendor/application.js'></script>  <!-- Needed for new GDS-style radio buttons and checkboxes -->
 
+    <div id="content" class="content-override"></div>
     <header class="text">
         <h1 class="heading-xlarge" id="officer-name"><% $officer.name %></h1>
     </header>
diff --git a/templates/search/banner.tx b/templates/search/banner.tx
@@ -9,7 +9,6 @@
     <label class="hidden" for="site-search-text">Search for companies</label>
     <form id="search" action="/search/companies" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header' ? 'search-header' : 'search-header js-search-hash' %>">
 % } else {
-    <label class="hidden" for="site-search-text">Search for companies or officers</label>
     <form id="search" action="/search" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header' ? 'search-header' : 'search-header js-search-hash' %>">
 % }
     <div class="search-bar-active">
diff --git a/templates/search/form.tx b/templates/search/form.tx
@@ -1,11 +1,11 @@
 % if $search_type == "officers" {
-    <form id="search" action="/search/officers" method="get" accept-charset="utf-8" role="search"  class="<% $header_or_body=='header'? 'site-search' : 'search-header js-search-hash' %>">
+    <form id="content" action="/search/officers" method="get" accept-charset="utf-8" role="search"  class="<% $header_or_body=='header'? 'site-search' : 'search-header js-search-hash' %>">
 % } elsif $search_type == 'disqualified-officers' {
-    <form id="search" action="/search/disqualified-officers" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header'? 'site-search' : 'search-header js-search-hash' %>">
+    <form id="content" action="/search/disqualified-officers" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header'? 'site-search' : 'search-header js-search-hash' %>">
 % } elsif $search_type == 'all' {
-    <form id="search" action="/search" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header' ? 'search-header' : 'search-header js-search-hash' %>">
+    <form id="content" action="/search" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header' ? 'search-header' : 'search-header js-search-hash' %>">
 % } else {
-    <form id="search" action="/search/companies" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header'? 'site-search' : 'search-header js-search-hash' %>">
+    <form id="content" action="/search/companies" method="get" accept-charset="utf-8" role="search" class="<% $header_or_body=='header'? 'site-search' : 'search-header js-search-hash' %>">
 % }
 
 % if ($header_or_body == 'header') {
diff --git a/templates/search/noresults.html.tx b/templates/search/noresults.html.tx
@@ -9,7 +9,7 @@
         <div class="column-full-width">
 %       include 'search/form.tx'
         <div class="grid-row">
-             <div class="column-two-thirds">
+             <div class="column-two-thirds" id="content">
 		             <article id="no-results" class="text">
     			       <% if $results.searchTerm { %>
 		    		         <h2 class="heading-large" id="no-results" >No results found for "<% $results.searchTerm %>"</h2>
diff --git a/templates/search/results.html.tx b/templates/search/results.html.tx
@@ -15,7 +15,7 @@
     % include "search/form.tx" {SHOW_TABS => 0, RESULTS_CONTAINER => 0}
 
     <div class="grid-row">
-        <div class="column-two-thirds">
+        <div class="column-two-thirds" id="content">
 
             <article id="services-information-results">
 
diff --git a/templates/static_pages/help/contact-us.html.tx b/templates/static_pages/help/contact-us.html.tx
@@ -1,6 +1,7 @@
 % cascade base { title => 'Contact Us - Companies House service', searchpage => 1, disable_header_search => 1 }
 % around content -> {
     <article class="text">
+    <div id="content" class="content-override"></div>
 		<h1 class="heading-xlarge">Contact us</h1>
         <p>You may find the answer to your enquiry on the <a href="https://www.gov.uk/government/organisations/companies-house">Companies House website</a> or you can <a href="mailto:enquiries@companieshouse.gov.uk">email us</a>.</p>
         <h2 class="heading-medium">Contact Centre</h2>
diff --git a/templates/static_pages/help/cookies.html.tx b/templates/static_pages/help/cookies.html.tx
@@ -26,11 +26,11 @@
       <p>The logs are analysed to tell us what pages you visit, how long you are on the site, how you got here
        and what you click on. We do not collect or store your personal information (eg your name or address)
        so this information cannot be used to identify who you are.</p>
-      
+
       <div class="panel-indent">
         <p>We do not allow external organisations to access, use or share any of this analytics data,
           which is stored on in-house servers.</p>
-      </div>     
+      </div>
 
       <p class="heading-medium">Our analytics tools set the following cookies:</p>
 
diff --git a/templates/static_pages/help/guidance.html.tx b/templates/static_pages/help/guidance.html.tx
@@ -7,6 +7,7 @@
 
 <div class="text">
     <header>
+        <div id="content" class="content-override"></div>
         <h1 class="heading-xlarge">File abridged or full accounts</h1>
     </header>
 
diff --git a/templates/static_pages/help/other-filings.html.tx b/templates/static_pages/help/other-filings.html.tx
@@ -7,6 +7,7 @@
 
 <div class="text">
     <header>
+        <div id="content" class="content-override"></div>
         <h1 class="heading-xlarge">Other document filings</h1>
     </header>
 
@@ -31,4 +32,4 @@
     </div><!--end form-group-->
 </div><!--end text-->
   <div class="push"></div>
-% }
+% }
diff --git a/templates/user/transactions/list.html.tx b/templates/user/transactions/list.html.tx
@@ -3,8 +3,8 @@
 
 % around content -> {
 
-      
-               <header class="text">
+
+               <header class="text" id="content">
                   <h1 class="heading-xlarge">
                      Your filings
                   </h1>
@@ -14,9 +14,9 @@
                     %if ($no_filings){
                             <p class="text">You have not filed anything on Companies House beta service.</p>
                     %}else{
- 
+
                        <p class="text">This is a list of company information filed by <strong><% $user %></strong> within the last 30 days.</p>
-               
+
                        <table id=rf_table class="activity">
                            <tr>
                                <th>Date &amp; Time</th>
@@ -42,7 +42,7 @@
                                                 % for $transaction.filings -> $filing {
                                                     <li><% $c.cv_lookup('filing_type', $filing.filing_type) %></li>
                                                 % }
-                                            </ul> 
+                                            </ul>
                                        </td>
                                 %}else{
                                         <td><% $transaction.id %></td>
@@ -53,7 +53,7 @@
                                                      <li><a id="viewSubmission<% $~transaction %><% $~filing%>" href="<% $c.url_for('show_registered_office_resource', transaction_number => $transaction.id) %>"
                                                      >View submission</a></li>
                                                  % }
-                                             </ul> 
+                                             </ul>
                                         </td>
                                 %}
                                    <td>
@@ -66,13 +66,13 @@
                                                         <br>
                                                    % }
                                             % }
-                                        </ul> 
-                                        
+                                        </ul>
+
                                    </td>
                                </tr>
                            % }
                        </table>
-                        
+
                         % if $filings_count > $entries_per_page {
                             <ul class="pager">
                                 % if ($previous_page) {
@@ -106,5 +106,3 @@
                         %}
                     % }
 % }
-
-
