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

Keyrelay list on domain, translations refactor

Browse source
This commit is contained in:
Martin Lensment 2014-12-19 18:28:24 +02:00
parent c15b4d48b9
commit ee060fca1a
56 changed files with 439 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/domains_controller.rb
View file

@ -19,11 +19,11 @@ class Admin::DomainsController < AdminController
add_prefix_to_statuses
if @domain.update(domain_params)
flash[:notice] = I18n.t('shared.domain_updated')
flash[:notice] = I18n.t('domain_updated')
redirect_to [:admin, @domain]
else
@domain.domain_statuses.build if @domain.domain_statuses.empty?
flash.now[:alert] = I18n.t('shared.failed_to_update_domain')
flash.now[:alert] = I18n.t('failed_to_update_domain')
render 'edit'
end
end

12
app/controllers/admin/epp_users_controller.rb
View file

@ -15,10 +15,10 @@ class Admin::EppUsersController < AdminController
@epp_user = EppUser.new(epp_user_params)
if @epp_user.save
flash[:notice] = I18n.t('shared.record_created')
flash[:notice] = I18n.t('record_created')
redirect_to [:admin, @epp_user]
else
flash.now[:alert] = I18n.t('shared.failed_to_create_record')
flash.now[:alert] = I18n.t('failed_to_create_record')
render 'new'
end
end
@ -29,20 +29,20 @@ class Admin::EppUsersController < AdminController
def update
if @epp_user.update(epp_user_params)
flash[:notice] = I18n.t('shared.record_updated')
flash[:notice] = I18n.t('record_updated')
redirect_to [:admin, @epp_user]
else
flash.now[:alert] = I18n.t('shared.failed_to_update_record')
flash.now[:alert] = I18n.t('failed_to_update_record')
render 'edit'
end
end
def destroy
if @epp_user.destroy
flash[:notice] = I18n.t('shared.record_deleted')
flash[:notice] = I18n.t('record_deleted')
redirect_to admin_epp_users_path
else
flash.now[:alert] = I18n.t('shared.failed_to_delete_record')
flash.now[:alert] = I18n.t('failed_to_delete_record')
render 'show'
end
end

7
app/controllers/admin/keyrelays_controller.rb Normal file
View file

@ -0,0 +1,7 @@
class Admin::KeyrelaysController < AdminController
load_and_authorize_resource
def show
end
end

12
app/controllers/admin/registrars_controller.rb
View file

@ -18,10 +18,10 @@ class Admin::RegistrarsController < AdminController
@registrar = Registrar.new(registrar_params)
if @registrar.save
flash[:notice] = I18n.t('shared.registrar_added')
flash[:notice] = I18n.t('registrar_added')
redirect_to [:admin, @registrar]
else
flash.now[:alert] = I18n.t('shared.failed_to_add_registrar')
flash.now[:alert] = I18n.t('failed_to_add_registrar')
render 'new'
end
end
@ -30,20 +30,20 @@ class Admin::RegistrarsController < AdminController
def update
if @registrar.update(registrar_params)
flash[:notice] = I18n.t('shared.registrar_updated')
flash[:notice] = I18n.t('registrar_updated')
redirect_to [:admin, @registrar]
else
flash.now[:alert] = I18n.t('shared.failed_to_update_registrar')
flash.now[:alert] = I18n.t('failed_to_update_registrar')
render 'edit'
end
end
def destroy
if @registrar.destroy
flash[:notice] = I18n.t('shared.registrar_deleted')
flash[:notice] = I18n.t('registrar_deleted')
redirect_to admin_registrars_path
else
flash.now[:alert] = I18n.t('shared.failed_to_delete_registrar')
flash.now[:alert] = I18n.t('failed_to_delete_registrar')
render 'show'
end
end

6
app/controllers/admin/settings_controller.rb
View file

@ -11,7 +11,7 @@ class Admin::SettingsController < AdminController
Setting[k] = v
end
flash[:notice] = I18n.t('shared.records_updated')
flash[:notice] = I18n.t('records_updated')
redirect_to [:admin, :settings]
end
@ -19,10 +19,10 @@ class Admin::SettingsController < AdminController
def update
if @setting_group.update(setting_group_params)
flash[:notice] = I18n.t('shared.setting_updated')
flash[:notice] = I18n.t('setting_updated')
redirect_to [:admin, @setting_group]
else
flash[:alert] = I18n.t('shared.failed_to_update_setting')
flash[:alert] = I18n.t('failed_to_update_setting')
render 'show'
end
end

12
app/controllers/admin/users_controller.rb
View file

@ -15,10 +15,10 @@ class Admin::UsersController < AdminController
@user = User.new(user_params)
if @user.save
flash[:notice] = I18n.t('shared.record_created')
flash[:notice] = I18n.t('record_created')
redirect_to [:admin, @user]
else
flash.now[:alert] = I18n.t('shared.failed_to_create_record')
flash.now[:alert] = I18n.t('failed_to_create_record')
render 'new'
end
end
@ -29,20 +29,20 @@ class Admin::UsersController < AdminController
def update
if @user.update(user_params)
flash[:notice] = I18n.t('shared.record_updated')
flash[:notice] = I18n.t('record_updated')
redirect_to [:admin, @user]
else
flash.now[:alert] = I18n.t('shared.failed_to_update_record')
flash.now[:alert] = I18n.t('failed_to_update_record')
render 'edit'
end
end
def destroy
if @user.destroy
flash[:notice] = I18n.t('shared.record_deleted')
flash[:notice] = I18n.t('record_deleted')
redirect_to admin_users_path
else
flash.now[:alert] = I18n.t('shared.failed_to_delete_record')
flash.now[:alert] = I18n.t('failed_to_delete_record')
render 'show'
end
end

