gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the _mailbot_* files not depend on @conference

Browse source
This commit is contained in:
Michael Ball 2021-04-15 20:11:40 -07:00
parent d4dba945fc
commit 9f83965c18
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/views/layouts/_mailbot_footer.html.erb
View file

@ -1,12 +1,7 @@
<html lang="en"> <% if @conference.present? %>
<head> <div id="border" style="background-color: <%= conference_color(@conference) %>">
<meta charset="utf-8"/> <% else %>
<meta content="width=device-width, initial-scale=1" name="viewport"/> <div id="border" style="background-color: #003262">
<meta content="Snap!Con -- A conference all about Snap!, a programing language from UC Berkeley." name="description"/> <% end %>
<meta content="Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock" name="author"/>
<%= stylesheet_link_tag "mailbot" %>
</head>
<body>
<div id="border" style="background-color: <%= conference_color(@conference) %>"></div>
</body> </body>
</html> </html>

16
app/views/layouts/_mailbot_header.html.erb
View file

@ -9,17 +9,21 @@
<meta content="Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock" name="author"/> <meta content="Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock" name="author"/>
<%= stylesheet_link_tag "mailbot" %> <%= stylesheet_link_tag "mailbot" %>
</head> </head>
<body>
<div id="border" style="background-color: <%= conference_color(@conference) %>"> <body>
<% if @conference.present? %>
<div id="border" style="background-color: <%= conference_color(@conference) %>">
<% else %>
<div id="border" style="background-color: #003262">
<% end %>
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<% if @conference.present? %> <% if @conference.present? %>
<%= image_tag(conference_logo_url(@conference), style: "display:block;height:70px;width:auto;", alt: @conference.title + ' logo') %> <%= 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 %> <% end %>
</div> </div>
</div> </div>
</div> </div>
</body>