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

Merge pull request #118 from zach-chai/fix_assets 

Fix some assets not working in production
This commit is contained in:
Zachary Chai 2017-02-09 11:38:51 -05:00 committed by GitHub
parent adb0314701 eacde6bde5
commit a45a704be3
14 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -60,7 +60,7 @@ gem 'bigbluebutton-api-ruby'
gem 'bootstrap-sass', '3.3.0.0' gem 'bootstrap-sass', '3.3.0.0'
gem 'bootstrap-social-rails', '~> 4.12' gem 'bootstrap-social-rails', '~> 4.12'
gem 'font-awesome-rails' gem 'font-awesome-sass'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
gem 'jquery-datatables-rails', '~> 3.4.0' gem 'jquery-datatables-rails', '~> 3.4.0'
gem 'rails-timeago', '~> 2.0' gem 'rails-timeago', '~> 2.0'

6
Gemfile.lock
View File

@ -65,8 +65,8 @@ GEM
faraday (0.9.2) faraday (0.9.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.14) ffi (1.9.14)
font-awesome-rails (4.6.3.1) font-awesome-sass (4.7.0)
railties (>= 3.2, < 5.1) sass (>= 3.2)
globalid (0.3.7) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
hashie (3.4.4) hashie (3.4.4)
@ -216,7 +216,7 @@ DEPENDENCIES
byebug byebug
coffee-rails (~> 4.2) coffee-rails (~> 4.2)
dotenv-rails dotenv-rails
font-awesome-rails font-awesome-sass
http_accept_language http_accept_language
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-datatables-rails (~> 3.4.0) jquery-datatables-rails (~> 3.4.0)

2
app/assets/stylesheets/application.css
View File

@ -29,6 +29,6 @@
* *
*= require jquery-ui *= require jquery-ui
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
*= require_tree . *= require_tree ./main
*= require_self *= require_self
*/ */

2
app/assets/stylesheets/fa/gl-fa.scss Normal file
View File

@ -0,0 +1,2 @@
@import "font-awesome-sprockets";
@import "font-awesome";

0
app/assets/stylesheets/bbb.scss → app/assets/stylesheets/main/bbb.scss
View File

0
app/assets/stylesheets/landing.scss → app/assets/stylesheets/main/landing.scss
View File

0
app/assets/stylesheets/sessions.scss → app/assets/stylesheets/main/sessions.scss
View File

2
app/assets/stylesheets/shared.scss → app/assets/stylesheets/main/shared.scss
View File

