forked from External/greenlight
		
	minor styling and fixes
This commit is contained in:
		@@ -5,7 +5,6 @@ README.md
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# Rails
 | 
					# Rails
 | 
				
			||||||
.env
 | 
					.env
 | 
				
			||||||
sample.env
 | 
					 | 
				
			||||||
*.rbc
 | 
					*.rbc
 | 
				
			||||||
capybara-*.html
 | 
					capybara-*.html
 | 
				
			||||||
.rspec
 | 
					.rspec
 | 
				
			||||||
@@ -14,7 +13,6 @@ tmp
 | 
				
			|||||||
/db/**/*.sqlite3
 | 
					/db/**/*.sqlite3
 | 
				
			||||||
/db/**/*.sqlite3-journal
 | 
					/db/**/*.sqlite3-journal
 | 
				
			||||||
/db/production
 | 
					/db/production
 | 
				
			||||||
public/system
 | 
					 | 
				
			||||||
public/assets
 | 
					public/assets
 | 
				
			||||||
public/gl
 | 
					public/gl
 | 
				
			||||||
coverage/
 | 
					coverage/
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,10 +64,6 @@ class Room < ApplicationRecord
 | 
				
			|||||||
    options[:user_is_moderator] ||= false
 | 
					    options[:user_is_moderator] ||= false
 | 
				
			||||||
    options[:meeting_recorded] ||= false
 | 
					    options[:meeting_recorded] ||= false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #options[:wait_for_moderator] ||= false
 | 
					 | 
				
			||||||
    #options[:meeting_name] ||= name
 | 
					 | 
				
			||||||
    #options[:room_owner] ||= nil
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    return call_invalid_res if !bbb
 | 
					    return call_invalid_res if !bbb
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Get the meeting info.
 | 
					    # Get the meeting info.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
<div class="background landing-section">
 | 
					<div class="background landing-section">
 | 
				
			||||||
  <div class="d-flex align-items-center" style="height: 100%;">
 | 
					  <div class="d-flex align-items-center" style="height: 100%;">
 | 
				
			||||||
    <div class="container text-center">
 | 
					    <div class="container text-center">
 | 
				
			||||||
      <h1 id="main-text" class="font-weight-400 responsive-header">Welcome to BigBlueButton.</h1>
 | 
					      <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>
 | 
					      <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://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <div class="row">
 | 
					    <div class="row">
 | 
				
			||||||
      <div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5 align-top">
 | 
					      <div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5 align-top">
 | 
				
			||||||
        <% if @room.owner.image.nil? %>
 | 
					        <% if @room.owner.image.blank? %>
 | 
				
			||||||
          <span class="avatar"><%= @room.owner.name.first %></span>
 | 
					          <span class="avatar"><%= @room.owner.name.first %></span>
 | 
				
			||||||
        <% else %>
 | 
					        <% else %>
 | 
				
			||||||
          <span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
 | 
					          <span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,7 @@ services:
 | 
				
			|||||||
    entrypoint: [bin/start]
 | 
					    entrypoint: [bin/start]
 | 
				
			||||||
    image: joshblind/greenlight:latest
 | 
					    image: joshblind/greenlight:latest
 | 
				
			||||||
    container_name: greenlight-web
 | 
					    container_name: greenlight-web
 | 
				
			||||||
    env_file: .env
 | 
					    env_file: env
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - 6000:3000
 | 
					      - 6000:3000
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,12 +1,9 @@
 | 
				
			|||||||
# This is a sample of the environment variables you will need
 | 
					 | 
				
			||||||
# To use, copy this file to .env `cp sample.env .env`
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Create a Secret Key for Rails
 | 
					# 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 bigbluebutton/greenlight rake secret
 | 
					#   docker run --rm bigbluebutton/greenlight bundle exec rake secret
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
SECRET_KEY_BASE=
 | 
					SECRET_KEY_BASE=
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -44,7 +41,7 @@ TWITTER_SECRET=
 | 
				
			|||||||
# Set this to true if you want GreenLight to support user signup and login without
 | 
					# Set this to true if you want GreenLight to support user signup and login without
 | 
				
			||||||
# Omniauth. This will allow users to create an account at www.hostname.com/signup
 | 
					# Omniauth. This will allow users to create an account at www.hostname.com/signup
 | 
				
			||||||
# and use that account to fully interact with GreenLight.
 | 
					# and use that account to fully interact with GreenLight.
 | 
				
			||||||
ALLOW_GREENLIGHT_ACCOUNTS=false
 | 
					ALLOW_GREENLIGHT_ACCOUNTS=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Prefix for the applications root URL.
 | 
					# Prefix for the applications root URL.
 | 
				
			||||||
# Useful for deploying the application to a subdirectory, which is highly recommended
 | 
					# Useful for deploying the application to a subdirectory, which is highly recommended
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user