multiple fixes and tweaks

This commit is contained in:
Joshua Arts 2018-07-04 15:22:59 -04:00
parent 21e0a3558d
commit 8a9f2a3cc2
6 changed files with 13 additions and 10 deletions

View File

@ -12,7 +12,9 @@ Interested? Try Greenlight out on our [demo server](https://demo.bigbluebutton.o
Greenlight is also completely configurable. This means you can turn on/off features to make Greenlight fit your specific use case. For more information on Greenlight and its features, see our [documentation](http://docs.bigbluebutton.org/install/greenlight.html).
For a overview of how Greenlight works, checkout our [Introduction to Greenlight Video](https://youtu.be/yGX3JCv7OVM).
For a overview of how Greenlight works, checkout our Introduction to Greenlight Video:
[![GreenLight Overview](https://img.youtube.com/vi/Hso8yLzkqj8/0.jpg)](https://youtu.be/Hso8yLzkqj8)
## Installation on a BigBlueButton Server

View File

@ -23,8 +23,8 @@ class User < ApplicationRecord
# Generates a user from omniauth.
def from_omniauth(auth)
find_or_initialize_by(social_uid: auth['uid'], provider: auth['provider']).tap do |u|
u.name = send("#{auth['provider']}_name", auth)
u.username = send("#{auth['provider']}_username", auth)
u.name = send("#{auth['provider']}_name", auth) unless u.name
u.username = send("#{auth['provider']}_username", auth) unless u.username
u.email = send("#{auth['provider']}_email", auth)
u.image = send("#{auth['provider']}_image", auth)
u.save!

View File

@ -10,7 +10,7 @@
<%= image_tag("logo_with_text.png", class: "header-brand-img") %>
<% end %>
<% end %>
<div class="d-flex ml-auto">
<% if current_user %>
<a class="px-5 ml-2 mt-1" href="" data-toggle="modal" data-target="#createRoomModal">
@ -29,13 +29,13 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow" x-placement="bottom-end">
<%= link_to current_user.main_room, class: "dropdown-item" do %>
<i class="dropdown-icon fas fa-home"></i> Home Room
<i class="dropdown-icon fas fa-home"></i> Home Room
<% end %>
<%= link_to edit_user_path(current_user), class: "dropdown-item" do %>
<i class="dropdown-icon fas fa-cog"></i> Settings
<% end %>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="http://docs.bigbluebutton.org/support/faq.html">
<a class="dropdown-item" href="http://docs.bigbluebutton.org/install/greenlight.html" target="_blank">
<i class="dropdown-icon far fa-question-circle"></i> Need help?
</a>
<%= link_to logout_path, class: "dropdown-item" do %>
@ -49,7 +49,7 @@
<% if allow_user_signup? %>
<%= link_to "Signup", signup_path, :class => "btn btn-pill btn-outline-primary mx-2" %>
<% end %>
<%= render "shared/modals/login_modal" %>
<% end %>
</div>

View File

@ -16,7 +16,7 @@
<div class="invalid-feedback text-left">Room name cannot be blank.</div>
</div>
<label class="custom-switch mt-5 mb-5 float-left">
<%= f.check_box :auto_join, class: "custom-switch-input", checked: true %>
<%= f.check_box :auto_join, class: "custom-switch-input", checked: false %>
<span class="custom-switch-indicator"></span>
<span class="custom-switch-description">Automatically join me into the room.</span>
</label>

View File

@ -18,7 +18,7 @@
</div>
<br>
<%= f.label "Provider", class: "form-label" %>
<%= f.text_field :provider, class: "form-control", value: @user.provider.capitalize, readonly: "" %>
<%= f.text_field :provider, class: "form-control", readonly: "" %>
<%= f.label "Image", class: "form-label mt-5" %>
<div class="row">

View File

@ -28,7 +28,8 @@
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password_confirmation).first %></div>
</div>
<div class="card-footer">
<%= f.submit "Sign up", class: "btn btn-primary float-right" %>
<%= f.submit "Sign up", class: "btn btn-primary float-right ml-2" %>
<%= link_to "Cancel", root_path, class: "btn btn-danger float-right ml-2" %>
</div>
<% end %>
</div>