4
app/controllers/admin/zonefile_settings_controller.rb
View file

@ -11,10 +11,10 @@ class Admin::ZonefileSettingsController < ApplicationController
def update
if @zonefile_setting.update(zonefile_setting_params)
flash[:notice] = I18n.t('shared.record_updated')
flash[:notice] = I18n.t('record_updated')
redirect_to admin_zonefile_settings_path
else
flash.now[:alert] = I18n.t('shared.failed_to_update_record')
flash.now[:alert] = I18n.t('failed_to_update_record')
render 'edit'
end
end

2
app/controllers/sessions_controller.rb
View file

@ -8,7 +8,7 @@ class SessionsController < Devise::SessionsController
return redirect_to :back, alert: 'No user' if @user.blank?
flash[:notice] = I18n.t('shared.welcome')
flash[:notice] = I18n.t('welcome')
sign_in_and_redirect @user, event: :authentication
# end
end

2
app/helpers/epp/domains_helper.rb
View file

@ -118,7 +118,7 @@ module Epp::DomainsHelper
end
if parsed_frame.css('dsData').count > 0 && parsed_frame.css('create > keyData').count > 0
epp_errors << { code: '2306', msg: I18n.t('shared.ds_data_and_key_data_must_not_exists_together') }
epp_errors << { code: '2306', msg: I18n.t('ds_data_and_key_data_must_not_exists_together') }
ret = false
end
ret

1
app/models/ability.rb
View file

@ -22,6 +22,7 @@ class Ability
can :manage, DomainVersion
can :manage, User
can :manage, EppUser
can :manage, Keyrelay
can :index, :delayed_job
can :create, :zonefile
can :access, :settings_menu

2
app/models/epp/epp_domain.rb
View file

@ -336,7 +336,7 @@ class Epp::EppDomain < Domain
def approve_pending_transfer(current_user)
pt = pending_transfer
if current_user.registrar != pt.transfer_from
add_epp_error('2304', nil, nil, I18n.t('shared.transfer_can_be_approved_only_by_current_registrar'))
add_epp_error('2304', nil, nil, I18n.t('transfer_can_be_approved_only_by_current_registrar'))
return false
end

10
app/views/admin/contacts/index.haml
View file

