lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serve fa assets from relative root

This commit is contained in:
Zachary Chai 2017-02-09 11:28:11 -05:00
parent 6c374bd0c0
commit 3dd3f43b24
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/layouts/application.html.erb
View File

@ -21,6 +21,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<meta name="action-cable-url" content="<%= relative_root+Rails.configuration.action_cable.mount_path %>"/> <meta name="action-cable-url" content="<%= relative_root+Rails.configuration.action_cable.mount_path %>"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<% if relative_root != '/b' %>
<script src="https://use.fontawesome.com/5ec1c77c7b.js"></script>
<% else %>
<%= stylesheet_link_tag 'fa/gl-fa', media: 'all', 'data-turbolinks-track': 'reload' %>
<% end %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet">

2
config/environments/production.rb
View File

@ -87,4 +87,6 @@ Rails.application.configure do
# Do not dump schema after migrations. # Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false config.active_record.dump_schema_after_migration = false
config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] || '/b'
end end