zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-04 17:01:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andres Keskküla 2014-09-26 12:07:01 +03:00
commit c6a93a3acd
8 changed files with 67 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
.col-md-6
.form-group
= status_fields.label :value
= status_fields.select :value, options_for_select(DomainStatus::STATUSES, status_fields.object.value), {include_blank: true}, {class: 'form-control'}
= status_fields.select :value, options_for_select(DomainStatus.statuses_for_admin, status_fields.object.value.sub('server', '')), {include_blank: true}, {class: 'form-control'}
.col-md-6
.form-group
= status_fields.label :description

2
app/views/client/domains/form_partials/_statuses.haml
View file

@ -15,7 +15,7 @@
.col-md-6
.form-group
= status_fields.label :value
= status_fields.select :value, options_for_select(DomainStatus::STATUSES, status_fields.object.value), {include_blank: true}, {class: 'form-control'}
= status_fields.select :value, options_for_select(DomainStatus.statuses_for_client, status_fields.object.value.sub('client', '')), {include_blank: true}, {class: 'form-control'}
.col-md-6
.form-group
= status_fields.label :description

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

@ -9,7 +9,7 @@
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
%link{href: "../../favicon.ico", rel: "icon"}/
%title EPP Client
%title= t('shared.eedirekt')
%body
/ Static navbar
.navbar.navbar-inverse.navbar-static-top{role: "navigation"}
@ -20,7 +20,7 @@
%span.icon-bar
%span.icon-bar
%span.icon-bar
= link_to 'EPP Client', client_domains_path, class: 'navbar-brand'
= link_to t('shared.eedirekt'), client_domains_path, class: 'navbar-brand'
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li.dropdown.active
@ -44,8 +44,9 @@
= link_to t('shared.check'), '#'
%li
= link_to t('shared.register'), '#'
%li
= link_to 'Admin', '/'
- if current_user.admin?
%li
= link_to 'Admin', admin_root_path
%ul.nav.navbar-nav.navbar-right
%li= link_to t('shared.log_out'), '/logout'
/ /.nav-collapse