Merge branch 'master' of github.com:internetee/registry

Conflicts:
	app/models/contact.rb
This commit is contained in:
Andres Keskküla 2014-08-22 11:31:02 +03:00
commit 7a9af5a719
20 changed files with 305 additions and 53 deletions

View file

@ -1,14 +1,14 @@
%h2= t('shared.setting_groups')
%hr
- @setting_groups.each do |x|
.row
.col-md-12
%table.table.table-striped.table-bordered
%tr
%th{class: 'col-xs-9'}
= t('.setting_group')
%th{class: 'col-xs-2'}
= t('shared.action')
.row
.col-md-12
%table.table.table-striped.table-bordered
%tr
%th{class: 'col-xs-9'}
= t('.setting_group')
%th{class: 'col-xs-2'}
= t('shared.action')
- @setting_groups.each do |x|
%tr
%td= t("setting_groups.codes.#{x.code}")
%td= link_to(t('.edit_settings'), setting_group_path(x), class: 'btn btn-primary btn-xs')