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:
		@@ -27,4 +27,4 @@
 | 
			
		||||
  </div>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
<%= render "shared/modals/delete_account_modal" %>
 | 
			
		||||
<%= render "shared/modals/delete_account_modal", delete_location: delete_user_path %>
 | 
			
		||||
 
 | 
			
		||||
@@ -16,10 +16,44 @@
 | 
			
		||||
<%= content_tag(:div, id: setting_id, class: "setting-view card") do %>
 | 
			
		||||
  <div class="card-body p-6">
 | 
			
		||||
    <div class="card-title text-primary">
 | 
			
		||||
      <h4><%= setting_title %></h4>
 | 
			
		||||
      <div class="form-group">
 | 
			
		||||
        <div class="row">
 | 
			
		||||
          <% if setting_id == "users" %>
 | 
			
		||||
            <div class="col-7 mt-2">
 | 
			
		||||
              <h4><%= setting_title %></h4>
 | 
			
		||||
            </div>
 | 
			
		||||
 | 
			
		||||
            <div class="col-5 float-right">
 | 
			
		||||
              <div id="search-bar">
 | 
			
		||||
                <div class="input-group">
 | 
			
		||||
                  <input id="search-input" type="text" class="form-control" placeholder="<%= t("settings.search") %>..." value="<%= @search %>">
 | 
			
		||||
                  <% unless @search.blank? %>
 | 
			
		||||
                    <span id="clear-search" class="text-primary" onclick="clearSearch()">
 | 
			
		||||
                      <i class="fas fa-times"></i>
 | 
			
		||||
                    </span>
 | 
			
		||||
                  <% end %>
 | 
			
		||||
                  <span class="input-group-append">
 | 
			
		||||
                    <button class="btn btn-primary" type="button" onclick="searchPage()">
 | 
			
		||||
                      <i class="fas fa-search"></i>
 | 
			
		||||
                    </button>
 | 
			
		||||
                  </span>
 | 
			
		||||
              </div>
 | 
			
		||||
              </div>
 | 
			
		||||
            </div>
 | 
			
		||||
          <% else %>
 | 
			
		||||
            <div class="col-12 mt-2">
 | 
			
		||||
              <h4 class="text-primary"><%= setting_title %></h4>
 | 
			
		||||
            </div>
 | 
			
		||||
          <% end %>
 | 
			
		||||
        </div>
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
    <hr>
 | 
			
		||||
 | 
			
		||||
    <%= render "shared/settings/#{setting_id}" %>
 | 
			
		||||
    <% unless (defined?(admin_view)).nil? %>
 | 
			
		||||
      <%= render "shared/admin_settings/#{setting_id}" %>
 | 
			
		||||
    <% else %>
 | 
			
		||||
      <%= render "shared/settings/#{setting_id}" %>
 | 
			
		||||
    <% end %>
 | 
			
		||||
  </div>
 | 
			
		||||
<% end %>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user