forked from External/greenlight
Merge pull request #2 from bigbluebutton/release_recommendations
Final tweaks and getting ready for release.
This commit is contained in:
Joshua Arts
GitHub
commit
fd1b550f93
|
|
@ -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:
|
||||
|
||||
[](https://youtu.be/Hso8yLzkqj8)
|
||||
|
||||
## Installation on a BigBlueButton Server
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}
|
||||
|
||||
.thumbnail {
|
||||
height: 40% !important;
|
||||
height: 60px !important;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
|
|
@ -22,3 +22,7 @@
|
|||
.home-indicator {
|
||||
font-size: 22px !important;
|
||||
}
|
||||
|
||||
.btn-del-room {
|
||||
width: 70% !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,8 +65,9 @@ class RoomsController < ApplicationController
|
|||
|
||||
# DELETE /:room_uid
|
||||
def destroy
|
||||
p @room
|
||||
# Don't delete the users home room.
|
||||
@room.destroy if @room != current_user.main_room
|
||||
@room.destroy if @room.owned_by?(current_user) && @room != current_user.main_room
|
||||
|
||||
redirect_to current_user.main_room
|
||||
end
|
||||
|
|
|
|||
|
|
@ -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!
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<h1 id="main-text" class="font-weight-400 responsive-header">Welcome to Greenlight.</h1>
|
||||
<h4 class="text-muted">A simple front end for your BigBlueButton Open Source Web Conferencing Server.</h4>
|
||||
|
||||
<%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %>
|
||||
<%= link_to "https://youtu.be/Hso8yLzkqj8", class: "p-3", target: "_blank" do %>
|
||||
<h4>Watch a tutorial on using Greenlight <i class="far fa-play-circle"></i></h4>
|
||||
<% end %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
<%= render "shared/components/room_block", room: room %>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= render "shared/modals/delete_room_modal", room: room %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@
|
|||
<% if room != current_user.main_room %>
|
||||
<div class="item-action dropdown">
|
||||
<a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fas fa-ellipsis-v"></i></a>
|
||||
<div class="dropdown-menu dropdown-menu-right">
|
||||
<div class="dropdown-menu">
|
||||
<!--
|
||||
<%= link_to room, class: "dropdown-item" do %>
|
||||
<i class="dropdown-icon fas fa-cog"></i> Room Settings
|
||||
<% end %>
|
||||
-->
|
||||
<%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %>
|
||||
<a href="" data-toggle="modal" data-target="#deleteRoomModal_<%= room.uid %>"class="dropdown-item">
|
||||
<i class="dropdown-icon far fa-trash-alt"></i> Delete
|
||||
<% end %>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
<div class="modal fade" id="deleteRoomModal_<%= room.uid %>" tabindex="-1" role="dialog">
|
||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||
<div class="modal-content text-center">
|
||||
<div class="modal-body">
|
||||
<div class="card-body p-6">
|
||||
<div class="card-title">
|
||||
<h3>Are you sure you want to delete <%= room.name %>?</h3>
|
||||
</div>
|
||||
|
||||
<button type="button" class="btn btn-pill btn-info my-1 btn-del-room" data-dismiss="modal">
|
||||
On second thought, I'll keep it.
|
||||
</button>
|
||||
|
||||
<%= button_to room, method: :delete, id: "delete-confirm", class: "btn btn-pill btn-danger my-1 btn-del-room" do %>
|
||||
I'm sure, delete this room.
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<p>You will <b>not</b> be able to recover this room or any of its associated recordings.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue