From ef23cae73dd1e32881bd9c4d3392a2cf90e902a4 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 4 Feb 2019 10:19:11 -0500
Subject: [PATCH] Changed the link to the bbb image to be an absolute url
 (#353)

---
 app/views/shared/_header.html.erb             | 3 +--
 app/views/user_mailer/password_reset.html.erb | 2 +-
 app/views/user_mailer/verify_email.html.erb   | 2 +-
 config/application.rb                         | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index 5ea2875e..200100f1 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -17,8 +17,7 @@
 	<div class="container">
 		<div class="d-flex">
 			<%= link_to (current_user ? current_user.main_room : root_path), class: "header-brand" do %>
-				<%= image_tag(Rails.configuration.branding_image.blank? ? "logo_with_text.png" : Rails.configuration.branding_image,
-					class: "header-brand-img") %>
+				<%= image_tag(Rails.configuration.branding_image,class: "header-brand-img") %>
 			<% end %>
 
 			<div class="d-flex ml-auto">
diff --git a/app/views/user_mailer/password_reset.html.erb b/app/views/user_mailer/password_reset.html.erb
index 10d5f34e..373249b4 100644
--- a/app/views/user_mailer/password_reset.html.erb
+++ b/app/views/user_mailer/password_reset.html.erb
@@ -17,7 +17,7 @@
 %>
   <div style="text-align:center; font-family:'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif">
     <div style="display:inline-block; background-color:#F5F7FB; border:1px solid #d3d3d3; padding: 25px 70px">
-      <%= image_tag(Rails.configuration.branding_image.blank? ? "logo_with_text.png" : Rails.configuration.branding_image) %>
+      <%= image_tag(Rails.configuration.branding_image) %>
 
       <h1 style="margin-bottom:30px">Password Reset</h1>
 
diff --git a/app/views/user_mailer/verify_email.html.erb b/app/views/user_mailer/verify_email.html.erb
index 402163a1..b388d3ce 100644
--- a/app/views/user_mailer/verify_email.html.erb
+++ b/app/views/user_mailer/verify_email.html.erb
@@ -18,7 +18,7 @@
 
   <div style="text-align:center; font-family:'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif">
     <div style="display:inline-block; background-color:#F5F7FB; border:1px solid #d3d3d3; padding: 25px 70px">
-      <%= image_tag(Rails.configuration.branding_image.blank? ? "logo_with_text.png" : Rails.configuration.branding_image) %>
+      <%= image_tag(Rails.configuration.branding_image) %>
 
       <h1 style="margin-bottom:30px">Welcome to  <%= t('bigbluebutton') %>!,
         <%= @user[:name] %></h1>
diff --git a/config/application.rb b/config/application.rb
index ca9496a2..223cc556 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -79,7 +79,7 @@ module Greenlight
     config.banner_message = ENV['BANNER_MESSAGE']
 
     # Configure custom branding image.
-    config.branding_image = ENV['BRANDING_IMAGE']
+    config.branding_image = ENV['BRANDING_IMAGE'] || "https://raw.githubusercontent.com/bigbluebutton/greenlight/master/app/assets/images/logo_with_text.png"
 
     # Enable/disable recording thumbnails.
     config.recording_thumbnails = (ENV['RECORDING_THUMBNAILS'] != "false")