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

Conflicts:
	db/schema.rb
This commit is contained in:
Andres Keskküla 2014-12-01 11:29:59 +02:00
commit 907ef1edf7
33 changed files with 629 additions and 288 deletions

View file

@ -1,7 +1,7 @@
.row
.col-sm-6
%h2.text-center-xs
= "#{t('shared.domain_history')} for " + @name.to_s
= "#{t(:domain_history)} for " + @name.to_s
.col-sm-6
%h2.text-right.text-center-xs

View file

@ -14,7 +14,7 @@
%tbody
- @settings.each do |x|
%tr
%td= t("shared.#{x.var}")
%td= t("#{x.var}")
- if [TrueClass, FalseClass].include?(x.value.class)
%td
= hidden_field_tag("[settings][#{x.var}]", '')

View file

@ -0,0 +1,50 @@
%h2= t('zonefile_settings')
%hr
= form_for [:admin, @zonefile_setting], html: { class: 'form-horizontal' } do |f|
.row
.col-md-12
#domain-statuses
.errors
- if f.object.errors.any?
- f.object.errors.full_messages.each do |x|
= x
%br
- if f.object.errors.any?
%hr
.form-group
= f.label :origin, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :origin, class: 'form-control', disabled: true
.form-group
= f.label :ttl, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :ttl, class: 'form-control'
.form-group
= f.label :refresh, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :refresh, class: 'form-control'
.form-group
= f.label :retry, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :retry, class: 'form-control'
.form-group
= f.label :expire, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :expire, class: 'form-control'
.form-group
= f.label :minimum_ttl, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :minimum_ttl, class: 'form-control'
.form-group
= f.label :email, class: 'col-md-2 control-label'
.col-md-10
= f.text_field :email, class: 'form-control'
.row
.col-md-12.text-right
%button.btn.btn-primary=t('shared.save')

View file

@ -0,0 +1,20 @@
.row
.col-sm-12
%h2.text-center-xs= t('zonefile_settings')
%hr
.row
.col-md-12
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-10'}
= t('origin')
%th{class: 'col-xs-2'}
= t('action')
%tbody
- @zonefile_settings.each do |x|
%tr
%td= link_to(x, edit_admin_zonefile_setting_path(x))
%td
= link_to(t('generate_zonefile'), admin_zonefiles_path(origin: x.origin), method: 'post', class: 'btn btn-xs btn-primary')

View file

@ -23,38 +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('shared.domains'), admin_domains_path
%li= link_to t('shared.contacts'), admin_contacts_path
%li= link_to t('shared.registrars'), admin_registrars_path
%li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
= t('shared.settings')
%span.caret
%ul.dropdown-menu{role: "menu"}
%li.dropdown-header= t('shared.system')
%li
= link_to t('shared.settings'), admin_settings_path
%li
= link_to t('zonefile'), admin_zonefiles_path
%li= link_to t('shared.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
= link_to t('shared.epp_users'), admin_epp_users_path
%li
= link_to t('shared.users'), admin_users_path
%li
= link_to t('shared.domains_history'), admin_domain_versions_path
%li
= link_to t('shared.jobs'), admin_delayed_jobs_path
%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'
/ /.nav-collapse
.container
- display = (flash.empty?) ? 'none' : 'block'

View file

@ -57,7 +57,7 @@
%span.caret
%ul.dropdown-menu{role: "menu"}
%li
= link_to t('shared.domains_history'), client_domain_versions_path
= link_to t(:domains_history'), client_domain_versions_path
%li
= link_to t('shared.contacts_history'), client_contact_versions_path

View file

@ -5,7 +5,7 @@
%meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
%meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
%meta{:content => "Full stack top-level domain (TLD) management.", :name => "description"}/
%meta{:content => "Gitlab LTD", :name => "author"}/
%meta{:content => "Gitlab Ltd", :name => "author"}/
= csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
@ -22,5 +22,8 @@
%hr
/ TODO: Refactor this when ID card login is done
- if can? :create, :admin_session
= button_to 'ID card (gitlab)', 'sessions',
class: 'btn btn-lg btn-primary btn-block', name: 'gitlab'
= button_to 'ID card (user1)', 'sessions',
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
= button_to 'ID card (user2)', 'sessions',
class: 'btn btn-lg btn-primary btn-block', name: 'user2'