@ -17,7 +17,6 @@
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap"; @import "bootstrap";
@import "bootstrap-social"; @import "bootstrap-social";
@import "font-awesome";
html, body { html, body {
@ -33,7 +32,6 @@ html, body {
.background { .background {
height: 350px; height: 350px;
width: 100%; width: 100%;
background: asset-url('greenlight_background');
background-position: center; background-position: center;
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;

4
app/views/landing/rooms.html.erb
View File

@ -77,12 +77,12 @@
<button type="button" class="btn btn-default has-popover recording-update-trigger" <button type="button" class="btn btn-default has-popover recording-update-trigger"
data-placement="left" data-popover-body=".recording-visibility-popover" data-placement="left" data-popover-body=".recording-visibility-popover"
data-popover-title="<%= t('change_recording_visibility') %>"> data-popover-title="<%= t('change_recording_visibility') %>">
<i class="fa fa-eye" aria-hidden="true"></i> <%= icon('eye') %>
</button> </button>
<a tabindex="0" role="button" class="btn btn-default has-popover delete-tooltip" <a tabindex="0" role="button" class="btn btn-default has-popover delete-tooltip"
data-placement="top" data-popover-body=".delete-popover-body" data-placement="top" data-popover-body=".delete-popover-body"
data-popover-title="<%= t('are_you_sure') %>"> data-popover-title="<%= t('are_you_sure') %>">
<i class="fa fa-trash-o" aria-hidden="true"></i> <%= icon('trash-o') %>
</a> </a>
</div> </div>
</div> </div>

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

@ -21,12 +21,18 @@ 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">
</head> </head>
<body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>" data-resource="<%= params[:resource] %>"> <body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>" data-resource="<%= params[:resource] %>"
style="background:url(<%= image_path('greenlight_background.png') if params[:controller] == 'landing' %>);">
<!-- Messages --> <!-- Messages -->
<div id='alerts'> <div id='alerts'>
</div> </div>

8
app/views/shared/_meeting_url.html.erb
View File

@ -35,7 +35,7 @@
data-copy-error="<%= t('copy_error') %>" data-copy-error="<%= t('copy_error') %>"
data-copy-hint="<%= t('url_copy_explanation') %>" data-copy-hint="<%= t('url_copy_explanation') %>"
> >
<i class="fa fa-clipboard" aria-hidden="true"></i> <%= icon('clipboard') %>
</button> </button>
<button type="button" class="btn btn-default meeting-invite has-tooltip pull-right" <button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
@ -43,7 +43,7 @@
data-invite-body="<%= body %>" data-invite-body="<%= body %>"
data-invite-subject="<%= subject %>" data-invite-subject="<%= subject %>"
> >
<i class="fa fa-envelope-o" aria-hidden="true"></i> <%= icon('envelope-o') %>
</button> </button>
</div> </div>
<% else %> <% else %>
@ -55,7 +55,7 @@
data-copy-error="<%= t('copy_error') %>" data-copy-error="<%= t('copy_error') %>"
data-copy-hint="<%= t('url_copy_explanation') %>" data-copy-hint="<%= t('url_copy_explanation') %>"
> >
<i class="fa fa-clipboard" aria-hidden="true"></i> <%= icon('clipboard') %>
</button> </button>
<button type="button" class="btn btn-default meeting-invite has-tooltip" <button type="button" class="btn btn-default meeting-invite has-tooltip"
@ -63,7 +63,7 @@
data-invite-body="<%= body %>" data-invite-body="<%= body %>"
data-invite-subject="<%= subject %>" data-invite-subject="<%= subject %>"
> >
<i class="fa fa-envelope-o" aria-hidden="true"></i> <%= icon('envelope-o') %>
</button> </button>
</span> </span>

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

2
config/initializers/assets.rb
View File

@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js ) Rails.application.config.assets.precompile += %w( fa/gl-fa.css )

12
env
View File

@ -1,9 +1,9 @@
# Step 1 - Create a secret key for rails # Step 1 - Create a secret key for rails
# #
# You can generate a secure one through the Greenlight docker image # You can generate a secure one through the Greenlight docker image
# with with the command # with with the command
# #
# docker run --rm greenlight rake secret # docker run --rm bigbluebutton/greenlight rake secret
# #
SECRET_KEY_BASE= SECRET_KEY_BASE=
@ -18,6 +18,7 @@ SECRET_KEY_BASE=
#BIGBLUEBUTTON_ENDPOINT= #BIGBLUEBUTTON_ENDPOINT=
#BIGBLUEBUTTON_SECRET= #BIGBLUEBUTTON_SECRET=
# If "true", GreenLight will register a webhook callback for each meeting # If "true", GreenLight will register a webhook callback for each meeting
# created. This callback is called for all events that happen in the meeting, # created. This callback is called for all events that happen in the meeting,
# including the processing of its recording. These events are used to update # including the processing of its recording. These events are used to update
@ -62,3 +63,10 @@ TWITTER_SECRET=
# #
GOOGLE_OAUTH2_ID= GOOGLE_OAUTH2_ID=
GOOGLE_OAUTH2_SECRET= GOOGLE_OAUTH2_SECRET=
# Prefix for the application's root URL
# Useful for deploying the application to a subdirectory
#
# default: '/b' (recommended)
#
#RAILS_RELATIVE_URL_ROOT=/b