@ -1,6 +1,6 @@
.row
.col-sm-12
%h2.text-center-xs= t('shared.contacts')
%h2.text-center-xs= t('contacts')
%hr
.row
.col-md-12
@ -22,13 +22,13 @@
%thead
%tr
%th{class: 'col-xs-2'}
= sort_link(@q, 'name', t('shared.name'))
= sort_link(@q, 'name', t('name'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'code', t('shared.code'))
= sort_link(@q, 'code', t('code'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'ident', t('shared.identity_code'))
= sort_link(@q, 'ident', t('identity_code'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'email', t('shared.email'))
= sort_link(@q, 'email', t('email'))
%tbody
- @contacts.each do |x|
%tr

14
app/views/admin/contacts/partials/_address.haml
View file

@ -1,28 +1,28 @@
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.address')
%h3.panel-title= t('address')
.panel-body
- unless @contact.address.nil?
%dl.dl-horizontal
%dt= t('shared.country')
%dt= t('country')
%dd= @contact.address.country
%dt= t('shared.city')
%dt= t('city')
%dd= @contact.address.city
%dt= t('shared.street')
%dt= t('street')
%dd= @contact.address.street
- if @contact.address.street2
%dt= t('shared.street')
%dt= t('street')
%dd= @contact.address.street2
- if @contact.address.street3
%dt= t('shared.street')
%dt= t('street')
%dd= @contact.address.street3
%dt= t('shared.zip')
%dt= t('zip')
%dd= @contact.address.zip

8
app/views/admin/contacts/partials/_domains.haml
View file

@ -1,12 +1,12 @@
#contacts.panel.panel-default
.panel-heading= t('shared.domains')
.panel-heading= t('domains')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-4'}= t('shared.domain_name')
%th{class: 'col-xs-4'}= t('shared.registrar')
%th{class: 'col-xs-4'}= t('shared.valid_to')
%th{class: 'col-xs-4'}= t('domain_name')
%th{class: 'col-xs-4'}= t('registrar')
%th{class: 'col-xs-4'}= t('valid_to')
%tbody
- @contact.domains_owned.each do |x|
%tr

20
app/views/admin/contacts/partials/_general.haml
View file

@ -1,32 +1,32 @@
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.general')
%h3.panel-title= t('general')
.panel-body
%dl.dl-horizontal
%dt= t('shared.name')
%dt= t('name')
%dd= @contact.name
%dt= t('shared.org_name')
%dt= t('org_name')
%dd= @contact.org_name
%dt= t('shared.code')
%dt= t('code')
%dd= @contact.code
%dt= t('shared.ident')
%dt= t('ident')
%dd= @contact.ident
%dt= t('shared.ident_type')
%dt= t('ident_type')
%dd= @contact.ident_type
%dt= t('shared.email')
%dt= t('email')
%dd= @contact.email
%dt= t('shared.phone')
%dt= t('phone')
%dd= @contact.phone
- if @contact.fax
%dt= t('shared.fax')
%dt= t('fax')
%dd= @contact.fax
%dt= t('shared.password')
%dt= t('password')
%dd= @contact.auth_info

2
app/views/admin/contacts/show.haml
View file

@ -1,7 +1,7 @@
.row
.col-sm-12
%h2.text-center-xs
= "#{t('shared.contact_details')}"
= "#{t('contact_details')}"
%hr
.row
.col-md-6= render 'admin/contacts/partials/general'

12
app/views/admin/delayed_jobs/index.haml
View file

@ -1,6 +1,6 @@
.row
.col-sm-12
%h2.text-center-xs= t('shared.jobs')
%h2.text-center-xs= t('jobs')
%hr
.row
@ -9,11 +9,11 @@
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-2'}= t('shared.priority')
%th{class: 'col-xs-2'}= t('shared.attempts')
%th{class: 'col-xs-2'}= t('shared.last_error')
%th{class: 'col-xs-1'}= t('shared.run_at')
%th{class: 'col-xs-1'}= t('shared.created_at')
%th{class: 'col-xs-2'}= t('priority')
%th{class: 'col-xs-2'}= t('attempts')
%th{class: 'col-xs-2'}= t('last_error')
%th{class: 'col-xs-1'}= t('run_at')
%th{class: 'col-xs-1'}= t('created_at')
%tbody
- @jobs.each do |job|
%tr

4
app/views/admin/domain_versions/index.haml
View file

@ -1,6 +1,6 @@
.row
.col-sm-12
%h2.text-center-xs= t('shared.domains')
%h2.text-center-xs= t('domains')
%hr
.row
.col-md-12
@ -9,7 +9,7 @@
%thead
%tr
%th{class: 'col-xs-1'}
= t('shared.name')
= t('name')
%th{class: 'col-xs-1'}
= sort_link(@q, 'whodunnit')
%th{class: 'col-xs-1'}

12
app/views/admin/domain_versions/show.haml
View file

@ -12,12 +12,12 @@
%table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-2'}= t(:'shared.domain_info')
%th{class: 'col-xs-2'}= t(:'shared.owner_contact')
%th{class: 'col-xs-2'}= t(:'shared.admin_contacts')
%th{class: 'col-xs-2'}= t(:'shared.tech_contacts')
%th{class: 'col-xs-2'}= t(:'shared.nameservers')
%th{class: 'col-xs-1'}= t(:'shared.changes_info')
%th{class: 'col-xs-2'}= t(:'domain_info')
%th{class: 'col-xs-2'}= t(:'owner_contact')
%th{class: 'col-xs-2'}= t(:'admin_contacts')
%th{class: 'col-xs-2'}= t(:'tech_contacts')
%th{class: 'col-xs-2'}= t(:'nameservers')
%th{class: 'col-xs-1'}= t(:'changes_info')
%tbody
- @versions.each do |version|

4
app/views/admin/domains/_form.haml
View file

@ -7,14 +7,14 @@
%ul.nav.nav-tabs{:role => "tablist", id: 'tabs'}
- li_class = @domain.statuses_tab_valid? ? nil : 'error-tab'
%li{class: li_class}
%a{"data-toggle" => "tab", :href => "#statuses-tab", :role => "tab"}= t('shared.statuses')
%a{"data-toggle" => "tab", :href => "#statuses-tab", :role => "tab"}= t('statuses')
/ Tab panes
.tab-content{style:'margin-top: 20px;'}
#general-tab.tab-pane.active
= render 'admin/domains/form_partials/statuses', f: f
.row
.col-md-12.text-right
= button_tag(t('shared.save'), class: 'btn btn-primary')
= button_tag(t('save'), class: 'btn btn-primary')
:javascript
$(function() {

4
app/views/admin/domains/edit.haml
View file

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.edit_domain')}"
= "#{t('edit_domain')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.back_to_domain'), [:admin, @domain], class: 'btn btn-default')
= link_to(t('back_to_domain'), [:admin, @domain], class: 'btn btn-default')
%hr
= render 'form'

6
app/views/admin/domains/form_partials/_statuses.haml
View file

@ -2,10 +2,10 @@
= f.fields_for :domain_statuses, @server_statuses do |status_fields|
.panel.panel-default
.panel-heading.clearfix
.pull-left= t('shared.status')
.pull-left= t('status')
.pull-right
= link_to(t('shared.add_another'), '#', class: 'btn btn-primary btn-xs add-domain-status')
= link_to(t('shared.delete'), '#', class: 'btn btn-danger btn-xs destroy')
= link_to(t('add_another'), '#', class: 'btn btn-primary btn-xs add-domain-status')
= link_to(t('delete'), '#', class: 'btn btn-danger btn-xs destroy')
.panel-body
.errors
= render 'shared/errors', object: status_fields.object

8
app/views/admin/domains/index.haml
View file

@ -1,6 +1,6 @@
.row
.col-sm-12
%h2.text-center-xs= t('shared.domains')
%h2.text-center-xs= t('domains')
%hr
.row
.col-md-12
@ -24,11 +24,11 @@
%th{class: 'col-xs-2'}
= sort_link(@q, 'name')
%th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t('shared.registrar'))
= sort_link(@q, 'registrar_name', t('registrar'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'owner_contact_name', t('shared.owner'))
= sort_link(@q, 'owner_contact_name', t('owner'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'valid_to', t('shared.valid_to'))
= sort_link(@q, 'valid_to', t('valid_to'))
%tbody
- @domains.each do |x|
%tr

8
app/views/admin/domains/partials/_admin_contacts.haml
View file

@ -1,14 +1,14 @@
- panel_class = @domain.errors.messages[:admin_contacts] ? 'panel-danger' : 'panel-default'
.panel{class: panel_class}
.panel-heading.clearfix
= t('shared.admin_contacts')
= t('admin_contacts')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-4'}= t('shared.name')
%th{class: 'col-xs-4'}= t('shared.code')
%th{class: 'col-xs-4'}= t('shared.email')
%th{class: 'col-xs-4'}= t('name')
%th{class: 'col-xs-4'}= t('code')
%th{class: 'col-xs-4'}= t('email')
%tbody
- @domain.domain_contacts.admin.each do |x|
%tr

10
app/views/admin/domains/partials/_dnskeys.haml
View file

@ -1,15 +1,15 @@
- panel_class = @domain.errors.messages[:dnskeys] ? 'panel-danger' : 'panel-default'
#dnskeys.panel{class: panel_class}
.panel-heading.clearfix
= t('shared.dnskeys')
= t('dnskeys')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-1'}= t('shared.flag')
%th{class: 'col-xs-1'}= t('shared.protocol')
%th{class: 'col-xs-1'}= t('shared.algorithm')
%th{class: 'col-xs-9'}= t('shared.public_key')
%th{class: 'col-xs-1'}= t('flag')
%th{class: 'col-xs-1'}= t('protocol')
%th{class: 'col-xs-1'}= t('algorithm')
%th{class: 'col-xs-9'}= t('public_key')
%tbody
- @domain.dnskeys.each do |x|
%tr

14
app/views/admin/domains/partials/_general.haml
View file

@ -1,22 +1,22 @@
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.general')
%h3.panel-title= t('general')
.panel-body
%dl.dl-horizontal
%dt= t('shared.name')
%dt= t('name')
%dd= @domain.name
%dt= t('shared.registered_at')
%dt= t('registered_at')
%dd= l(@domain.registered_at)
%dt= t('shared.registrar')
%dt= t('registrar')
%dd= link_to(@domain.registrar, root_path)
%dt= t('shared.password')
%dt= t('password')
%dd= @domain.auth_info
%dt= t('shared.valid_from')
%dt= t('valid_from')
%dd= l(@domain.valid_from)
%dt= t('shared.valid_to')
%dt= t('valid_to')
%dd= l(@domain.valid_to)

20
app/views/admin/domains/partials/_keyrelays.haml Normal file
View file

@ -0,0 +1,20 @@
.panel{class: 'panel-default'}
.panel-heading.clearfix
= t('keyrelays')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-4'}= t('uploaded_at')
%th{class: 'col-xs-2'}= t('expiry_relative')
%th{class: 'col-xs-2'}= t('expiry_absolute')
%th{class: 'col-xs-2'}= t('requester')
%th{class: 'col-xs-2'}= t('accepter')
%tbody
- @domain.keyrelays.includes([:requester, :accepter]).each do |x|
%tr
%td= link_to(x.pa_date, [:admin, x])
%td= x.expiry_relative
%td= x.expiry_absolute
%td= link_to(x.requester, [:admin, x.requester])
%td= link_to(x.accepter, [:admin, x.accepter])

8
app/views/admin/domains/partials/_nameservers.haml
View file

@ -1,14 +1,14 @@
- panel_class = @domain.errors.messages[:nameservers] ? 'panel-danger' : 'panel-default'
#nameservers.panel{class: panel_class}
.panel-heading.clearfix
= t('shared.nameservers')
= t('nameservers')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-4'}= t('shared.hostname')
%th{class: 'col-xs-4'}= t('shared.ipv4')
%th{class: 'col-xs-4'}= t('shared.ipv6')
%th{class: 'col-xs-4'}= t('hostname')
%th{class: 'col-xs-4'}= t('ipv4')
%th{class: 'col-xs-4'}= t('ipv6')
%tbody
- @domain.nameservers.each do |x|
%tr

12
app/views/admin/domains/partials/_owner.haml
View file

@ -1,19 +1,19 @@
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.owner')
%h3.panel-title= t('owner')
.panel-body
%dl.dl-horizontal
%dt= t('shared.name')
%dt= t('name')
%dd= link_to(@domain.owner_contact, [:admin, @domain.owner_contact])
%dt= t('shared.code')
%dt= t('code')
%dd= @domain.owner_contact_code
%dt= t('shared.identity_code')
%dt= t('identity_code')
%dd= @domain.owner_contact_ident
%dt= t('shared.email')
%dt= t('email')
%dd= @domain.owner_contact_email
%dt= t('shared.phone')
%dt= t('phone')
%dd= @domain.owner_contact_phone

6
app/views/admin/domains/partials/_statuses.haml
View file

@ -1,13 +1,13 @@
- panel_class = @domain.errors.messages[:domain_statuses] ? 'panel-danger' : 'panel-default'
#domain_statuses.panel{class: panel_class}
.panel-heading.clearfix
= t('shared.statuses')
= t('statuses')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-6'}= t('shared.status')
%th{class: 'col-xs-6'}= t('shared.description')
%th{class: 'col-xs-6'}= t('status')
%th{class: 'col-xs-6'}= t('description')
%tbody
- @domain.domain_statuses.each do |x|
%tr

8
app/views/admin/domains/partials/_tech_contacts.haml
View file

@ -1,14 +1,14 @@
- panel_class = @domain.errors.messages[:tech_contacts] ? 'panel-danger' : 'panel-default'
#tech_contacts.panel{class: panel_class}
.panel-heading.clearfix
= t('shared.tech_contacts')
= t('tech_contacts')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-4'}= t('shared.name')
%th{class: 'col-xs-4'}= t('shared.code')
%th{class: 'col-xs-4'}= t('shared.email')
%th{class: 'col-xs-4'}= t('name')
%th{class: 'col-xs-4'}= t('code')
%th{class: 'col-xs-4'}= t('email')
%tbody
- @domain.domain_contacts.tech.each do |x|
%tr

8
app/views/admin/domains/show.haml
View file

@ -1,11 +1,11 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.domain_details')}"
= "#{t('domain_details')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.edit_statuses'), edit_admin_domain_path(@domain), class: 'btn btn-primary')
= link_to(t(:'shared.history'), admin_domain_version_path(@domain.id), method: :get, class: 'btn btn-primary')
= link_to(t('edit_statuses'), edit_admin_domain_path(@domain), class: 'btn btn-primary')
= link_to(t(:'history'), admin_domain_version_path(@domain.id), method: :get, class: 'btn btn-primary')
/= link_to(t('generate_zonefile'), zonefile_admin_domain_path(@domain), class: 'btn btn-primary')
@ -23,3 +23,5 @@
.col-md-12= render 'admin/domains/partials/nameservers'
.row
.col-md-12= render 'admin/domains/partials/dnskeys'
.row
.col-md-12= render 'admin/domains/partials/keyrelays'

2
app/views/admin/domains/zonefile.haml
View file

@ -4,7 +4,7 @@
= "#{t('zonefile')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.back_to_domain'), admin_domain_path(@domain), class: 'btn btn-default')
= link_to(t('back_to_domain'), admin_domain_path(@domain), class: 'btn btn-default')
%hr
.row
.col-md-12

10
app/views/admin/epp_users/_form.haml
View file

@ -16,8 +16,8 @@
= f.text_field(:password, class: 'form-control')
.form-group
.form-group.has-feedback.js-typeahead-container
= f.label :registrar_typeahead, t('shared.registrar')
= f.text_field(:registrar_typeahead, class: 'form-control js-registrar-typeahead', placeholder: t('shared.registrar'), autocomplete: 'off')
= f.label :registrar_typeahead, t('registrar')
= f.text_field(:registrar_typeahead, class: 'form-control js-registrar-typeahead', placeholder: t('registrar'), autocomplete: 'off')
%span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
%span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
= f.hidden_field(:registrar_id, class: 'js-registrar-id')
@ -25,16 +25,16 @@
.checkbox
%label{for: 'epp_user_active'}
= f.check_box(:active)
= t('shared.active')
= t('active')
.col-md-6.text-left
.form-group
= f.label :csr, t('shared.certificate_signing_req')
= f.label :csr, t('certificate_signing_req')
= f.text_area :csr, class: 'form-control'
%hr
.row
.col-md-12.text-right
= button_tag(t('shared.save'), class: 'btn btn-primary')
= button_tag(t('save'), class: 'btn btn-primary')
:javascript
Autocomplete.bindAdminRegistrarSearch();

4
app/views/admin/epp_users/edit.haml
View file

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.edit_epp_user')}"
= "#{t('edit_epp_user')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.back_to_epp_user'), [:admin, @epp_user], class: 'btn btn-default')
= link_to(t('back_to_epp_user'), [:admin, @epp_user], class: 'btn btn-default')
%hr
= render 'form'

8
app/views/admin/epp_users/index.haml
View file

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs= t('shared.epp_users')
%h2.text-center-xs= t('epp_users')
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.create_new_epp_user'), new_admin_epp_user_path, class: 'btn btn-primary')
= link_to(t('create_new_epp_user'), new_admin_epp_user_path, class: 'btn btn-primary')
%hr
.row
.col-md-12
@ -14,9 +14,9 @@
%th{class: 'col-xs-2'}
= sort_link(@q, 'username')
%th{class: 'col-xs-2'}
= sort_link(@q, 'registrar', t('shared.registrar'))
= sort_link(@q, 'registrar', t('registrar'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'active', t('shared.active'))
= sort_link(@q, 'active', t('active'))
%tbody
- @epp_users.each do |x|
%tr

2
app/views/admin/epp_users/new.haml
View file

@ -1,3 +1,3 @@
%h2= t('shared.create_new_epp_user')
%h2= t('create_new_epp_user')
%hr
= render 'form'

20
app/views/admin/epp_users/show.haml
View file

@ -1,11 +1,11 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.epp_user_details')}"
= "#{t('epp_user_details')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.edit'), edit_admin_epp_user_path(@epp_user), class: 'btn btn-primary')
= link_to(t('shared.delete'), admin_epp_user_path(@epp_user), method: :delete, data: { confirm: t('shared.are_you_sure') }, class: 'btn btn-danger')
= link_to(t('edit'), edit_admin_epp_user_path(@epp_user), class: 'btn btn-primary')
= link_to(t('delete'), admin_epp_user_path(@epp_user), method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-danger')
%hr
- if @epp_user.errors.any?
@ -18,26 +18,26 @@
.col-md-6
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.general')
%h3.panel-title= t('general')
.panel-body
%dl.dl-horizontal
%dt= t('shared.username')
%dt= t('username')
%dd= @epp_user.username
%dt= t('shared.password')
%dt= t('password')
%dd= @epp_user.password
%dt= t('shared.active')
%dt= t('active')
%dd= @epp_user.active
.col-md-6
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.certificates')
%h3.panel-title= t('certificates')
.panel-body
%dl.dl-horizontal
%dt= t('shared.csr')
%dt= t('csr')
%dd= @epp_user.csr
%dt= t('shared.crt')
%dt= t('crt')
%dd= @epp_user.crt

44
app/views/admin/keyrelays/show.haml Normal file
View file

@ -0,0 +1,44 @@
.row
.col-sm-12
%h2.text-center-xs
= t('keyrelay_details')
%hr
.row
.col-md-12
.panel.panel-default
.panel-heading
%h3.panel-title= t('keyrelay')
.panel-body{style: 'word-wrap: break-word;'}
%dl.dl-horizontal
%dt= t('uploaded_at')
%dd= @keyrelay.pa_date
%dt= t('domain')
%dd= link_to(@keyrelay.domain, [:admin, @keyrelay.domain])
%dt= t('flag')
%dd= @keyrelay.key_data_flags
%dt= t('protocol')
%dd= @keyrelay.key_data_protocol
%dt= t('algorithm')
%dd= @keyrelay.key_data_alg
%dt= t('public_key')
%dd= @keyrelay.key_data_public_key
%dt= t('password')
%dd= @keyrelay.auth_info_pw
%dt= t('expiry_relative')
%dd= @keyrelay.expiry_relative
%dt= t('expiry_absolute')
%dd= @keyrelay.expiry_absolute
%dt= t('requester')
%dd= link_to(@keyrelay.requester, [:admin, @keyrelay.requester])
%dt= t('accepter')
%dd= link_to(@keyrelay.accepter, [:admin, @keyrelay.accepter])

2
app/views/admin/registrars/_form.haml
View file

@ -31,4 +31,4 @@
%hr
.row
.col-md-12.text-right
= button_tag(t('shared.save'), class: 'btn btn-primary')
= button_tag(t('save'), class: 'btn btn-primary')

4
app/views/admin/registrars/edit.haml
View file

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.edit_registrar')}"
= "#{t('edit_registrar')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.back_to_registrar'), [:admin, @registrar], class: 'btn btn-default')
= link_to(t('back_to_registrar'), [:admin, @registrar], class: 'btn btn-default')
%hr
= render 'form'

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

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs= t('shared.registrars')
%h2.text-center-xs= t('registrars')
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.add'), new_admin_registrar_path, class: 'btn btn-primary')
= link_to(t('add'), new_admin_registrar_path, class: 'btn btn-primary')
%hr
.row
.col-md-12
@ -14,7 +14,7 @@
%th{class: 'col-xs-6'}
= sort_link(@q, 'name')
%th{class: 'col-xs-6'}
= sort_link(@q, 'reg_no', t('shared.reg_no'))
= sort_link(@q, 'reg_no', t('reg_no'))
%tbody
- @registrars.each do |x|
%tr

2
app/views/admin/registrars/new.haml
View file

@ -1,3 +1,3 @@
%h2= t('shared.new_registrar')
%h2= t('new_registrar')
%hr
= render 'form'

28
app/views/admin/registrars/show.haml
View file

@ -1,11 +1,11 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.registrar_details')}"
= "#{t('registrar_details')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.edit'), edit_admin_registrar_path(@registrar), class: 'btn btn-primary')
= link_to(t('shared.delete'), admin_registrar_path(@registrar), method: :delete, data: { confirm: t('shared.are_you_sure') }, class: 'btn btn-danger')
= link_to(t('edit'), edit_admin_registrar_path(@registrar), class: 'btn btn-primary')
= link_to(t('delete'), admin_registrar_path(@registrar), method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-danger')
%hr
- if @registrar.errors.any?
@ -18,44 +18,44 @@
.col-md-6
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.general')
%h3.panel-title= t('general')
.panel-body
%dl.dl-horizontal
%dt= t('shared.name')
%dt= t('name')
%dd= @registrar.name
%dt= t('shared.reg_no')
%dt= t('reg_no')
%dd= @registrar.reg_no
%dt= t('shared.vat_no')
%dt= t('vat_no')
%dd= @registrar.vat_no
.col-md-6
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.address')
%h3.panel-title= t('address')
.panel-body
%dl.dl-horizontal
%dt= t('shared.country')
%dt= t('country')
%dd= @registrar.country
%dt= t('shared.address')
%dt= t('address')
%dd= @registrar.address
%dt= t('shared.billing_address')
%dt= t('billing_address')
%dd= @registrar.billing_address
.row
.col-md-12
#epp-users.panel.panel-default
.panel-heading.clearfix
= t('shared.epp_users')
= t('epp_users')
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-6'}= t('shared.username')
%th{class: 'col-xs-6'}= t('shared.active')
%th{class: 'col-xs-6'}= t('username')
%th{class: 'col-xs-6'}= t('active')
%tbody
- @registrar.epp_users.each do |x|
%tr

8
app/views/admin/settings/index.haml
View file

@ -1,4 +1,4 @@
%h2= t('shared.settings')
%h2= t('settings')
%hr
= form_tag [:admin, :settings] do
.row
@ -8,9 +8,9 @@
%thead
%tr
%th{class: 'col-xs-9'}
= t('shared.setting')
= t('setting')
%th{class: 'col-xs-2'}
= t('shared.value')
= t('value')
%tbody
- @settings.each do |x|
%tr
@ -23,4 +23,4 @@
%td= text_field_tag("[settings][#{x.var}]", x.value)
.row
.col-md-12.text-right
%button.btn.btn-primary=t('shared.save')
%button.btn.btn-primary=t('save')

2
app/views/admin/users/_form.haml
View file

@ -32,4 +32,4 @@
%hr
.row
.col-md-12.text-right
= button_tag(t('shared.save'), class: 'btn btn-primary')
= button_tag(t('save'), class: 'btn btn-primary')

4
app/views/admin/users/edit.haml
View file

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.edit_user')}"
= "#{t('edit_user')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.back_to_user'), [:admin, @user], class: 'btn btn-default')
= link_to(t('back_to_user'), [:admin, @user], class: 'btn btn-default')
%hr
= render 'form'

8
app/views/admin/users/index.haml
View file

@ -1,9 +1,9 @@
.row
.col-sm-6
%h2.text-center-xs= t('shared.users')
%h2.text-center-xs= t('users')
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.create_new_user'), new_admin_user_path, class: 'btn btn-primary')
= link_to(t('create_new_user'), new_admin_user_path, class: 'btn btn-primary')
%hr
.row
.col-md-12
@ -14,9 +14,9 @@
%th{class: 'col-xs-2'}
= sort_link(@q, 'username')
%th{class: 'col-xs-2'}
= sort_link(@q, 'email', t('shared.email'))
= sort_link(@q, 'email', t('email'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'identity_code', t('shared.identity_code'))
= sort_link(@q, 'identity_code', t('identity_code'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'role', t('role'))
%tbody

2
app/views/admin/users/new.haml
View file

@ -1,3 +1,3 @@
%h2= t('shared.create_new_user')
%h2= t('create_new_user')
%hr
= render 'form'

18
app/views/admin/users/show.haml
View file

@ -1,11 +1,11 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.user_details')}"
= "#{t('user_details')}"
.col-sm-6
%h2.text-right.text-center-xs
= link_to(t('shared.edit'), edit_admin_user_path(@user), class: 'btn btn-primary')
= link_to(t('shared.delete'), admin_user_path(@user), method: :delete, data: { confirm: t('shared.are_you_sure') }, class: 'btn btn-danger')
= link_to(t('edit'), edit_admin_user_path(@user), class: 'btn btn-primary')
= link_to(t('delete'), admin_user_path(@user), method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-danger')
%hr
- if @user.errors.any?
@ -18,25 +18,25 @@
.col-md-6
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.general')
%h3.panel-title= t('general')
.panel-body
%dl.dl-horizontal
%dt= t('shared.username')
%dt= t('username')
%dd= @user.username
%dt= t('shared.password')
%dt= t('password')
%dd= @user.password
%dt= t('shared.identity_code')
%dt= t('identity_code')
%dd= @user.identity_code
.col-md-6
.panel.panel-default
.panel-heading
%h3.panel-title= t('shared.address')
%h3.panel-title= t('address')
.panel-body
%dl.dl-horizontal
%dt= t('shared.email')
%dt= t('email')
%dd= @user.email
%dt= t('role')

2
app/views/admin/zonefile_settings/edit.haml
View file

@ -47,4 +47,4 @@
.row
.col-md-12.text-right
%button.btn.btn-primary=t('shared.save')
%button.btn.btn-primary=t('save')

16
app/views/layouts/application.haml
View file

@ -23,28 +23,28 @@
= link_to APP_CONFIG['app_name'], root_path, class: 'navbar-brand'
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li= link_to t('shared.domains'), admin_domains_path
%li= link_to t('shared.contacts'), admin_contacts_path
%li= link_to t('shared.registrars'), admin_registrars_path
%li= link_to t('domains'), admin_domains_path
%li= link_to t('contacts'), admin_contacts_path
%li= link_to t('registrars'), admin_registrars_path
- if can?(:access, :settings_menu)
%li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
= t('shared.settings')
= t('settings')
%span.caret
%ul.dropdown-menu{role: "menu"}
%li.dropdown-header= t('shared.system')
%li= link_to t('shared.settings'), admin_settings_path
%li.dropdown-header= t('system')
%li= link_to t('settings'), admin_settings_path
%li= link_to t('zonefile'), admin_zonefile_settings_path
%li= link_to t(:domains_history), admin_domain_versions_path
%li= link_to t(:background_jobs), admin_delayed_jobs_path
%li.divider
%li.dropdown-header= t('shared.users')
%li.dropdown-header= t('users')
%li= link_to t(:admin_users), admin_users_path
%li= link_to t(:epp_users), admin_epp_users_path
%ul.nav.navbar-nav.navbar-right
%li= link_to t('shared.log_out', user: current_user), '/logout'
%li= link_to t('log_out', user: current_user), '/logout'
/ /.nav-collapse
.container

20
app/views/layouts/client.haml
View file

@ -13,7 +13,7 @@
- if can? :view, :registrar
= t(:registrar)
- else
= t('shared.eedirekt')
= t('eedirekt')
%body
/ Static navbar
.navbar.navbar-default.navbar-static-top{role: "navigation"}
@ -27,39 +27,39 @@
- if can? :view, :registrar
= link_to t(:registrar), client_domains_path, class: 'navbar-brand'
- else
= link_to t('shared.eedirekt'), client_domains_path, class: 'navbar-brand'
= link_to t('eedirekt'), client_domains_path, class: 'navbar-brand'
.navbar-collapse.collapse
%ul.nav.navbar-nav
- active_class = ['client/domains', 'client/domain_transfers'].include?(params[:controller]) ? 'active' :nil
%li.dropdown{class: active_class}
%a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
= t('shared.domains')
= t('domains')
%span.caret
%ul.dropdown-menu{role: "menu"}
%li
= link_to t('shared.domain_list'), client_domains_path
= link_to t('domain_list'), client_domains_path
%li
= link_to t('shared.domain_transfers_list'), client_domain_transfers_path
= link_to t('domain_transfers_list'), client_domain_transfers_path
- active_class = ['client/contacts'].include?(params[:controller]) ? 'active' :nil
%li.dropdown{class: active_class}
%a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
= t('shared.contacts')
= t('contacts')
%span.caret
%ul.dropdown-menu{role: "menu"}
%li
= link_to t('shared.contact_list'), client_contacts_path
= link_to t('contact_list'), client_contacts_path
-# %li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
= t('shared.history')
= t('history')
%span.caret
%ul.dropdown-menu{role: "menu"}
%li
= link_to t(:domains_history'), client_domain_versions_path
%li
= link_to t('shared.contacts_history'), client_contact_versions_path
= link_to t('contacts_history'), client_contact_versions_path
%ul.nav.navbar-nav.navbar-right
@ -73,7 +73,7 @@
- next if x == current_registrar
%li
= link_to x, switch_registrar_sessions_path(registrar_id: x)
%li= link_to t('shared.log_out', user: current_user), '/logout'
%li= link_to t('log_out', user: current_user), '/logout'
/ /.nav-collapse
.container
- display = (flash.empty?) ? 'none' : 'block'

8
config/locales/en.yml
View file

@ -250,7 +250,6 @@ en:
attribute_op_is_invalid: 'Attribute op is invalid'
shared:
code: 'Code'
value: 'Value'
action: 'Action'
@ -443,3 +442,10 @@ en:
admin: 'Administrator'
user: 'User'
customer_service: 'Customer service'
keyrelays: 'Keyrelays'
uploaded_at: 'Uploaded at'
expiry_relative: 'Expiry relative'
expiry_absolute: 'Expiry absolute'
requester: 'Requester'
accepter: 'Accepter'
keyrelay_details: 'Keyrelay details'

2
config/routes.rb
View file

@ -7,6 +7,8 @@ Rails.application.routes.draw do
## ADMIN ROUTES
namespace(:admin) do
resources :keyrelays
resources :zonefiles
resources :zonefile_settings

1
spec/models/user_spec.rb
View file

@ -19,6 +19,7 @@ describe User do
it { should be_able_to(:manage, DomainVersion.new) }
it { should be_able_to(:manage, User.new) }
it { should be_able_to(:manage, EppUser.new) }
it { should be_able_to(:manage, Keyrelay.new) }
it { should be_able_to(:index, :delayed_job) }
it { should be_able_to(:create, :zonefile) }
it { should be_able_to(:access, :settings_menu) }