forked from External/greenlight
GRN2-6: Added the ability for admins to specify registration method (#520)
* Added the ability to invite users * Small bug fix * Added the ability to approve/decline users * Small bug fixes * More bug fixes * More minor changes * Final changes
This commit is contained in:
farhatahmad
committed by
Jesus Federico
Jesus Federico
parent
adf4b68008
commit
720dac6012
@ -96,22 +96,30 @@ module Greenlight
|
||||
# The maximum number of rooms included in one bbbapi call
|
||||
config.pagination_number = ENV['PAGINATION_NUMBER'].to_i.zero? ? 25 : ENV['PAGINATION_NUMBER'].to_i
|
||||
|
||||
# Default branding image if the user does not specify one
|
||||
config.branding_image_default = "https://raw.githubusercontent.com/bigbluebutton/greenlight/master/app/assets/images/logo_with_text.png"
|
||||
|
||||
# Default primary color if the user does not specify one
|
||||
config.primary_color_default = "#467fcf"
|
||||
|
||||
# Default admin password
|
||||
config.admin_password_default = ENV['ADMIN_PASSWORD'] || 'administrator'
|
||||
|
||||
# Number of rows to display per page
|
||||
config.pagination_rows = ENV['NUMBER_OF_ROWS'].to_i.zero? ? 10 : ENV['NUMBER_OF_ROWS'].to_i
|
||||
config.pagination_rows = ENV['NUMBER_OF_ROWS'].to_i.zero? ? 25 : ENV['NUMBER_OF_ROWS'].to_i
|
||||
|
||||
# Whether the user has defined the variables required for recaptcha
|
||||
config.recaptcha_enabled = ENV['RECAPTCHA_SITE_KEY'].present? && ENV['RECAPTCHA_SECRET_KEY'].present?
|
||||
|
||||
# Show/hide "Add to Google Calendar" button in the room page
|
||||
config.enable_google_calendar_button = (ENV['ENABLE_GOOGLE_CALENDAR_BUTTON'] == "true")
|
||||
|
||||
# Enum containing the different possible registration methods
|
||||
config.registration_methods = { open: "0", invite: "1", approval: "2" }
|
||||
|
||||
# DEFAULTS
|
||||
|
||||
# Default branding image if the user does not specify one
|
||||
config.branding_image_default = "https://raw.githubusercontent.com/bigbluebutton/greenlight/master/app/assets/images/logo_with_text.png"
|
||||
|
||||
# Default primary color if the user does not specify one
|
||||
config.primary_color_default = "#467fcf"
|
||||
|
||||
# Default registration method if the user does not specify one
|
||||
config.registration_method_default = config.registration_methods[:open]
|
||||
|
||||
# Default admin password
|
||||
config.admin_password_default = ENV['ADMIN_PASSWORD'] || 'administrator'
|
||||
end
|
||||
end
|
||||
|
||||
@ -31,18 +31,30 @@ en:
|
||||
color:
|
||||
info: Change the primary color used across the website
|
||||
title: Primary Color
|
||||
registration:
|
||||
info: Change the way that users register to the website
|
||||
title: Registration Method
|
||||
methods:
|
||||
approval: Approve/Decline
|
||||
invite: Join by Invitation
|
||||
open: Open Registration
|
||||
subtitle: Customize Greenlight
|
||||
title: Site Settings
|
||||
flash:
|
||||
approved: User has been successfully approved.
|
||||
banned: User has been successfully banned.
|
||||
unbanned: User has been successfully unbanned.
|
||||
delete: User deleted successfully
|
||||
delete_fail: Failed to delete user
|
||||
demoted: User has been successfully demoted
|
||||
invite: Invite successfully sent to %{email}
|
||||
invite_email_verification: ALLOW_MAIL_NOTIFICATIONS must be set to true in order to use this method
|
||||
promoted: User has been successfully promoted
|
||||
registration_method_updated: Registration method successfully updated
|
||||
unauthorized: You are not authorized to perform actions on this user
|
||||
title: Organization Settings
|
||||
users:
|
||||
invite: Invite User
|
||||
edit:
|
||||
title: Edit User Details
|
||||
settings:
|
||||
@ -105,6 +117,7 @@ en:
|
||||
unauthorized:
|
||||
message: You do not have access to this application
|
||||
help: If you believe this is a mistake, please contact your system administrator.
|
||||
|
||||
unprocessable:
|
||||
message: Oops! Request is unprocessable.
|
||||
help: Unfortunately this isn't a valid request.
|
||||
@ -157,6 +170,18 @@ en:
|
||||
login_title: Sign in to your account
|
||||
mailer:
|
||||
user:
|
||||
approve:
|
||||
info: Your account has been approved.
|
||||
signin: To access your personal rooms, click the button below and sign in.
|
||||
signin_link: Sign In
|
||||
subject: Account Approved
|
||||
username: Your username is %{email}.
|
||||
invite:
|
||||
info: You have been invited to your own personal space by %{name}
|
||||
signup: To signup using your email, click the button below and follow the steps.
|
||||
signup_link: Sign Up
|
||||
subject: Invitation to join BigBlueButton
|
||||
username: Your username is %{email}.
|
||||
password_reset:
|
||||
title: 'Password reset'
|
||||
welcome: It seems like you forgot your password for %{bigbluebutton}
|
||||
@ -191,6 +216,11 @@ en:
|
||||
delete: I'm sure, delete this room.
|
||||
keep: On second thought, I'll keep it.
|
||||
warning: You will <b>not</b> be able to recover this room or any of its %{recordings_num} associated recordings.
|
||||
invite_user:
|
||||
email_placeholder: Enter the user's email
|
||||
footer: The user will receive an email with instructions on how to sign up
|
||||
send: Send Invite
|
||||
title: Invite User
|
||||
login:
|
||||
or: or
|
||||
with: Sign in with %{provider}
|
||||
@ -246,6 +276,15 @@ en:
|
||||
unlisted: Unlisted
|
||||
format:
|
||||
presentation: Presentation
|
||||
registration:
|
||||
approval:
|
||||
fail: Your account has not been approved yet. If multiples days have passed since you signed up, please contact your administrator.
|
||||
signup: Your account was successfully created. It has been sent to an administrator for approval.
|
||||
banned:
|
||||
fail: You do not have access to this application. If you believe this is a mistake, please contact your administrator.
|
||||
invite:
|
||||
fail: Your token is either invalid or has expired. If you believe this is a mistake, please contact your administrator.
|
||||
no_invite: You do not have an invitation to join. Please contact your administrator to receive one.
|
||||
rename: Rename
|
||||
reset_password:
|
||||
subtitle: Reset Password
|
||||
@ -255,6 +294,7 @@ en:
|
||||
roles:
|
||||
administrator: Administrator
|
||||
banned: Banned
|
||||
pending: Pending
|
||||
super_admin: Super Admin
|
||||
user: User
|
||||
room:
|
||||
|
||||
@ -45,6 +45,9 @@ Rails.application.routes.draw do
|
||||
post '/demote/:user_uid', to: 'admins#demote', as: :admin_demote
|
||||
post '/ban/:user_uid', to: 'admins#ban_user', as: :admin_ban
|
||||
post '/unban/:user_uid', to: 'admins#unban_user', as: :admin_unban
|
||||
post '/invite', to: 'admins#invite', as: :invite_user
|
||||
post '/registration_method/:method', to: 'admins#registration_method', as: :admin_change_registration
|
||||
post '/approve/:user_uid', to: 'admins#approve', as: :admin_approve
|
||||
end
|
||||
|
||||
scope '/themes' do
|
||||
|
||||
Reference in New Issue
Block a user