Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
		
			
				
	
	
		
			30 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Text
		
	
	
	
	
	
			
		
		
	
	
			30 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Text
		
	
	
	
	
	
| - content_for :page_title do
 | |
|   = t('admin.pending_accounts.title', count: User.pending.count)
 | |
| 
 | |
| = form_for(@form, url: batch_admin_pending_accounts_path) do |f|
 | |
|   = hidden_field_tag :page, params[:page] || 1
 | |
| 
 | |
|   .batch-table
 | |
|     .batch-table__toolbar
 | |
|       %label.batch-table__toolbar__select.batch-checkbox-all
 | |
|         = check_box_tag :batch_checkbox_all, nil, false
 | |
|       .batch-table__toolbar__actions
 | |
|         = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 | |
| 
 | |
|         = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 | |
|     .batch-table__body
 | |
|       - if @accounts.empty?
 | |
|         = nothing_here 'nothing-here--under-tabs'
 | |
|       - else
 | |
|         = render partial: 'account', collection: @accounts, locals: { f: f }
 | |
| 
 | |
| = paginate @accounts
 | |
| 
 | |
| %hr.spacer/
 | |
| 
 | |
| %div{ style: 'overflow: hidden' }
 | |
|   %div{ style: 'float: right' }
 | |
|     = link_to t('admin.accounts.reject_all'), reject_all_admin_pending_accounts_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive'
 | |
| 
 | |
|   %div
 | |
|     = link_to t('admin.accounts.approve_all'), approve_all_admin_pending_accounts_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button'
 |