From 9f83965c18617faacdf0105298cbccd6e1394236 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 15 Apr 2021 20:11:40 -0700 Subject: [PATCH] Make the _mailbot_* files not depend on @conference --- app/views/layouts/_mailbot_footer.html.erb | 17 ++++++----------- app/views/layouts/_mailbot_header.html.erb | 16 ++++++++++------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/views/layouts/_mailbot_footer.html.erb b/app/views/layouts/_mailbot_footer.html.erb index 3cc8b3c3..4cc06c7f 100644 --- a/app/views/layouts/_mailbot_footer.html.erb +++ b/app/views/layouts/_mailbot_footer.html.erb @@ -1,12 +1,7 @@ - - - - - - - <%= stylesheet_link_tag "mailbot" %> - - -
+ <% if @conference.present? %> +
+ <% else %> +
+ <% end %> - \ No newline at end of file + diff --git a/app/views/layouts/_mailbot_header.html.erb b/app/views/layouts/_mailbot_header.html.erb index 12f9d4a5..f3c33bd8 100644 --- a/app/views/layouts/_mailbot_header.html.erb +++ b/app/views/layouts/_mailbot_header.html.erb @@ -9,17 +9,21 @@ <%= stylesheet_link_tag "mailbot" %> - -
+ + + + <% if @conference.present? %> +
+ <% else %> +
+ <% end %>
<% if @conference.present? %> <%= image_tag(conference_logo_url(@conference), style: "display:block;height:70px;width:auto;", alt: @conference.title + ' logo') %> + <% else %> + <%= image_tag(Organization.first.picture_url, style: "display:block;height:70px;width:auto;", alt: ENV['OSEM_NAME'] + ' logo') %> <% end %>
- - - - \ No newline at end of file