diff --git a/Gemfile b/Gemfile index 5717fb2e..d257db5f 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem 'bigbluebutton-api-ruby' gem 'bootstrap-sass', '3.3.0.0' gem 'bootstrap-social-rails', '~> 4.12' -gem 'font-awesome-rails' +gem 'font-awesome-sass' gem 'jquery-ui-rails' gem 'jquery-datatables-rails', '~> 3.4.0' gem 'rails-timeago', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index ccd8f2c1..e1a12cb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,8 +65,8 @@ GEM faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.14) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) + font-awesome-sass (4.7.0) + sass (>= 3.2) globalid (0.3.7) activesupport (>= 4.1.0) hashie (3.4.4) @@ -216,7 +216,7 @@ DEPENDENCIES byebug coffee-rails (~> 4.2) dotenv-rails - font-awesome-rails + font-awesome-sass http_accept_language jbuilder (~> 2.5) jquery-datatables-rails (~> 3.4.0) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c1787826..cfe51396 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -29,6 +29,6 @@ * *= require jquery-ui *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap - *= require_tree . + *= require_tree ./main *= require_self */ diff --git a/app/assets/stylesheets/fa/gl-fa.scss b/app/assets/stylesheets/fa/gl-fa.scss new file mode 100644 index 00000000..001bc336 --- /dev/null +++ b/app/assets/stylesheets/fa/gl-fa.scss @@ -0,0 +1,2 @@ +@import "font-awesome-sprockets"; +@import "font-awesome"; diff --git a/app/assets/stylesheets/bbb.scss b/app/assets/stylesheets/main/bbb.scss similarity index 100% rename from app/assets/stylesheets/bbb.scss rename to app/assets/stylesheets/main/bbb.scss diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/main/landing.scss similarity index 100% rename from app/assets/stylesheets/landing.scss rename to app/assets/stylesheets/main/landing.scss diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/main/sessions.scss similarity index 100% rename from app/assets/stylesheets/sessions.scss rename to app/assets/stylesheets/main/sessions.scss diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/main/shared.scss similarity index 97% rename from app/assets/stylesheets/shared.scss rename to app/assets/stylesheets/main/shared.scss index 92d30c85..0febf358 100644 --- a/app/assets/stylesheets/shared.scss +++ b/app/assets/stylesheets/main/shared.scss @@ -17,7 +17,6 @@ @import "bootstrap-sprockets"; @import "bootstrap"; @import "bootstrap-social"; -@import "font-awesome"; html, body { @@ -33,7 +32,6 @@ html, body { .background { height: 350px; width: 100%; - background: asset-url('greenlight_background'); background-position: center; background-size: cover; background-repeat: no-repeat; diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index c9551996..d0ed1226 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -77,12 +77,12 @@ - + <%= icon('trash-o') %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c670ddb5..58ff0dca 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,12 +21,18 @@ with BigBlueButton; if not, see . + <% if relative_root != '/b' %> + + <% else %> + <%= stylesheet_link_tag 'fa/gl-fa', media: 'all', 'data-turbolinks-track': 'reload' %> + <% end %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - +
diff --git a/app/views/shared/_meeting_url.html.erb b/app/views/shared/_meeting_url.html.erb index a487afae..d2dd0e4c 100644 --- a/app/views/shared/_meeting_url.html.erb +++ b/app/views/shared/_meeting_url.html.erb @@ -35,7 +35,7 @@ data-copy-error="<%= t('copy_error') %>" data-copy-hint="<%= t('url_copy_explanation') %>" > - + <%= icon('clipboard') %> <% else %> @@ -55,7 +55,7 @@ data-copy-error="<%= t('copy_error') %>" data-copy-hint="<%= t('url_copy_explanation') %>" > - + <%= icon('clipboard') %> diff --git a/config/environments/production.rb b/config/environments/production.rb index 7ccf92cc..cd23b595 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -87,4 +87,6 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + + config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] || '/b' end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 01ef3e66..e56f0bfe 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # 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 ) diff --git a/env b/env index 2c49bf57..b330ddab 100644 --- a/env +++ b/env @@ -1,9 +1,9 @@ # 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 # -# docker run --rm greenlight rake secret +# docker run --rm bigbluebutton/greenlight rake secret # SECRET_KEY_BASE= @@ -18,6 +18,7 @@ SECRET_KEY_BASE= #BIGBLUEBUTTON_ENDPOINT= #BIGBLUEBUTTON_SECRET= + # If "true", GreenLight will register a webhook callback for each 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 @@ -62,3 +63,10 @@ TWITTER_SECRET= # GOOGLE_OAUTH2_ID= 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