Merge pull request #93 from companieshouse/release/4.36.0

Release/4.36.0

Author: CarlSwan

templates/company/view_all/view.html.tx

@@ -1,4 +1,4 @@
-% cascade base { title=> $company.company_name ~" - Overview (free company information from Companies House)", classes=>"profile" }
+% cascade base { title=> $company.company_name ~" - View all (free company information from Companies House)", classes=>"profile" }
 
 % around content -> {
 
@@ -31,7 +31,7 @@
     % if $c.is_signed_in {
     <div class="govuk-inset-text onlyJS">
     <div id="widget">
-    <a class="render-document govuk-button secondary-button" href="#">View company information snapshot
+    <a class="render-document govuk-button secondary-button piwik-event" data-event-id="View company information snapshot" href="#">View company information snapshot
         <span class="govuk-visually-hidden">link opens in new tab/window</span></a>
       <div id="status-widget" class="widget-footer hidden">
         <div id="status">
@@ -45,10 +45,9 @@
         </div>
       </div>
     </div>
-    </div>
-     <div id="download-button"></div>
+    <div id="download-button"></div>
     % } else {
-    <a class="govuk-button secondary-button" href="<% $c.url_for('user_sign_in') %>">View company information snapshot
+    <a class="govuk-button secondary-button piwik-event" data-event-id="View company information snapshot" href="<% $c.url_for('user_sign_in') %>">View company information snapshot
         <span class="govuk-visually-hidden">link opens in new tab/window</span></a>
     % }
 

templates/includes/company/tab.tx

@@ -1,22 +1,14 @@
-                %# This include takes:
-                %#   $active  - the ID of the tab to make active
-                %#   $tabid   - the ID of _this_ tab
-                %#   $page    - the URL relative to /company/{company_number} that this tab links to
-                %#   $title   - the title heading of the tab (may contain HTML)
-                %#   $company - the company details needed for display (uses company.company_number) 
+%# This include takes:
+ %#   $active  - the ID of the tab to make active
+ %#   $tabid   - the ID of _this_ tab
+ %#   $page    - the URL relative to /company/{company_number} that this tab links to
+ %#   $title   - the title heading of the tab (may contain HTML)
+ %#   $company - the company details needed for display (uses company.company_number) 
 
-                <li <% ($active == $tabid ? 'class="active"' : '') | raw %> >
+ <li <% ($active == $tabid ? 'class="active"' : '') | raw %> >
 
-                    % if ( $active == $tabid ) { "<h1>" | raw }
-                        % if ( $tabid == 'view-all-tab' ) {
-                            % if ( $active == $tabid ) {
-                                <a id="<% $tabid %>" href="<% $c.url_for('/company/' ~ $company.company_number ~ $page) %>"><% $title|raw %><span class="visuallyhidden"> for <% $company.company_name %> (<% $company.company_number %>)</span></a>
-                            % } else {
-                                <a class="more-tab" id="<% $tabid %>" href="<% $c.url_for('/company/' ~ $company.company_number ~ $page) %>"><% $title|raw %><span class="visuallyhidden"> for <% $company.company_name %> (<% $company.company_number %>)</span></a>
-                            % }
-                        % } else {
-                            <a id="<% $tabid %>" href="<% $c.url_for('/company/' ~ $company.company_number ~ $page) %>"><% $title|raw %><span class="visuallyhidden"> for <% $company.company_name %> (<% $company.company_number %>)</span></a>
-                        % }
-                    % if ( $active == $tabid ) { "</h1>" | raw }
+     % if ( $active == $tabid ) { "<h1>" | raw }
+         <a id="<% $tabid %>" href="<% $c.url_for('/company/' ~ $company.company_number ~ $page) %>"><% $title|raw %><span class="visuallyhidden"> for <% $company.company_name %> (<% $company.company_number %>)</span></a>
+     % if ( $active == $tabid ) { "</h1>" | raw }
 
-                </li>
+ </li>

templates/includes/piwik.tx

@@ -43,6 +43,9 @@
   else if (docTitle.match(/Mortgages \(free information from Companies House\)$/)){
      _paq.push(['setDocumentTitle','Charges ']);
   }
+  else if (docTitle.match(/View all \(free company information from Companies House\)$/)) {
+     _paq.push(['setDocumentTitle','View all']);
+  }
 
   _paq.push(['setCustomVariable', 1,'VisitorStatus',<% if $c.is_signed_in { %>'SignedIn'<% } else { %>'NotSignedIn'<% } %>,'visit']);
   _paq.push(['setCustomVariable', 2,'CompanyStatus',<% if $company.company_number == $c.authorised_company {%>'Authorised'<% } else { %>'NotAuthorised'<% } %>,'visit']);