Merge pull request #118 from zach-chai/fix_assets

Fix some assets not working in production
2017-02-09 11:38:51 -05:00
parent adb0314701 eacde6bde5
commit a45a704be3
14 changed files with 33 additions and 17 deletions
--- a/2
+++ b/2
@@ -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'
--- 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)
--- 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
 */
--- a/app/assets/stylesheets/fa/gl-fa.scss
+++ b/app/assets/stylesheets/fa/gl-fa.scss
@@ -0,0 +1,2 @@
+@import "font-awesome-sprockets";
+@import "font-awesome";
--- a/app/assets/stylesheets/main/bbb.scss
+++ b/app/assets/stylesheets/main/bbb.scss
--- a/app/assets/stylesheets/main/landing.scss
+++ b/app/assets/stylesheets/main/landing.scss
--- a/app/assets/stylesheets/main/sessions.scss
+++ b/app/assets/stylesheets/main/sessions.scss
--- a/app/assets/stylesheets/main/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;
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -77,12 +77,12 @@
    <button type="button" class="btn btn-default has-popover recording-update-trigger"
            data-placement="left" data-popover-body=".recording-visibility-popover"
            data-popover-title="<%= t('change_recording_visibility') %>">
-      <i class="fa fa-eye" aria-hidden="true"></i>
+      <%= icon('eye') %>
    </button>
    <a tabindex="0" role="button" class="btn btn-default has-popover delete-tooltip"
       data-placement="top" data-popover-body=".delete-popover-body"
       data-popover-title="<%= t('are_you_sure') %>">
-        <i class="fa fa-trash-o" aria-hidden="true"></i>
+        <%= icon('trash-o') %>
    </a>
  </div>
 </div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -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="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' %>
    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet">
  </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 -->
    <div id='alerts'>
    </div>
--- 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') %>"
        >
-          <i class="fa fa-clipboard" aria-hidden="true"></i>
+          <%= icon('clipboard') %>
        </button>

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

      <button type="button" class="btn btn-default meeting-invite has-tooltip"
@@ -63,7 +63,7 @@
        data-invite-body="<%= body %>"
        data-invite-subject="<%= subject %>"
      >
-        <i class="fa fa-envelope-o" aria-hidden="true"></i>
+        <%= icon('envelope-o') %>
      </button>

  </span>
--- 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
--- 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 )
--- a/10
+++ b/10
@@ -3,7 +3,7 @@
 # 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