Skip to content
Snippets Groups Projects
Commit ef23cae7 authored by farhatahmad's avatar farhatahmad Committed by Jesus Federico
Browse files

Changed the link to the bbb image to be an absolute url (#353)

parent c73064a7
Branches
Tags
No related merge requests found
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
<div class="container"> <div class="container">
<div class="d-flex"> <div class="d-flex">
<%= link_to (current_user ? current_user.main_room : root_path), class: "header-brand" do %> <%= 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, <%= image_tag(Rails.configuration.branding_image,class: "header-brand-img") %>
class: "header-brand-img") %>
<% end %> <% end %>
<div class="d-flex ml-auto"> <div class="d-flex ml-auto">
......
...@@ -17,7 +17,7 @@ ...@@ -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="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"> <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> <h1 style="margin-bottom:30px">Password Reset</h1>
......
...@@ -18,7 +18,7 @@ ...@@ -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="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"> <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') %>!, <h1 style="margin-bottom:30px">Welcome to <%= t('bigbluebutton') %>!,
<%= @user[:name] %></h1> <%= @user[:name] %></h1>
......
...@@ -79,7 +79,7 @@ module Greenlight ...@@ -79,7 +79,7 @@ module Greenlight
config.banner_message = ENV['BANNER_MESSAGE'] config.banner_message = ENV['BANNER_MESSAGE']
# Configure custom branding image. # 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. # Enable/disable recording thumbnails.
config.recording_thumbnails = (ENV['RECORDING_THUMBNAILS'] != "false") config.recording_thumbnails = (ENV['RECORDING_THUMBNAILS'] != "false")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment