forked from External/greenlight
Admin panel (#496)
* Added the administrator role and functionality that comes with it (#403) * GRN-20: Added roles to the user model * GRN-75: Added a view for admins to see their users * GRN-77: Added Edit/Delete/Promote ability for admins * GRN-71: Added admin account by default * Changed the way locales are shown * Updated the rest of the locales * Changed the way available_locales are defined * Updated locales in Russian * Updated locaales for German * Update user.rb * Update admins.js * GRN-15: Added the ability to change color and image from admin interface (#425) * GRN-20: Added roles to the user model * GRN-75: Added a view for admins to see their users * GRN-77: Added Edit/Delete/Promote ability for admins * GRN-71: Added admin account by default * Changed the way locales are shown * Updated the rest of the locales * Changed the way available_locales are defined * Updated locales in Russian * Updated locaales for German * GRN-15: Added the ability for admins to customize color and image * Update user.rb * Update user.rb * Update routes.rb * Update admins_controller.rb * GRN-87:Added a super admin role and made changes to how to the design works (#430) * GRN-20: Added roles to the user model * GRN-75: Added a view for admins to see their users * GRN-77: Added Edit/Delete/Promote ability for admins * GRN-71: Added admin account by default * Changed the way locales are shown * Updated the rest of the locales * Changed the way available_locales are defined * Updated locales in Russian * Updated locaales for German * GRN-15: Added the ability for admins to customize color and image * Added the super admin and completed the design tab * Update user.rb * Update themes_controller_spec.rb * Update routes.rb * Update admins_controller.rb * Removed duplicated code that broke the build after last merge * GRN-78: Restructured some of the views to make the UI more consistent and responsive (#435) * GRN-20: Added roles to the user model * GRN-75: Added a view for admins to see their users * GRN-77: Added Edit/Delete/Promote ability for admins * GRN-71: Added admin account by default * GRN-15: Added the ability for admins to customize color and image * Added the super admin and completed the design tab * GRN-78: Cleaned up buttons and moved signin to its own page * GRN-78: Moved the Rooms and Recordings link to nav bar * Merge fix * Views restructure fix (#458) * Added cache to gitlab-ci.yml * Restructured seed * GRN2-99 -> GRN2-106: UI cleanup and refactoring (#478) * GRN2-98: Change Fullname to Full name * GRN2-105: Changed View Users to Manage Users * GRN2-101/103: Updated email to match branding * GRN2-100: Updated Email Sent flash to be more descriptive * GRN2-104: Redirect user to sign in page w/ flash after clicking activation link * GRN2-102: Changed the wording in the verification email * GRN2-99: Added email form validation * GRN2-106: Cleaned up Users list front end * Fixes to rake and admin password validator for passing rubocop * GRN2-113: Fixed issues with admin panel (#479) * GRN2-116: Code clean up after restructure of views (#482) * Removed unused references * Rubocop * Added pagination to admin view (#483) * GRN2-114: Added the ability for admins to ban/unban users (#487) * Added the ability for admins to ban and unban users * Update sessions_helper.rb * Merge branch 'master' into admin-panel (#492) * Updated rubocop gem * Updated rubocop and fixed issues (#490) * Rubocop fixes * GRN2-122: Updated sign in flow for admins and switch design tab to site settings (#489) * Switched design tab to site settings * Update _header with spaces instead of tabs * Added more test cases to increase coverage (#494)
This commit is contained in:
Jesus Federico
GitHub
@ -13,7 +13,7 @@
|
||||
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||
%>
|
||||
|
||||
<div class="container pt-8">
|
||||
<div class="container pt-6">
|
||||
<%= render "shared/components/subtitle", subtitle: t("settings.title"), search: false %>
|
||||
|
||||
<div class="row">
|
||||
@ -30,12 +30,6 @@
|
||||
</button>
|
||||
<% end %>
|
||||
|
||||
<% if Rails.configuration.allow_custom_branding %>
|
||||
<button id="design" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "design"%>">
|
||||
<span class="icon mr-3"><i class="fas fa-edit"></i></span><%= t("settings.design.title") %>
|
||||
</button>
|
||||
<% end %>
|
||||
|
||||
<button id="delete" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "delete"%>">
|
||||
<span class="icon mr-3"><i class="fas fa-trash-alt"></i></span><%= t("settings.delete.title") %>
|
||||
</button>
|
||||
@ -49,10 +43,6 @@
|
||||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
<div class="mt-8">
|
||||
<%= render 'shared/flash_messages' unless flash.empty? %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -63,10 +53,6 @@
|
||||
<%= render "shared/settings/setting_view", setting_id: "password", setting_title: t("settings.password.subtitle") %>
|
||||
<% end %>
|
||||
|
||||
<% if Rails.configuration.allow_custom_branding %>
|
||||
<%= render "shared/settings/setting_view", setting_id: "design", setting_title: t("settings.design.subtitle") %>
|
||||
<% end %>
|
||||
|
||||
<%= render "shared/settings/setting_view", setting_id: "delete", setting_title: t("settings.delete.subtitle") %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
<div class="container">
|
||||
<div class="row pt-7">
|
||||
<div class="col col-4 offset-4">
|
||||
<div class="col col-lg-6 offset-lg-3">
|
||||
<div class="card">
|
||||
<div class="card-header background">
|
||||
<h4 class="mt-2"><%= t("signup.subtitle") %></h4>
|
||||
@ -23,7 +23,7 @@
|
||||
<div class="card-body background">
|
||||
<% unless iconset_providers.length.zero? %>
|
||||
<% iconset_providers.each do |provider| %>
|
||||
<%= link_to omniauth_login_url(provider), class: "customBtn-#{provider}" do %>
|
||||
<%= link_to omniauth_login_url(provider), class: "customBtn-#{provider} oauth-signin" do %>
|
||||
<span class="customBtn-icon">
|
||||
<img class="customBtn-image"></img>
|
||||
</span>
|
||||
@ -69,9 +69,9 @@
|
||||
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:accepted_terms).first %></div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="card-footer">
|
||||
<%= f.submit t("signup.title"), class: "btn btn-primary float-right ml-2" %>
|
||||
<%= link_to t("cancel"), root_path, class: "btn btn-secondary float-right ml-2" %>
|
||||
<div class="card-footer px-0 pb-0">
|
||||
<%= f.submit t("signup.title"), class: "btn btn-primary btn-block signin-button" %>
|
||||
<%= link_to t("cancel"), root_path, class: "btn btn-secondary btn-block signin-button" %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@ -18,4 +18,4 @@
|
||||
# without losing all css
|
||||
%>
|
||||
|
||||
<%= render "shared/sessions", recordings: @recordings, only_public: false, user_recordings: true %>
|
||||
<%= render "shared/sessions", recordings: @recordings, only_public: false, user_recordings: true, title: t("recording.all_recordings") %>
|
||||
|
||||
73
app/views/users/signin.html.erb
Normal file
73
app/views/users/signin.html.erb
Normal file
@ -0,0 +1,73 @@
|
||||
<%
|
||||
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
|
||||
# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
|
||||
# This program is free software; you can redistribute it and/or modify it under the
|
||||
# terms of the GNU Lesser General Public License as published by the Free Software
|
||||
# Foundation; either version 3.0 of the License, or (at your option) any later
|
||||
# version.
|
||||
#
|
||||
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
# You should have received a copy of the GNU Lesser General Public License along
|
||||
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||
%>
|
||||
|
||||
<div class="container">
|
||||
<div class="row pt-7">
|
||||
<div class="col col-lg-6 offset-lg-3">
|
||||
<div class="card">
|
||||
<div class="card-header background">
|
||||
<h4 class="mt-2"><%= t("login_title") %></h4>
|
||||
</div>
|
||||
<div class="card-body background">
|
||||
<% unless iconset_providers.length.zero? %>
|
||||
<% iconset_providers.each do |provider| %>
|
||||
<%= link_to omniauth_login_url(provider), class: "customBtn-#{provider} oauth-signin" do %>
|
||||
<span class="customBtn-icon ">
|
||||
<img class="customBtn-image"></img>
|
||||
</span>
|
||||
<span class="customBtn-text"><%= t("modal.login.with", provider: t("provider.#{provider}")) %></span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<div class="or-line my-6">
|
||||
<div>
|
||||
<span class="text-uppercase" style="background-color: #F5F7FB;">
|
||||
<%= t("modal.login.or") %>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<%= form_for(:session, url: create_session_path) do |f| %>
|
||||
<div class="form-group">
|
||||
<div class="input-icon">
|
||||
<span class="input-icon-addon">
|
||||
<i class="fas fa-at"></i>
|
||||
</span>
|
||||
<%= f.text_field :email, class: "form-control", placeholder: t("email"), value: "" %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="input-icon">
|
||||
<span class="input-icon-addon">
|
||||
<i class="fas fa-key"></i>
|
||||
</span>
|
||||
<%= f.password_field :password, class: "form-control", placeholder: t("password"), value: "" %>
|
||||
</div>
|
||||
</div>
|
||||
<% if Rails.configuration.enable_email_verification %>
|
||||
<div class="form-group">
|
||||
<div class="input-icon">
|
||||
<%= link_to t("modal.login.forgot_password"), new_password_reset_path %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="card-footer px-0">
|
||||
<%= f.submit t("login"), class: "btn btn-primary btn-block signin-button" %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user