zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 10:49:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

111396946-order_and_style_changes

Browse source
This commit is contained in:
Stas 2016-02-04 17:24:26 +02:00
parent f31db65d2c
commit db819447c6
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/blocked_domains_controller.rb
View file

@ -4,7 +4,7 @@ class Admin::BlockedDomainsController < AdminController
def index def index
params[:q] ||= {} params[:q] ||= {}
domains = BlockedDomain.all domains = BlockedDomain.all.order(:name)
@q = domains.search(params[:q]) @q = domains.search(params[:q])
@domains = @q.result.page(params[:page]) @domains = @q.result.page(params[:page])
@domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

2
app/controllers/admin/reserved_domains_controller.rb
View file

@ -5,7 +5,7 @@ class Admin::ReservedDomainsController < AdminController
def index def index
params[:q] ||= {} params[:q] ||= {}
domains = ReservedDomain.all domains = ReservedDomain.all.order(:name)
@q = domains.search(params[:q]) @q = domains.search(params[:q])
@domains = @q.result.page(params[:page]) @domains = @q.result.page(params[:page])
@domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

6
app/views/admin/blocked_domains/index.haml
View file

@ -43,7 +43,7 @@
= sort_link(@q, 'created_at', t(:created_at)) = sort_link(@q, 'created_at', t(:created_at))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'updated_at', t(:updated_at)) = sort_link(@q, 'updated_at', t(:updated_at))
%th{class: 'col-xs-2'} %th{class: 'col-xs-1'}
= t(:actions) = t(:actions)
%tbody %tbody
- @domains.each do |x| - @domains.each do |x|
@ -51,9 +51,9 @@
%td= x.name %td= x.name
%td= l(x.created_at, format: :short) %td= l(x.created_at, format: :short)
%td= l(x.updated_at, format: :short) %td= l(x.updated_at, format: :short)
%td %td{class: 'col-xs-1'}
= link_to(t(:delete), delete_admin_blocked_domain_path(id: x.id), = link_to(t(:delete), delete_admin_blocked_domain_path(id: x.id),
data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs') data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs center-block')
.row .row
.col-md-6 .col-md-6
= paginate @domains = paginate @domains