Merge pull request #879 from uktrade/develop

Department's rebranding

README.md

@@ -2,9 +2,9 @@
 [![Dependency Status](https://gemnasium.com/badges/github.com/uktrade/export-opportunities.svg)](https://gemnasium.com/github.com/uktrade/export-opportunities)
 
 
-# DIT Exporting is GREAT
+# DBT Exporting is GREAT
 
-*NOTE* The name of the organisation has changed from UKTI to DIT. In all
+*NOTE* The name of the organisation has changed from DIT to DBT. In all
 user-facing pages this change has been made, but some existing entities like
 databases may continue to be called ukti.
 

app/content/opportunities/index.yml

@@ -6,7 +6,7 @@ description: Search [$include_opportunity_count] export sales leads and pitch yo
 testimonials:
   - name: Director General
     company: Institute of Directors
-    text: Alerting businesses to new export opportunities is a very beneficial part of DIT’s work.
+    text: Alerting businesses to new export opportunities is a very beneficial part of DBT’s work.
   - name: National Chairman
     company: Federation of Small Businesses
     text: Initiatives such as export opportunities that help to connect buyers to sellers in the UK are welcome.

app/content/opportunities/results.yml

@@ -29,8 +29,8 @@ fields:
   sources:
     question: Opportunities provided by
     options:
-      - label: DIT
-        description: (Department for International Trade)
+      - label: DBT
+        description: (Department for Business and Trade)
       - label: Third party
 
   industries:

app/content/opportunities/show.yml

@@ -8,8 +8,8 @@ disclaimer_2: Before entering into a contract you need to apply for any necessar
 disclaimer_3: This opportunity has been translated from its original language. You should check if you need to apply in the original language.
 
 sign_off_dfid: Express your interest to the Department for International Development.
-sign_off_default: Express your interest to the Department for International Trade team in [$determiner][$place_name].
-sign_off_dit: Express your interest to the Department for International Trade.
+sign_off_default: Express your interest to the Department for Business and Trade team in [$determiner][$place_name].
+sign_off_dit: Express your interest to the Department for Business and Trade.
 sign_off_partner_1: Express your interest to the [$partner_name][ in $country_name].
 sign_off_partner_1a: Express your interest to [$partner_name][ in $country_name].
 sign_off_partner_2: The [$partner_name] is our chosen partner to deliver trade services in [$country_name].

app/views/admin/help/how_to_assess_a_company.html.erb

@@ -35,7 +35,7 @@ SECTION
     <li>EIG trade profile for case studies and so on</li>
     <li>account filing history, how long it has been trading for and annual turnover on Companies House</li>
     <li>annual report - if it's a public company</li>
-    <li>previous interactions with DIT as shown in Data Hub</li>
+    <li>previous interactions with DBT as shown in Data Hub</li>
   </ul>
 SECTION
 

app/views/admin/help/how_to_write_an_export_opportunity.html.erb

@@ -111,7 +111,7 @@ SECTION
 SECTION
 
 
-@article.section "Sign off line for DIT trade teams", <<-SECTION
+@article.section "Sign off line for DBT trade teams", <<-SECTION
   <p>These will be added automatically, based on your service provider.</p>
 SECTION
 

app/views/admin/help/not_right_for_opportunity_responses.html.erb

@@ -24,7 +24,7 @@ SECTION
 
 @article.section "What you need to do", <<-SECTION
 <p>Let the company know why it was not put forward. Explain what it could do to improve the next time it submits a proposal.</p>
-<p>The 4 'Not right for opportunity' explanations have a list of suggested sentences to help you write your response. If applicable, UK companies will be informed of UK export finance and the relevant country guide and DIT regional office within our internal system, so do not include this information.</p>
+<p>The 4 'Not right for opportunity' explanations have a list of suggested sentences to help you write your response. If applicable, UK companies will be informed of UK export finance and the relevant country guide and DBT regional office within our internal system, so do not include this information.</p>
 SECTION
 
 

app/views/admin/help/right_for_opportunity_responses.html.erb

@@ -31,7 +31,7 @@ SECTION
   <li>the company will need to contact the buyer directly</li>
   <li>the company will be given more information about a tender</li>
 </ul>
-<p>Each step has a list of suggested sentences to help you write your response. If applicable, UK companies will be informed of UK export finance and the relevant country guide and DIT regional office within our internal system, so do not include this information.</p>
+<p>Each step has a list of suggested sentences to help you write your response. If applicable, UK companies will be informed of UK export finance and the relevant country guide and DBT regional office within our internal system, so do not include this information.</p>
 SECTION
 
 

app/views/admin/includes/_header.html.haml

@@ -1,7 +1,7 @@
 %header#header
   .container
     %a{:href => '/', :title => 'Go to the Opportunities homepage', :id => 'logo', :class => 'content'}
-      = image_tag 'logo_dit.png', :height => '56', :alt => 'Department for International Trade'
+      = image_tag 'dfbt-logo-white.png', :height => '56', :alt => 'Department for Business & Trade'
 
     = render partial: 'admin/includes/authenticator'
     = render partial: 'admin/includes/menu'

app/views/admin/opportunities/help.html.haml

@@ -161,8 +161,8 @@
       %p Please use the correct one that applies to you. If the opportunity you have submitted is a tender, then use 'For more information on this tender, submit your company details to...'
 
       %div.panel  
-        %h3.heading-small Department for International Trade teams should use:
-        %p Submit your proposal to the Department for International Trade team in COUNTRY.
+        %h3.heading-small Department for Business and Trade teams should use:
+        %p Submit your proposal to the Department for Business and Trade team in COUNTRY.
 
         %h3.heading-small British Chambers of Commerce (except Poland, the Slovak Republic and the Philippines) should use:
         %p
@@ -176,19 +176,19 @@
           %br/
           The British Chamber of Commerce is our chosen partner to deliver trade services in Burma (also known as Myanmar).
           %br/
-          Submit your proposal to the Department for International Trade in Burma. Burma is also known as Myanmar.
+          Submit your proposal to the Department for Business and Trade in Burma. Burma is also known as Myanmar.
 
         %h3.heading-small The China-Britain Business Council should use:
         %p
           Submit your proposal to the China-Britain Business Council (CBBC).
           %br/
-          CBBC is a membership organisation and Department for International Trade’s chosen partner in China to deliver trade services.
+          CBBC is a membership organisation and Department for Business and Trade’s chosen partner in China to deliver trade services.
 
         %h3.heading-small The UK India Business Council in India should use:
         %p
           Submit your proposal to the UK India Business Council in India (UKIBC).
           %br/
-          UKIBC is the Department for International Trade’s chosen partner to deliver trade services in India.
+          UKIBC is the Department for Business and Trade’s chosen partner to deliver trade services in India.
 
         %h3.heading-small The British Business Group Vietnam should use:
         %p
@@ -212,7 +212,7 @@
         %p
           Submit your proposal to UK Colombia Trade. 
           %br/
-          UK Colombia Trade is the Department for International Trade's delivery partner in Colombia.
+          UK Colombia Trade is the Department for Business and Trade's delivery partner in Colombia.
 
 
 %div{:id => 'section-endwith'}

app/views/enquiry_response_mailer/reminder.text.erb

@@ -1,6 +1,6 @@
 <% presenter = OpportunityPresenter.new(self, @enquiry.opportunity, @content) %>
 
-Department for International Trade
+Department for Business and Trade
 
 
 

app/views/layouts/email.html.haml

@@ -93,7 +93,7 @@
         %thead
           %tr
             %td{ :style=>"font-family: Arial, sans-serif; font-size:19px; padding:0px;" }
-              = image_tag "email/DfIT_WHITE_SML_AW@2x.jpg", { :alt=>"Department for International Trade", :width=>"600", :style=>"display:block;" }
+              = image_tag "email/DfBT_WHITE_SML_AW@2x.jpg", { :alt=>"Department for Business & Trade", :width=>"600", :style=>"display:block;" }
 
 
         %tbody

app/views/opportunities/index.html.haml

@@ -52,7 +52,7 @@
         %li
           %span.action Find
           %span.separator :
-          %span.description Search for tenders and export opportunities exclusively sourced by DIT trade teams or submitted by our partners.
+          %span.description Search for tenders and export opportunities exclusively sourced by DBT trade teams or submitted by our partners.
         %li
           %span.action Choose
           %span.separator :

app/views/poc/includes/_footer_domestic.html.erb

@@ -4,7 +4,7 @@
   <nav class="container">
     <div class="link-group">
       <img id="footer-eig-logo" src="<%=asset_path('logos/EiG-logo-stacked.svg')%>" height="70" alt="Exporting is Great"/>
-      <img id="footer-dit-logo" src="<%=asset_path('logos/DfIT_WHITE_AW.png')%>" height="70" alt="Department for International Trade"/>
+      <img id="footer-dit-logo" src="<%=asset_path('dfbt-logo-white.png')%>" height="70" alt="Department for Business & Trade"/>
     </div>
 
     <div class="link-group">
@@ -48,7 +48,7 @@
         <li><a href="https://contact-us.export.great.gov.uk/directory/FeedbackForm">Contact us</a></li>
         <li><a href="<%=Figaro.env.PRIVACY_AND_COOKIES_URL %>/privacy-and-cookies">Privacy and cookies</a></li>
         <li><a href="<%=Figaro.env.GREAT_GOV_URL %>/terms-and-conditions">Terms and conditions</a></li>
-        <li><a href="https://www.gov.uk/government/organisations/department-for-international-trade">Department for International Trade on GOV.UK</a></li>
+        <li><a href="https://www.gov.uk/government/organisations/department-for-business-and-trade">Department for Business and Trade on GOV.UK</a></li>
       </ul>
     </div>
   </div>

app/views/poc/includes/_header_domestic.html.erb

@@ -20,7 +20,7 @@
 
   <div class="container">
     <a id="header-logo" href="<%=Figaro.env.GREAT_GOV_URL %>">
-      <img src="<%=asset_path('logos/DfIT_WHITE_AW.png')%>" alt="Home">
+      <img src="<%=asset_path('dfbt-logo-white.png')%>" alt="Home">
     </a>
   </div>
 

app/views/shared/_footer.html.erb

@@ -22,7 +22,7 @@
           <a id="footer-performance" href="<%=Figaro.env.GREAT_GOV_URL %>/performance-dashboard/">Performance</a>
         </li>
         <li>
-          <a id="footer-dit" href="https://www.gov.uk/government/organisations/department-for-international-trade/" target="_blank" title="Opens in a new window" rel="noopener noreferrer">Department for International Trade on GOV.UK</a>
+          <a id="footer-dit" href="https://www.gov.uk/government/organisations/department-for-business-and-trade/" target="_blank" title="Opens in a new window" rel="noopener noreferrer">Department for Business and Trade on GOV.UK</a>
         </li>
       </div>
 
@@ -37,7 +37,7 @@
 
   <div class="great-global-header-footer domestic">
     <div class="container">
-      <img id="great-global-footer-logo" class="great-global-header-footer-logo" alt="Department for International Trade" height="21" src="<%= asset_path 'dit-logo.svg' %>">
+      <img id="great-global-footer-logo" class="great-global-header-footer-logo" alt="Department for Business & Trade" height="21" src="<%= asset_path 'dbt-logo.svg' %>">
       <p id="great-footer-copyright" class="great-footer-copyright">&copy; Crown copyright <%= Time.current.year %>. All rights reserved.</p>
     </div>
   </div>

app/views/shared/_header.html.erb

@@ -8,7 +8,7 @@
   <div class="menu">
     <div class="container">
       <a id="great-header-logo" class="great-header-logo" href="<%= Figaro.env.GREAT_GOV_URL %>">
-        <img src="<%= asset_path 'dit-logo.png' %>" alt="Department for International Trade" height="70">
+        <img src="<%= asset_path 'dfbt-logo-white.png' %>" alt="Department for Business & Trade" height="70">
       </a>
       <ul class="extra-links">
         <%= render partial: 'shared/sso_login' %>

app/workers/send_opportunities_digest.rb

@@ -20,7 +20,7 @@ def perform
       subscriptions = SubscriptionNotification.joins(:subscription).where('subscription_notifications.created_at >= ? and subscription_notifications.created_at <= ? and subscriptions.user_id = ? and sent=false and subscriptions.unsubscribed_at is null', yesterday_date, today_date, user_id).group(:subscription_id).count(:opportunity_id)
 
       subscriptions.each do |subscription_id, subscription_count|
-        # the one random opportunity that we are going to use for this subscription. order by source to fetch DIT opps first
+        # the one random opportunity that we are going to use for this subscription. order by source to fetch DBT opps first
         sample_opportunity = SubscriptionNotification.where(subscription_id: subscription_id).includes(:subscription).joins(:opportunity).where(sent: false).where('subscription_notifications.created_at >= ? and subscription_notifications.created_at <= ?', yesterday_date, today_date).select(:subscription_id).select(:opportunity_id).order('opportunities.source').first.opportunity
         subscription = Subscription.find(subscription_id)
         struct[:subscriptions][subscription_id] = {

config/initializers/assets.rb

@@ -96,7 +96,7 @@
 Rails.application.config.assets.precompile += %w[export-components.css]
 Rails.application.config.assets.precompile += %w[search-icon.svg search.sgv]
 Rails.application.config.assets.precompile += %w[great.svg]
-Rails.application.config.assets.precompile += %w[dit-logo.svg dit-logo.png]
+Rails.application.config.assets.precompile += %w[dbt-logo.svg dfbt-logo-white.png]
 Rails.application.config.assets.precompile += %w[eig-logo-stacked.svg]
 
 Rails.application.config.assets.precompile += %w[dit.classes.Dropdown.js]

spec/features/editors_can_manage_opportunities_spec.rb

@@ -364,7 +364,7 @@
         expect(page.body).to have_content('Azure internal list')
       end
 
-      scenario 'published opportunity with a BST error coming from DIT list' do
+      scenario 'published opportunity with a BST error coming from DBT list' do
         admin = create(:admin)
         opportunity = create(:opportunity, status: :publish, title: 'A sample title', slug: 'swearing-contest')
         opportunity_sensitivity_check = OpportunitySensitivityCheck.new
@@ -389,7 +389,7 @@
         click_on opportunity.title
 
         expect(page.body).to have_content('innovative jam')
-        expect(page.body).to have_content('DIT list')
+        expect(page.body).to have_content('DBT list')
       end
     end
   end

spec/features/editors_can_view_stats_spec.rb

@@ -363,7 +363,7 @@
 
       choose 'granularity', option: 'Universe'
 
-      uncheck('DIT')
+      uncheck('DBT')
 
       click_on(@content['submit_button'], match: :first)
     end

spec/features/users_can_apply_for_opportunities_spec.rb

@@ -237,7 +237,7 @@
     expect(page).to have_content 'invalid_credentials'
   end
 
-  scenario 'user enquiries are emailed to DIT' do
+  scenario 'user enquiries are emailed to DBT' do
     allow(Figaro.env).to receive(:enquiries_cc_email).and_return('[email protected]')
     clear_email
 

spec/presenters/opportunity_presenter_spec.rb

@@ -555,9 +555,9 @@
       expect(lines[2]).to eq(content['sign_off_extra'])
     end
 
-    # Specific exceptions for DIT
+    # Specific exceptions for DBT
     # ['specific', 'standard', 'provider', 'names', 'here'].include?(provider_name)
-    it 'returns standard DIT sign off content for specific providers' do
+    it 'returns standard DBT sign off content for specific providers' do
       provider = create(:service_provider, name: 'DIT HQ')
       opportunity = create(:opportunity)
       presenter = OpportunityPresenter.new(ActionController::Base.helpers, opportunity, content)
@@ -604,7 +604,7 @@
       country_name = provider.country.name
 
       expect(lines.length).to eq(2)
-      expect(lines[0]).to eq("Express your interest to the Department for International Trade team in the #{country_name}.")
+      expect(lines[0]).to eq("Express your interest to the Department for Business and Trade team in the #{country_name}.")
       expect(lines[1]).to eq(content['sign_off_extra'])
     end
 
@@ -620,7 +620,7 @@
       country_name = provider.country.name
 
       expect(lines.length).to eq(2)
-      expect(lines[0]).to eq("Express your interest to the Department for International Trade team in Africa.")
+      expect(lines[0]).to eq("Express your interest to the Department for Business and Trade team in Africa.")
       expect(lines[1]).to eq(content['sign_off_extra'])
 
       # And another which looks for 'Africa' in the region name...
@@ -633,7 +633,7 @@
       country_name = provider.country.name
 
       expect(lines.length).to eq(2)
-      expect(lines[0]).to eq("Express your interest to the Department for International Trade team in Africa.")
+      expect(lines[0]).to eq("Express your interest to the Department for Business and Trade team in Africa.")
       expect(lines[1]).to eq(content['sign_off_extra'])
     end
 
@@ -648,7 +648,7 @@
       country_name = provider.country.name
 
       expect(lines.length).to eq(2)
-      expect(lines[0]).to eq("Express your interest to the Department for International Trade team in #{country_name}.")
+      expect(lines[0]).to eq("Express your interest to the Department for Business and Trade team in #{country_name}.")
       expect(lines[1]).to eq(content['sign_off_extra'])
     end
 
@@ -661,7 +661,7 @@
       country_name = provider.country.name
 
       expect(lines.length).to eq(2)
-      expect(lines[0]).to eq("Express your interest to the Department for International Trade team in #{country_name}.")
+      expect(lines[0]).to eq("Express your interest to the Department for Business and Trade team in #{country_name}.")
       expect(lines[1]).to eq(content['sign_off_extra'])
     end
   end

spec/workers/send_opportunities_digest_spec.rb

@@ -16,7 +16,7 @@
     expect(subscription_notification.sent).to eq true
   end
 
-  it 'picks the DIT opportunity when there is one' do
+  it 'picks the DBT opportunity when there is one' do
     ActionMailer::Base.deliveries.clear
 
     notification_creation_timestamp = Time.zone.now - 1.day + 3.hours