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

Conflicts:
	app/views/admin/bank_statements/index.haml
	config/locales/en.yml

app/assets/stylesheets/admin-manifest.sass

@@ -0,0 +1,9 @@
+//= require 'shared/custom-boostrap'
+@import shared/fonts
+@import shared/general
+@import nprogress
+@import nprogress-bootstrap
+@import typeaheadjs
+@import selectize
+@import selectize.bootstrap3
+@import admin/admin

app/assets/stylesheets/admin/admin.sass

@@ -1,7 +1,3 @@
-body
-  padding-top: 40px
-  padding-bottom: 40px
-
 .form-signin
   max-width: 330px
   padding: 15px

app/assets/stylesheets/app.sass

@@ -1,41 +0,0 @@
-.error-tab > a
-  color: #a94442 !important
-
-.edit-highlight
-  background-color: #E7E7E7
-
-.navbar-brand
-  line-height: 12px
-  padding-top: 20px
-  padding-bottom: 5px
-
-.navbar-brand small
-  display: block
-  font-size: 10px
-
-.footer
-  color: #777
-  padding-top: 15px
-  font-size: 10px
-
-.nowrap
-  white-space: nowrap
-
-.form-signin
-  max-width: 330px
-  padding: 15px
-  margin: 0 auto
-  input
-    margin-bottom: 10px
-
-.form-signin .form-control
-  position: relative
-  height: auto
-  -webkit-box-sizing: border-box
-  -moz-box-sizing: border-box
-  box-sizing: border-box
-  padding: 10px
-  font-size: 16px
-
-.no-border
-  border: 0 !important

app/assets/stylesheets/application.css.scss

@@ -1,9 +0,0 @@
-//= require 'custom-boostrap'
-@import "nprogress";
-@import "nprogress-bootstrap";
-@import "bootstrap-ext";
-@import "typeaheadjs";
-@import "selectize";
-@import "selectize.bootstrap3";
-@import "general";
-@import "app";

app/assets/stylesheets/custom-boostrap.scss

@@ -1,13 +0,0 @@
-$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif;
-$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif;
-$navbar-default-bg: #F69240;
-$navbar-default-brand-color: #fff;
-$navbar-default-link-color: #fff;
-$border-radius-base: 2px;
-$body-bg: #F8F8F8;
-$container-large-desktop: 1040px;
-$font-size-h1: 26px;
-$navbar-default-link-active-color: #333;
-
-@import "bootstrap-sprockets";
-@import "bootstrap";

app/assets/stylesheets/fonts.scss

@@ -1,65 +0,0 @@
-@font-face {
-    font-family: 'EtelkaLightProRegular';
-    src: font_url('etelkalight-webfont.eot');
-    src: font_url('etelkalight-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('etelkalight-webfont.woff') format('woff'),
-         font_url('etelkalight-webfont.ttf') format('truetype'),
-         font_url('etelkalight-webfont.svg#EtelkaLightProRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'EtelkaLightProBold';
-    src: font_url('etelkalightbold-webfont.eot');
-    src: font_url('etelkalightbold-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('etelkalightbold-webfont.woff') format('woff'),
-         font_url('etelkalightbold-webfont.ttf') format('truetype'),
-         font_url('etelkalightbold-webfont.svg#EtelkaLightProBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'EtelkaLightProItalic';
-    src: font_url('etelkalightitalic-webfont.eot');
-    src: font_url('etelkalightitalic-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('etelkalightitalic-webfont.woff') format('woff'),
-         font_url('etelkalightitalic-webfont.ttf') format('truetype'),
-         font_url('etelkalightitalic-webfont.svg#EtelkaLightProItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'InfoTextBold';
-    src: font_url('infotexb-webfont.eot');
-    src: font_url('infotexb-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('infotexb-webfont.woff') format('woff'),
-         font_url('infotexb-webfont.ttf') format('truetype'),
-         font_url('infotexb-webfont.svg#InfoTextBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'InfoTextMedium';
-    src: font_url('infotexm-webfont.eot');
-    src: font_url('infotexm-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('infotexm-webfont.woff') format('woff'),
-         font_url('infotexm-webfont.ttf') format('truetype'),
-         font_url('infotexm-webfont.svg#InfoTextMedium') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'InfoTextRegular';
-    src: font_url('infotexn-webfont.eot');
-    src: font_url('infotexn-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('infotexn-webfont.woff') format('woff'),
-         font_url('infotexn-webfont.ttf') format('truetype'),
-         font_url('infotexn-webfont.svg#InfoTextRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}

app/assets/stylesheets/registrar-manifest.css.scss

@@ -1,11 +0,0 @@
-@import "fonts";
-@import "registrar";
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import "nprogress";
-@import "nprogress-bootstrap";
-@import "bootstrap-ext";
-@import "typeaheadjs";
-@import "selectize";
-@import "selectize.bootstrap3";
-@import "app";

app/assets/stylesheets/registrar-manifest.sass

@@ -0,0 +1,9 @@
+//= require 'shared/custom-boostrap'
+@import shared/fonts
+@import shared/general
+@import nprogress
+@import nprogress-bootstrap
+@import typeaheadjs
+@import selectize
+@import selectize.bootstrap3
+@import registrar/registrar

app/assets/stylesheets/shared/custom-boostrap.sass

@@ -1,3 +1,21 @@
+$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif
+$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif
+$navbar-default-bg: #F69240
+$navbar-default-brand-color: #fff
+$navbar-default-link-color: #fff
+$border-radius-base: 2px
+$body-bg: #F8F8F8
+$container-large-desktop: 1040px
+$font-size-h1: 26px
+$navbar-default-link-active-color: #333
+
+@import "bootstrap-sprockets"
+@import "bootstrap"
+
+// http://stackoverflow.com/questions/18153234/center-a-column-using-twitter-bootstrap-3
+.center-block
+  float: none !important
+
 .text-left-not-xs, .text-left-not-sm, .text-left-not-md, .text-left-not-lg
   text-align: left
 
@@ -57,3 +75,4 @@
     text-align: right
   .text-justify-lg
     text-align: justify
+

app/assets/stylesheets/shared/fonts.sass

@@ -0,0 +1,46 @@
+@font-face
+  font-family: 'EtelkaLightProRegular'
+  src: font_url("etelkalight-webfont.eot")
+  src: font_url("etelkalight-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalight-webfont.woff") format("woff"), font_url("etelkalight-webfont.ttf") format("truetype"), font_url("etelkalight-webfont.svg#EtelkaLightProRegular") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'EtelkaLightProBold'
+  src: font_url("etelkalightbold-webfont.eot")
+  src: font_url("etelkalightbold-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalightbold-webfont.woff") format("woff"), font_url("etelkalightbold-webfont.ttf") format("truetype"), font_url("etelkalightbold-webfont.svg#EtelkaLightProBold") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'EtelkaLightProItalic'
+  src: font_url("etelkalightitalic-webfont.eot")
+  src: font_url("etelkalightitalic-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalightitalic-webfont.woff") format("woff"), font_url("etelkalightitalic-webfont.ttf") format("truetype"), font_url("etelkalightitalic-webfont.svg#EtelkaLightProItalic") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'InfoTextBold'
+  src: font_url("infotexb-webfont.eot")
+  src: font_url("infotexb-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexb-webfont.woff") format("woff"), font_url("infotexb-webfont.ttf") format("truetype"), font_url("infotexb-webfont.svg#InfoTextBold") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'InfoTextMedium'
+  src: font_url("infotexm-webfont.eot")
+  src: font_url("infotexm-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexm-webfont.woff") format("woff"), font_url("infotexm-webfont.ttf") format("truetype"), font_url("infotexm-webfont.svg#InfoTextMedium") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'InfoTextRegular'
+  src: font_url("infotexn-webfont.eot")
+  src: font_url("infotexn-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexn-webfont.woff") format("woff"), font_url("infotexn-webfont.ttf") format("truetype"), font_url("infotexn-webfont.svg#InfoTextRegular") format("svg")
+  font-weight: normal
+  font-style: normal

app/assets/stylesheets/shared/general.sass

@@ -4,9 +4,6 @@ html
   -webkit-text-size-adjust: 100%
   -ms-text-size-adjust: 100%
 
-body
-  background: url(image_path('bg.jpg'))
-
 h1
   font-size: 26px
   margin-bottom: 16px
@@ -26,10 +23,6 @@ h1, h2, h3, h4, h1 a, h2 a, h3 a, h4 a
   font-weight: normal
   font-family: 'EtelkaLightProBold'
 
-h1
-  font-size: 22px
-  text-transform: uppercase
-
 body,
 button,
 input,
@@ -220,6 +213,47 @@ body.login
     .form-control:focus
       z-index: 2
 
+.error-tab > a
+  color: #a94442 !important
+
+.edit-highlight
+  background-color: #E7E7E7
+
+.navbar-brand
+  line-height: 12px
+  padding-top: 20px
+  padding-bottom: 5px
+
+.navbar-brand small
+  display: block
+  font-size: 10px
+
+.footer
+  color: #777
+  padding-top: 15px
+  font-size: 10px
+
+.nowrap
+  white-space: nowrap
+
+.form-signin
+  max-width: 330px
+  padding: 15px
+  margin: 0 auto
+  input
+    margin-bottom: 10px
+
+.form-signin .form-control
+  position: relative
+  height: auto
+  -webkit-box-sizing: border-box
+  -moz-box-sizing: border-box
+  box-sizing: border-box
+  padding: 10px
+  font-size: 16px
+
+
+
 // fix label position for medium screen
 @media (min-width: 768px) and (max-width: 991px)
   .form-horizontal .control-label

app/controllers/admin/epp_logs_controller.rb

@@ -1,4 +1,4 @@
-class Admin::EppLogsController < ApplicationController
+class Admin::EppLogsController < AdminController
   load_and_authorize_resource class: ApiLog::EppLog
 
   def index

app/controllers/admin/repp_logs_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ReppLogsController < ApplicationController
+class Admin::ReppLogsController < AdminController
   load_and_authorize_resource class: ApiLog::ReppLog
 
   def index

app/controllers/admin/sessions_controller.rb

@@ -1,5 +1,5 @@
 class Admin::SessionsController < SessionsController
-  layout 'login'
+  layout 'admin/application'
 
   def create
     super

app/controllers/admin/zonefile_settings_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ZonefileSettingsController < ApplicationController
+class Admin::ZonefileSettingsController < AdminController
   load_and_authorize_resource
   before_action :set_zonefile_setting, only: [:update, :edit]
   def index

app/controllers/admin_controller.rb

@@ -1,3 +1,9 @@
 class AdminController < ApplicationController
+  layout 'admin/application'
   before_action :authenticate_user!
+
+  helper_method :head_title_sufix
+  def head_title_sufix
+    t(:admin_head_title_sufix)
+  end
 end

app/controllers/registrar_controller.rb

@@ -8,4 +8,9 @@ class RegistrarController < ApplicationController
   def depp_controller?
     false
   end
+
+  helper_method :head_title_sufix
+  def head_title_sufix
+    t(:registrar_head_title_sufix)
+  end
 end

app/views/admin/admin_users/edit.haml

@@ -1,9 +1,5 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_user), [:admin, @admin_user], class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'shared/title', name: "#{t(:edit)}: #{@admin_user.username}"
-      = "#{t('edit_user')}"
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_user'), [:admin, @admin_user], class: 'btn btn-default')
-%hr
 = render 'form'

app/views/admin/admin_users/index.haml

@@ -1,10 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:create_new_user), new_admin_admin_user_path, class: 'btn btn-primary')
-    %h2.text-center-xs= t('admin_users')
+= render 'shared/title', name: t(:admin_users)
-  .col-sm-6
+
-    %h2.text-right.text-center-xs
-      = link_to(t('create_new_user'), new_admin_admin_user_path, class: 'btn btn-primary')
-%hr
 .row
   .col-md-12
     .table-responsive
@@ -14,11 +11,11 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'username')
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'email', t('email'))
+              = sort_link(@q, 'email', t(:email))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'identity_code', t('identity_code'))
+              = sort_link(@q, 'identity_code', t(:identity_code))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'role', t('role'))
+              = sort_link(@q, 'role', t(:role))
         %tbody
           - @admin_users.each do |x|
             %tr

app/views/admin/admin_users/new.haml

@@ -1,3 +1,3 @@
-%h2= t('create_new_user')
+= render 'shared/title', name: t(:create_new_user)
-%hr
+
 = render 'form'

app/views/admin/admin_users/show.haml

@@ -1,45 +1,39 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:edit), edit_admin_admin_user_path(@admin_user), class: 'btn btn-primary')
-    %h2.text-center-xs
+  = link_to(t(:delete), admin_admin_user_path(@admin_user), 
-      = "#{t('user_details')}"
+    method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
-  .col-sm-6
+= render 'shared/title', name: @admin_user.username
-    %h2.text-right.text-center-xs
-      = link_to(t('edit'), edit_admin_admin_user_path(@admin_user), class: 'btn btn-primary')
-      = link_to(t('delete'), admin_admin_user_path(@admin_user), method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-danger')
 
-%hr
 - if @admin_user.errors.any?
   - @admin_user.errors.each do |attr, err|
     = err
     %br
-- if @admin_user.errors.any?
-  %hr
 .row
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('general')
+        %h3.panel-title= t(:general)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('username')
+          %dt= t(:username)
           %dd= @admin_user.username
 
-          %dt= t('password')
+          %dt= t(:password)
           %dd= @admin_user.password
 
-          %dt= t('identity_code')
+          %dt= t(:identity_code)
           %dd= @admin_user.identity_code
 
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('address')
+        %h3.panel-title= t(:address)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('email')
+          %dt= t(:email)
           %dd= @admin_user.email
 
-          %dt= t('role')
+          %dt= t(:role)
           - if @admin_user.roles
             %dd= t(@admin_user.roles.first)
           - else

app/views/admin/api_users/edit.haml

@@ -1,9 +1,5 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_api_user), [:admin, @api_user], class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'shared/title', name: "#{t(:edit)}: #{@api_user.username}"
-      = "#{t('edit_api_user')}"
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_api_user'), [:admin, @api_user], class: 'btn btn-default')
-%hr
 = render 'form'

app/views/admin/api_users/index.haml

@@ -1,10 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:create_new_api_user), new_admin_api_user_path, class: 'btn btn-primary')
-    %h2.text-center-xs= t('api_users')
+= render 'shared/title', name: t(:api_users)
-  .col-sm-6
+
-    %h2.text-right.text-center-xs
-      = link_to(t('create_new_api_user'), new_admin_api_user_path, class: 'btn btn-primary')
-%hr
 .row
   .col-md-12
     .table-responsive
@@ -14,9 +11,9 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'username')
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t('registrar'))
+              = sort_link(@q, 'registrar_name', t(:registrar))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'active', t('active'))
+              = sort_link(@q, 'active', t(:active))
         %tbody
           - @api_users.each do |x|
             %tr

app/views/admin/api_users/new.haml

@@ -1,3 +1,3 @@
-%h2= t('create_new_api_user')
+= render 'shared/title', name: t(:create_new_api_user)
-%hr
+
 = render 'form'

app/views/admin/api_users/show.haml

@@ -1,13 +1,9 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:edit), edit_admin_api_user_path(@api_user), class: 'btn btn-primary')
-    %h2.text-center-xs
+  = link_to(t(:delete), admin_api_user_path(@api_user), 
-      = "#{t('api_user_details')}"
+    method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
-  .col-sm-6
+= render 'shared/title', name: @api_user.username
-    %h2.text-right.text-center-xs
-      = link_to(t('edit'), edit_admin_api_user_path(@api_user), class: 'btn btn-primary')
-      = link_to(t('delete'), admin_api_user_path(@api_user), method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-danger')
 
-%hr
 - if @api_user.errors.any?
   - @api_user.errors.each do |attr, err|
     = err
@@ -18,32 +14,33 @@
   .col-md-12
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('general')
+        %h3.panel-title= t(:general)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('username')
+          %dt= t(:username)
           %dd= @api_user.username
 
-          %dt= t('password')
+          %dt= t(:password)
           %dd= @api_user.password
 
-          %dt= t('active')
+          %dt= t(:active)
           %dd= @api_user.active
 .row
   .col-md-12
     .panel.panel-default
       .panel-heading.clearfix
         .pull-left
-          = t('certificates')
+          = t(:certificates)
         .pull-right
-          = link_to(t('upload_csr'), new_admin_api_user_certificate_path(@api_user), class: 'btn btn-primary btn-xs')
+          = link_to(t(:upload_csr), 
+            new_admin_api_user_certificate_path(@api_user), class: 'btn btn-primary btn-xs')
 
       .table-responsive
         %table.table.table-hover.table-bordered.table-condensed
           %thead
             %tr
-              %th{class: 'col-xs-10'}= t('subject')
+              %th{class: 'col-xs-10'}= t(:subject)
-              %th{class: 'col-xs-2'}= t('status')
+              %th{class: 'col-xs-2'}= t(:status)
           %tbody
             - @api_user.certificates.each do |x|
               - if x.csr

app/views/admin/bank_statements/index.haml

@@ -1,8 +1,7 @@
 - content_for :actions do
-  = link_to(t('import'), new_admin_bank_statement_path, class: 'btn btn-default')
+  = link_to(t(:import), new_admin_bank_statement_path, class: 'btn btn-primary')
-= render 'admin/shared/title', name: "#{t(:bank_statements)}"
+= render 'shared/title', name: t(:bank_statements)
 
-%hr
 .row
   .col-md-12
     .table-responsive

app/views/admin/bank_statements/new.haml

@@ -1,11 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_bank_statements), admin_bank_statements_path, class: 'btn btn-default')
-    %h2.text-center-xs= t('import_th6_bank_statement')
+= render 'shared/title', name: t(:import_th6_bank_statement)
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_bank_statements'), admin_bank_statements_path, class: 'btn btn-primary')
 
-%hr
 = form_for([:admin, @bank_statement], multipart: true) do |f|
   = render 'shared/full_errors', object: @bank_statement
 
@@ -17,5 +13,4 @@
   %hr
   .row
     .col-md-12.text-right
-      = button_tag(t('save'), class: 'btn btn-primary')
+      = button_tag(t(:save), class: 'btn btn-primary')
-

app/views/admin/bank_statements/show.haml

@@ -1,11 +1,9 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:bind_invoices), bind_invoices_admin_bank_statement_path, 
-    %h2.text-center-xs= t('bank_statement')
+    class: 'btn btn-primary', method: :post)
-  .col-sm-6
+  = link_to(t(:back_to_bank_statements), admin_bank_statements_path, class: 'btn btn-default')
-    %h2.text-right.text-center-xs
+= render 'shared/title', name: t(:bank_statement)
-      = link_to(t('bind_invoices'), bind_invoices_admin_bank_statement_path, class: 'btn btn-primary', method: :post)
+
-      = link_to(t('back_to_bank_statements'), admin_bank_statements_path, class: 'btn btn-default')
-%hr
 %row
   .col-md-12
 .panel.panel-default
@@ -13,29 +11,29 @@
     %h3.panel-title= t(:details)
   .panel-body
     %dl.dl-horizontal
-      %dt= t('bank_code')
+      %dt= t(:bank_code)
       %dd= @bank_statement.bank_code
 
-      %dt= t('iban')
+      %dt= t(:iban)
       %dd= @bank_statement.iban
 
-      %dt= t('status')
+      %dt= t(:status)
       - sc = 'text-success' if @bank_statement.fully_binded?
       - sc = 'text-warning' if @bank_statement.partially_binded?
       - sc = 'text-danger' if @bank_statement.not_binded?
       %dd{class: sc}= t(@bank_statement.status)
 
-      %dt= t('queried_at')
+      %dt= t(:queried_at)
       %dd= l(@bank_statement.queried_at)
 
-      %dt= t('imported_at')
+      %dt= t(:imported_at)
       %dd= l(@bank_statement.created_at)
 
       - if @bank_statement.import_file_path
-        %dt= t('import_file')
+        %dt= t(:import_file)
-        %dd= link_to(t('download'), download_import_file_admin_bank_statement_path(@bank_statement))
+        %dd= link_to(t(:download), download_import_file_admin_bank_statement_path(@bank_statement))
 
-%h2.text-center-xs= t('bank_transactions')
+%h2.text-center-xs= t(:bank_transactions)
 %hr
 .row
   .col-md-12
@@ -52,7 +50,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'currency')
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'account_activity_id', t('status'))
+              = sort_link(@q, 'account_activity_id', t(:status))
         %tbody
           - @bank_transactions.each do |x|
             %tr
@@ -61,7 +59,7 @@
               %td= x.sum
               %td= x.currency
               - c = x.binded? ? 'text-success' : 'text-danger'
-              %td{class: c}= x.binded? ? t('binded') : t('not_binded')
+              %td{class: c}= x.binded? ? t(:binded) : t(:not_binded)
 .row
   .col-md-12
     = paginate @bank_transactions

app/views/admin/certificates/new.haml

@@ -1,5 +1,5 @@
-%h2= t('upload_csr')
+= render 'shared/title', name: t(:upload_csr)
-%hr
+
 = form_for([:admin, @api_user, @certificate], multipart: true) do |f|
   - if @certificate.errors.any?
     - @certificate.errors.each do |attr, err|
@@ -11,10 +11,10 @@
   .row
     .col-md-12.text-left
       .form-group
-        = f.label :csr, t('certificate_signing_req')
+        = f.label :csr, t(:certificate_signing_req)
         = f.file_field :csr
   %hr
   .row
     .col-md-12.text-right
-      = button_tag(t('save'), class: 'btn btn-primary')
+      = button_tag(t(:save), class: 'btn btn-primary')
 

app/views/admin/certificates/show.haml

@@ -1,12 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_api_user), [:admin, @api_user], class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'shared/title', name: t(:certificates)
-      = t('certificates')
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_api_user'), [:admin, @api_user], class: 'btn btn-default')
 
-%hr
 - if @certificate.errors.any?
   - @certificate.errors.each do |attr, err|
     = err

app/views/admin/contacts/index.haml

@@ -1,7 +1,5 @@
-.row
+= render 'shared/title', name: t(:contacts)
-  .col-sm-12
+
-    %h2.text-center-xs= t(:contacts)
-%hr
 .row
   .col-md-12
     = search_form_for [:admin, @q], html: { class: 'form-horizontal' } do |f|

app/views/admin/contacts/show.haml

@@ -1,8 +1,5 @@
-.row
+= render 'shared/title', name: @contact.name
-  .col-sm-12
+
-    %h2.text-center-xs
-      = @contact.name
-%hr
 .row
   .col-md-6= render 'admin/contacts/partials/general'
   .col-md-6= render 'admin/contacts/partials/address'

app/views/admin/delayed_jobs/index.haml

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

app/views/admin/domain_versions/index.haml

@@ -1,6 +1,6 @@
 - content_for :actions do
   = link_to(t(:back_to_domain), [:admin, @domain], class: 'btn btn-default')
-= render 'admin/shared/title', name: "#{t(:history)}: #{@domain.name}"
+= render 'shared/title', name: "#{t(:history)}: #{@domain.name}"
 
 .row
   .col-md-12

app/views/admin/domains/edit.haml

@@ -1,5 +1,5 @@
 - content_for :actions do
   = link_to(t(:back_to_domain), [:admin, @domain], class: 'btn btn-default')
-= render 'admin/shared/title', name: "#{t(:edit)}: #{@domain.name}"
+= render 'shared/title', name: "#{t(:edit)}: #{@domain.name}"
 
 = render 'form'

app/views/admin/domains/index.haml

@@ -1,7 +1,5 @@
-.row
+= render 'shared/title', name: t(:domains)
-  .col-sm-12
+
-    %h2.text-center-xs= t(:domains)
-%hr
 .row
   .col-md-12
     = search_form_for [:admin, @q], html: { class: 'form-horizontal' } do |f|

app/views/admin/domains/show.haml

@@ -1,13 +1,8 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:edit_statuses), edit_admin_domain_path(@domain), class: 'btn btn-primary')
-    %h2.text-center-xs
+  = link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary')
-      = "#{t('domain_details')}"
+= render 'shared/title', name: @domain.name
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t(:edit_statuses), edit_admin_domain_path(@domain), class: 'btn btn-primary')
-      = link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary')
 
-%hr
 .row
   .col-md-6= render 'admin/domains/partials/general'
   .col-md-6= render 'admin/domains/partials/owner'

app/views/admin/domains/zonefile.haml

@@ -1,11 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_domain), admin_domain_path(@domain), class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'shared/title', name: t(:zonefile)
-      = "#{t('zonefile')}"
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_domain'), admin_domain_path(@domain), class: 'btn btn-default')
-%hr
 .row
   .col-md-12
     = preserve do

app/views/admin/epp_logs/index.haml

@@ -1,6 +1,5 @@
-.row
+= render 'shared/title', name: t(:epp_logs)
-  .col-sm-12
+
-    %h2.text-center-xs= t('epp_logs')
 .row
   .col-md-12
     %hr
@@ -9,39 +8,39 @@
         .col-md-3
           .form-group
             = f.label :request_command
-            = f.select :request_command_eq, [[t('choose'),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t('choose')
+            = f.select :request_command_eq, [[t(:choose),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label :request_object
-            = f.select :request_object_eq, [[t('choose'),''], 'contact', 'domain', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t('choose')
+            = f.select :request_object_eq, [[t(:choose),''], 'contact', 'domain', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label :request_successful
-            = f.select :request_successful_true, [[t('choose'), ''], 'true', 'false'], {}, class: 'form-control selectize', placeholder: t('choose')
+            = f.select :request_successful_true, [[t(:choose), ''], 'true', 'false'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label :api_user
-            = f.search_field :api_user_name_cont, class: 'form-control', placeholder: t('api_user'), autocomplete: 'off'
+            = f.search_field :api_user_name_cont, class: 'form-control', placeholder: t(:api_user), autocomplete: 'off'
       .row
         .col-md-3
           .form-group
             = f.label :registrar
-            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t('registrar'), autocomplete: 'off'
+            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_after)
-            = f.search_field :created_at_gteq, class: 'form-control', placeholder: t('created_after'), autocomplete: 'off'
+            = f.search_field :created_at_gteq, class: 'form-control', placeholder: t(:created_after), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_before)
-            = f.search_field :created_at_lteq, class: 'form-control', placeholder: t('created_before'), autocomplete: 'off'
+            = f.search_field :created_at_lteq, class: 'form-control', placeholder: t(:created_before), autocomplete: 'off'
         .col-md-3{style: 'padding-top: 25px;'}
           %button.btn.btn-primary
              
             %span.glyphicon.glyphicon-search
              
           %button.btn.btn-default.js-reset-form
-            = t('clear_fields')
+            = t(:clear_fields)
 .row
   .col-md-12
     %hr
@@ -50,11 +49,11 @@
       %table.table.table-hover.table-bordered.table-condensed
         %thead
           %tr
-            %th{class: 'col-xs-2'}= t('request_command')
+            %th{class: 'col-xs-2'}= t(:request_command)
-            %th{class: 'col-xs-2'}= t('request_object')
+            %th{class: 'col-xs-2'}= t(:request_object)
-            %th{class: 'col-xs-2'}= t('request_successful')
+            %th{class: 'col-xs-2'}= t(:request_successful)
-            %th{class: 'col-xs-2'}= t('api_user')
+            %th{class: 'col-xs-2'}= t(:api_user)
-            %th{class: 'col-xs-2'}= t('registrar')
+            %th{class: 'col-xs-2'}= t(:registrar)
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'created_at')
         %tbody

app/views/admin/epp_logs/show.haml

@@ -1,44 +1,40 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back), :back, class: 'btn btn-primary')
-    %h2.text-center-xs
+= render 'shared/title', name: t(:epp_log)
-      = t('epp_log')
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back'), :back, class: 'btn btn-primary')
-%hr
 .row
   .col-md-12
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('details')
+        %h3.panel-title= t(:details)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('request_command')
+          %dt= t(:request_command)
           %dd= @epp_log.request_command
 
-          %dt= t('request_object')
+          %dt= t(:request_object)
           %dd= @epp_log.request_object
 
-          %dt= t('request_successful')
+          %dt= t(:request_successful)
           %dd= @epp_log.request_successful
 
-          %dt= t('api_user')
+          %dt= t(:api_user)
           %dd= @epp_log.api_user_name
 
-          %dt= t('registrar')
+          %dt= t(:registrar)
           %dd= @epp_log.api_user_registrar
 
-          %dt= t('ip')
+          %dt= t(:ip)
           %dd= @epp_log.ip
 
-          %dt= t('created_at')
+          %dt= t(:created_at)
           %dd= @epp_log.created_at
 
 .row
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('request')
+        %h3.panel-title= t(:request)
       .panel-body
         = preserve do
           %pre
@@ -50,7 +46,7 @@
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('response')
+        %h3.panel-title= t(:response)
       .panel-body
         = preserve do
           %pre

app/views/admin/keyrelays/index.haml

@@ -1,13 +1,11 @@
-.row
+= render 'shared/title', name: t(:keyrelays)
-  .col-sm-12
+
-    %h2.text-center-xs= t('keyrelays')
-%hr
 .row
   .col-md-12
     = search_form_for [:admin, @q], html: { class: 'form-horizontal' } do |f|
       .col-md-11
         .form-group
-          = f.search_field :domain_name_cont, class: 'form-control', placeholder: t('domain_name')
+          = f.search_field :domain_name_cont, class: 'form-control', placeholder: t(:domain_name)
       .col-md-1.text-right.text-center-xs
         .form-group
           %button.btn.btn-primary
@@ -22,15 +20,15 @@
         %thead
           %tr
             %th{class: 'col-xs-4'}
-              = sort_link(@q, 'pa_date', t('uploaded_at'))
+              = sort_link(@q, 'pa_date', t(:uploaded_at))
             %th{class: 'col-xs-3'}
-              = t('expiry')
+              = t(:expiry)
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'requester_name', t('requester'))
+              = sort_link(@q, 'requester_name', t(:requester))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'accepter_name', t('accepter'))
+              = sort_link(@q, 'accepter_name', t(:accepter))
             %th{class: 'col-xs-1'}
-              = t('status')
+              = t(:status)
         %tbody
           - @keyrelays.each do |x|
             %tr

app/views/admin/keyrelays/show.haml

@@ -1,62 +1,59 @@
-.row
+= render 'shared/title', name: t(:keyrelay_details)
-  .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')
+        %h3.panel-title= t(:keyrelay)
       .panel-body{style: 'word-wrap: break-word;'}
         %dl.dl-horizontal
-          %dt= t('uploaded_at')
+          %dt= t(:uploaded_at)
           %dd= @keyrelay.pa_date
 
-          %dt= t('domain')
+          %dt= t(:domain)
           %dd= link_to(@keyrelay.domain, [:admin, @keyrelay.domain])
 
-          %dt= t('status')
+          %dt= t(:status)
           %dd= @keyrelay.status
 
-          %dt= t('flag')
+          %dt= t(:flag)
           %dd= @keyrelay.key_data_flags
 
-          %dt= t('protocol')
+          %dt= t(:protocol)
           %dd= @keyrelay.key_data_protocol
 
-          %dt= t('algorithm')
+          %dt= t(:algorithm)
           %dd= @keyrelay.key_data_alg
 
-          %dt= t('public_key')
+          %dt= t(:public_key)
           %dd= @keyrelay.key_data_public_key
 
-          %dt= t('password')
+          %dt= t(:password)
           %dd= @keyrelay.auth_info_pw
 
-          %dt= t('expiry_relative')
+          %dt= t(:expiry_relative)
           %dd= @keyrelay.expiry_relative
 
-          %dt= t('expiry_absolute')
+          %dt= t(:expiry_absolute)
           %dd= @keyrelay.expiry_absolute
 
-          %dt= t('requester')
+          %dt= t(:requester)
           %dd= link_to(@keyrelay.requester, [:admin, @keyrelay.requester])
 
-          %dt= t('accepter')
+          %dt= t(:accepter)
           %dd= link_to(@keyrelay.accepter, [:admin, @keyrelay.accepter])
 
 .row
   .col-md-12
     .panel.panel-default
       .panel-heading.clearfix
-        = t('legal_documents')
+        = t(:legal_documents)
       .table-responsive
         %table.table.table-hover.table-bordered.table-condensed
           %thead
             %tr
-              %th{class: 'col-xs-8'}= t('created_at')
+              %th{class: 'col-xs-8'}= t(:created_at)
-              %th{class: 'col-xs-4'}= t('type')
+              %th{class: 'col-xs-4'}= t(:type)
           %tbody
             - @keyrelay.legal_documents.each do |x|
               %tr

app/views/admin/registrars/edit.haml

@@ -1,5 +1,5 @@
 - content_for :actions do
   = link_to(t(:back_to_registrar), [:admin, @registrar], class: 'btn btn-default')
-= render 'admin/shared/title', name: "#{t(:edit)}: #{@registrar.name}"
+= render 'shared/title', name: "#{t(:edit)}: #{@registrar.name}"
 
 = render 'form'

app/views/admin/registrars/index.haml

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

app/views/admin/registrars/new.haml

@@ -1,3 +1,3 @@
-%h2= t('new_registrar')
+= render 'shared/title', name: t(:new_registrar)
-%hr
+
 = render 'form'

app/views/admin/registrars/show.haml

@@ -1,13 +1,9 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:edit), edit_admin_registrar_path(@registrar), class: 'btn btn-primary')
-    %h2.text-center-xs
+  = link_to(t(:delete), admin_registrar_path(@registrar), 
-      = "#{t('registrar_details')}"
+    method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
-  .col-sm-6
+= render 'shared/title', name: @registrar.name
-    %h2.text-right.text-center-xs
-      = 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?
   - @registrar.errors.each do |attr, err|
     = err
@@ -18,56 +14,56 @@
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('general')
+        %h3.panel-title= t(:general)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('name')
+          %dt= t(:name)
           %dd= @registrar.name
 
-          %dt= t('reg_no')
+          %dt= t(:reg_no)
           %dd= @registrar.reg_no
 
-          %dt= t('vat_no')
+          %dt= t(:vat_no)
           %dd= @registrar.vat_no
 
-          %dt= t('reference_no')
+          %dt= t(:reference_no)
           %dd= @registrar.reference_no
 
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('contact')
+        %h3.panel-title= t(:contact)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('country')
+          %dt= t(:country)
           %dd= @registrar.country
 
-          %dt= t('address')
+          %dt= t(:address)
           %dd= @registrar.address
 
-          %dt= t('contact_phone')
+          %dt= t(:contact_phone)
           %dd= @registrar.phone
 
-          %dt= t('contact_email')
+          %dt= t(:contact_email)
           %dd= @registrar.email
 
-          %dt= t('billing_address')
+          %dt= t(:billing_address)
           %dd= @registrar.billing_address
 
-          %dt= t('billing_email')
+          %dt= t(:billing_email)
           %dd= @registrar.billing_email
 
 .row
   .col-md-12
     #epp-users.panel.panel-default
       .panel-heading.clearfix
-        = t('api_users')
+        = t(:api_users)
       .table-responsive
         %table.table.table-hover.table-bordered.table-condensed
           %thead
             %tr
-              %th{class: 'col-xs-6'}= t('username')
+              %th{class: 'col-xs-6'}= t(:username)
-              %th{class: 'col-xs-6'}= t('active')
+              %th{class: 'col-xs-6'}= t(:active)
           %tbody
             - @registrar.api_users.each do |x|
               %tr

app/views/admin/repp_logs/index.haml

@@ -1,6 +1,5 @@
-.row
+= render 'shared/title', name: t(:repp_logs)
-  .col-sm-12
+
-    %h2.text-center-xs= t('repp_logs')
 .row
   .col-md-12
     %hr
@@ -9,39 +8,39 @@
         .col-md-3
           .form-group
             = f.label :request_path
-            = f.select :request_path_eq, [[t('choose'),''], '/repp/v1/domains', '/repp/v1/contacts'], {}, class: 'form-control selectize', placeholder: t('choose')
+            = f.select :request_path_eq, [[t(:choose),''], '/repp/v1/domains', '/repp/v1/contacts'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label :request_method
-            = f.select :request_method_eq, [[t('choose'),''], 'GET', 'POST', 'PUT', 'DELETE'], {}, class: 'form-control selectize', placeholder: t('choose')
+            = f.select :request_method_eq, [[t(:choose),''], 'GET', 'POST', 'PUT', 'DELETE'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label :response_code
-            = f.search_field :response_code_eq, class: 'form-control', placeholder: t('response_code'), autocomplete: 'off'
+            = f.search_field :response_code_eq, class: 'form-control', placeholder: t(:response_code), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label :api_user
-            = f.search_field :api_user_name_cont, class: 'form-control', placeholder: t('api_user'), autocomplete: 'off'
+            = f.search_field :api_user_name_cont, class: 'form-control', placeholder: t(:api_user), autocomplete: 'off'
       .row
         .col-md-3
           .form-group
             = f.label :registrar
-            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t('registrar'), autocomplete: 'off'
+            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_after)
-            = f.search_field :created_at_gteq, class: 'form-control', placeholder: t('created_after'), autocomplete: 'off'
+            = f.search_field :created_at_gteq, class: 'form-control', placeholder: t(:created_after), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_before)
-            = f.search_field :created_at_lteq, class: 'form-control', placeholder: t('created_before'), autocomplete: 'off'
+            = f.search_field :created_at_lteq, class: 'form-control', placeholder: t(:created_before), autocomplete: 'off'
         .col-md-3{style: 'padding-top: 25px;'}
           %button.btn.btn-primary
              
             %span.glyphicon.glyphicon-search
              
           %button.btn.btn-default.js-reset-form
-            = t('clear_fields')
+            = t(:clear_fields)
 %hr
 .row
   .col-md-12
@@ -49,11 +48,11 @@
       %table.table.table-hover.table-bordered.table-condensed
         %thead
           %tr
-            %th{class: 'col-xs-2'}= t('request_path')
+            %th{class: 'col-xs-2'}= t(:request_path)
-            %th{class: 'col-xs-2'}= t('request_method')
+            %th{class: 'col-xs-2'}= t(:request_method)
-            %th{class: 'col-xs-2'}= t('response_code')
+            %th{class: 'col-xs-2'}= t(:response_code)
-            %th{class: 'col-xs-2'}= t('api_user')
+            %th{class: 'col-xs-2'}= t(:api_user)
-            %th{class: 'col-xs-2'}= t('registrar')
+            %th{class: 'col-xs-2'}= t(:registrar)
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'created_at')
         %tbody

app/views/admin/repp_logs/show.haml

@@ -1,44 +1,40 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back), :back, class: 'btn btn-primary')
-    %h2.text-center-xs
+= render 'shared/title', name: t(:repp_log)
-      = t('repp_log')
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back'), :back, class: 'btn btn-primary')
-%hr
 .row
   .col-md-12
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('details')
+        %h3.panel-title= t(:details)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('request_path')
+          %dt= t(:request_path)
           %dd= @repp_log.request_path
 
-          %dt= t('request_method')
+          %dt= t(:request_method)
           %dd= @repp_log.request_method
 
-          %dt= t('response_code')
+          %dt= t(:response_code)
           %dd= @repp_log.response_code
 
-          %dt= t('api_user')
+          %dt= t(:api_user)
           %dd= @repp_log.api_user_name
 
-          %dt= t('registrar')
+          %dt= t(:registrar)
           %dd= @repp_log.api_user_registrar
 
-          %dt= t('ip')
+          %dt= t(:ip)
           %dd= @repp_log.ip
 
-          %dt= t('created_at')
+          %dt= t(:created_at)
           %dd= @repp_log.created_at
 
 .row
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('request_params')
+        %h3.panel-title= t(:request_params)
       .panel-body
         = preserve do
           %pre
@@ -46,7 +42,7 @@
   .col-md-6
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('response')
+        %h3.panel-title= t(:response)
       .panel-body
         = preserve do
           %pre

app/views/admin/sessions/login.haml

@@ -1,6 +1,8 @@
+%h2.form-signin-heading.text-center Eesti Interneti SA
+%hr
 .form-signin
   / TODO: Refactor this when ID card login is done
-  = button_to 'ID card (user1)', 'sessions',
+  = button_to 'ID card (user1)', admin_sessions_path,
     class: 'btn btn-lg btn-primary btn-block', name: 'user1'
-  = button_to 'ID card (user2)', 'sessions',
+  = button_to 'ID card (user2)', admin_sessions_path,
     class: 'btn btn-lg btn-primary btn-block', name: 'user2'

app/views/admin/settings/index.haml

@@ -1,5 +1,5 @@
-%h2= t('settings')
+= render 'shared/title', name: t(:settings)
-%hr
+
 = form_tag [:admin, :settings] do
   .row
     .col-md-12
@@ -8,9 +8,9 @@
           %thead
             %tr
               %th{class: 'col-xs-9'}
-                = t('setting')
+                = t(:setting)
               %th{class: 'col-xs-2'}
-                = t('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('save')
+      %button.btn.btn-primary=t(:save)

app/views/admin/shared/_title.haml

@@ -1,11 +0,0 @@
-- content_for :window_title do
-  %title= name
-
-.row
-  .col-sm-8
-    %h1.text-center-xs
-      = truncate(name, length: 40)
-  .col-sm-4
-    %h1.text-right.text-center-xs
-      = yield :actions
-%hr

app/views/admin/zonefile_settings/edit.haml

@@ -1,5 +1,5 @@
-%h2= t('zonefile_settings')
+= render 'shared/title', name: t(:zonefile_settings)
-%hr
+
 = form_for [:admin, @zonefile_setting], html: { class: 'form-horizontal' } do |f|
   .row
     .col-md-12
@@ -47,4 +47,4 @@
 
   .row
     .col-md-12.text-right
-      %button.btn.btn-primary=t('save')
+      %button.btn.btn-primary= t(:save)

app/views/admin/zonefile_settings/index.haml

@@ -1,7 +1,5 @@
-.row
+= render 'shared/title', name: t(:zonefile_settings)
-  .col-sm-12
+
-    %h2.text-center-xs= t('zonefile_settings')
-%hr
 .row
   .col-md-12
     .table-responsive
@@ -9,12 +7,14 @@
         %thead
           %tr
             %th{class: 'col-xs-10'}
-              = t('origin')
+              = t(:origin)
             %th{class: 'col-xs-2'}
-              = t('action')
+              = 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')
+                = link_to(t(:generate_zonefile), 
+                  admin_zonefiles_path(origin: x.origin), 
+                  method: 'post', class: 'btn btn-xs btn-primary')

app/views/layouts/admin/application.haml

@@ -5,11 +5,14 @@
     %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"}/
+    - if content_for? :head_title
+      = yield :head_title
+    - else
+      %title= t(:admin_head_title)
     = csrf_meta_tags
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
+    = stylesheet_link_tag 'admin-manifest', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = favicon_link_tag 'favicon.ico'
-    %title Eesti Interneti SA
   %body{:style => env_style}
     / Static navbar
     .navbar.navbar-inverse.navbar-static-top{role: "navigation"}
@@ -29,41 +32,41 @@
         .navbar-collapse.collapse
           %ul.nav.navbar-nav
             - if can? :show, Domain
-              %li= link_to t('domains'), admin_domains_path
+              %li= link_to t(:domains), admin_domains_path
             - if can? :show, Contact
-              %li= link_to t('contacts'), admin_contacts_path
+              %li= link_to t(:contacts), admin_contacts_path
             - if can? :show, Registrar
-              %li= link_to t('registrars'), admin_registrars_path
+              %li= link_to t(:registrars), admin_registrars_path
             - if can? :show, Keyrelay
-              %li= link_to t('keyrelays'), admin_keyrelays_path
+              %li= link_to t(:keyrelays), admin_keyrelays_path
             - if can?(:access, :settings_menu)
               %li.dropdown
                 %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
-                  = t('settings')
+                  = t(:settings)
                   %span.caret
                 %ul.dropdown-menu{role: "menu"}
-                  %li.dropdown-header= t('users')
+                  %li.dropdown-header= t(:users)
                   %li= link_to t(:api_users), admin_api_users_path
                   %li= link_to t(:admin_users), admin_admin_users_path
                   %li.divider
-                  %li.dropdown-header= t('billing')
+                  %li.dropdown-header= t(:billing)
-                  %li= link_to t('bank_statements'), admin_bank_statements_path
+                  %li= link_to t(:bank_statements), admin_bank_statements_path
-                  %li= link_to t('invoices'), admin_invoices_path
+                  %li= link_to t(:invoices), admin_invoices_path
                   %li.divider
-                  %li.dropdown-header= t('system')
+                  %li.dropdown-header= t(:system)
-                  %li= link_to t('settings'), admin_settings_path
+                  %li= link_to t(:settings), admin_settings_path
-                  %li= link_to t('zonefile'), admin_zonefile_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(:epp_logs), admin_epp_logs_path
                   %li= link_to t(:repp_logs), admin_repp_logs_path
                   -# %li= link_to t(:background_jobs), admin_delayed_jobs_path
 
-          %ul.nav.navbar-nav.navbar-right
+          - if signed_in?
-            %li= link_to t('log_out', user: current_user), '/admin/logout'
+            %ul.nav.navbar-nav.navbar-right
+              %li= link_to t(:log_out, user: current_user), '/admin/logout'
 
-        / /.nav-collapse
     .container
-      = render 'registrar/shared/flash'
+      = render 'shared/flash'
       = yield
 
       .footer.text-right

app/views/layouts/login.haml

@@ -1,27 +0,0 @@
-!!!
-%html{:lang => I18n.locale.to_s}
-  %head
-    %meta{:charset => "utf-8"}/
-    %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"}/
-    = csrf_meta_tags
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
-    = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
-    = favicon_link_tag 'favicon.ico'
-    %title Eesti Interneti SA - Log In
-  %body{:style => env_style}
-    .container
-      .form-signin
-        - display = (flash.empty?) ? 'none' : 'block'
-        #flash{style: "display: #{display};"}
-          - type = (flash[:notice]) ? 'bg-success' : 'bg-danger'
-          .alert{class: type}= flash[:notice] || flash[:alert]
-        %h2.form-signin-heading.text-center Eesti Interneti SA
-        %hr
-        / TODO: Refactor this when ID card login is done
-        = button_to 'ID card (user1)', admin_sessions_path,
-          class: 'btn btn-lg btn-primary btn-block', name: 'user1'
-        = button_to 'ID card (user2)', admin_sessions_path,
-          class: 'btn btn-lg btn-primary btn-block', name: 'user2'

app/views/layouts/registrar/application.haml

@@ -6,11 +6,14 @@
     %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"}/
+    - if content_for? :head_title
+      = yield :head_title
+    - else
+      %title= t(:registrar_head_title)
     = csrf_meta_tags
     = stylesheet_link_tag 'registrar-manifest', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = favicon_link_tag 'favicon.ico'
-    %title EIS Registrar Portal
   %body
     / Fixed navbar
     %nav.navbar.navbar-default.navbar-fixed-top
@@ -22,7 +25,7 @@
             %span.icon-bar
             %span.icon-bar
           = link_to main_app.registrar_root_path, class: 'navbar-brand' do
-            EIS Registrar
+            = t(:registrar_head_title)
             - if unstable_env.present?
               .text-center
                 %small{style: 'color: #0074B3;'}= unstable_env
@@ -39,7 +42,7 @@
 
               - if can? :show, Invoice
                 - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil
-                %li{class: active_class}= link_to t('billing'), registrar_invoices_path
+                %li{class: active_class}= link_to t(:billing), registrar_invoices_path
 
               - if can? :view, :registrar_xml_console
                 - active_class = ['registrar/xml_consoles'].include?(params[:controller]) ? 'active' :nil
@@ -47,15 +50,14 @@
 
             %ul.nav.navbar-nav.navbar-right
               - if user_signed_in?
-                %li= link_to t('log_out', user: current_user), '/registrar/logout'
+                %li= link_to t(:log_out, user: current_user), '/registrar/logout'
-        / /.nav-collapse
+
-    / Begin page content
     .container
-      = render 'registrar/shared/flash'
+      = render 'shared/flash'
       - if depp_controller?
         = render 'registrar/shared/epp_results'
-
       = yield
+
     %footer.footer
       .container
         %row

app/views/registrar/account_activities/index.haml

@@ -1,22 +1,17 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_billing), registrar_invoices_path, class: 'btn btn-default')
-    %h1.text-center-xs
+= render 'shared/title', name: t(:account_activity)
-      = t('account_activity')
-  .col-sm-6
-    %h1.text-right.text-center-xs
-      = link_to(t('back_to_billing'), registrar_invoices_path, class: 'btn btn-default')
 
-%hr
 .row
   .col-md-12
     .table-responsive
       %table.table.table-hover.table-condensed
         %thead
           %tr
-            %th{class: 'col-xs-5'}= t('description')
+            %th{class: 'col-xs-5'}= t(:description)
-            %th{class: 'col-xs-3'}= t('receipt_date')
+            %th{class: 'col-xs-3'}= t(:receipt_date)
-            %th{class: 'col-xs-2'}= t('invoice')
+            %th{class: 'col-xs-2'}= t(:invoice)
-            %th{class: 'col-xs-2'}= t('sum')
+            %th{class: 'col-xs-2'}= t(:sum)
         %tbody
           - @account_activities.each do |x|
             %tr

app/views/registrar/contacts/delete.haml

@@ -1,5 +1,5 @@
 - if @contact.persisted?
-  = render 'registrar/shared/title', name: "#{t(:delete)}: #{@contact.name}"
+  = render 'shared/title', name: "#{t(:delete)}: #{@contact.name}"
 
   = form_for(@contact, url: registrar_contact_path(@contact), 
     class: 'form-horizontal', multipart: true, method: :delete) do |f|

app/views/registrar/contacts/edit.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: "#{t(:edit)}: #{@contact.name}"
+= render 'shared/title', name: "#{t(:edit)}: #{@contact.name}"
 
 = form_for(@contact, url: registrar_contact_path(@contact), 
   html: {class: 'form-horizontal js-contact-form'}) do |f|

app/views/registrar/contacts/index.haml

@@ -1,6 +1,6 @@
 - content_for :actions do
   = link_to(t(:new), new_registrar_contact_path, class: 'btn btn-primary')
-= render 'registrar/shared/title', name: t(:contacts)
+= render 'shared/title', name: t(:contacts)
 
 - if @response
   .table-responsive

app/views/registrar/contacts/info_index.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:contacts_info)
+= render 'shared/title', name: t(:contacts_info)
 
 .row
   .col-md-12

app/views/registrar/contacts/new.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:new_contact)
+= render 'shared/title', name: t(:new_contact)
 
 = form_for(@contact, url: registrar_contacts_path, 
   html: {class: 'form-horizontal js-contact-form'}) do |f|

app/views/registrar/contacts/show.haml

@@ -2,7 +2,7 @@
   - content_for :actions do
     = link_to(t(:edit), edit_registrar_contact_path(@contact.id), class: 'btn btn-primary')
     = link_to(t(:delete), delete_registrar_contact_path(@contact.id), class: 'btn btn-default')
-  = render 'registrar/shared/title', name: truncate(@contact.name)
+  = render 'shared/title', name: @contact.name
 
   .row
     .col-md-6= render 'registrar/contacts/partials/general'

app/views/registrar/deposits/new.haml

@@ -1,12 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_billing), registrar_invoices_path, class: 'btn btn-default')
-    %h1.text-center-xs
+= render 'shared/title', name: t(:add_deposit)
-      = t(:add_deposit)
-  .col-sm-6
-    %h1.text-right.text-center-xs
-      = link_to(t('back_to_billing'), registrar_invoices_path, class: 'btn btn-default')
 
-%hr
 = form_for([:registrar, @deposit], method: :post) do |f|
   .row
     .col-md-4.col-md-offset-4

app/views/registrar/domains/check.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:check_domain)
+= render 'shared/title', name: t(:check_domain)
 
 .row
   .col-md-12

app/views/registrar/domains/check_index.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:check_domain)
+= render 'shared/title', name: t(:check_domain)
 
 .row
   .col-md-12

app/views/registrar/domains/delete.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: "#{t(:delete)}: #{params[:domain_name]}"
+= render 'shared/title', name: "#{t(:delete)}: #{params[:domain_name]}"
 
 = form_tag(destroy_registrar_domains_path, class: 'form-horizontal', multipart: true, method: :delete) do
   .col-md-8

app/views/registrar/domains/edit.haml

@@ -1,2 +1,3 @@
-= render 'registrar/shared/title', name: "#{t(:edit)}: #{params[:domain_name]}"
+= render 'shared/title', name: "#{t(:edit)}: #{params[:domain_name]}"
+
 = render 'form'

app/views/registrar/domains/index.haml

@@ -2,7 +2,7 @@
   = link_to(t(:new), new_registrar_domain_path, class: 'btn btn-primary')
   = link_to(t(:transfer), transfer_registrar_domains_path, class: 'btn btn-default')
   = link_to(t(:keyrelay), registrar_keyrelay_path, class: 'btn btn-default')
-= render 'registrar/shared/title', name: t(:domains)
+= render 'shared/title', name: t(:domains)
 
 .row
   .col-md-12{style: 'margin-bottom: -15px;'}

app/views/registrar/domains/info.haml

@@ -5,7 +5,7 @@
     class: 'btn btn-default') 
   = link_to(t(:delete), delete_registrar_domains_path(domain_name: params[:domain_name]), 
     class: 'btn btn-default')
-= render 'registrar/shared/title', name: truncate(@data.css('name').text)
+= render 'shared/title', name: truncate(@data.css('name').text)
 
 .row
   .col-sm-12

app/views/registrar/domains/new.haml

@@ -1,3 +1,3 @@
-= render 'registrar/shared/title', name: t(:new_domain)
+= render 'shared/title', name: t(:new_domain)
 
 = render 'form'

app/views/registrar/domains/renew.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:renew_domain)
+= render 'shared/title', name: t(:renew_domain)
 
 .row
   .col-md-8

app/views/registrar/domains/renew_index.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:renew_domain)
+= render 'shared/title', name: t(:renew_domain)
 
 .row
   .col-md-8

app/views/registrar/domains/transfer.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:transfer_domain)
+= render 'shared/title', name: t(:transfer_domain)
 
 .row
   .col-md-12

app/views/registrar/domains/transfer_index.haml

@@ -1,4 +1,4 @@
-= render 'registrar/shared/title', name: t(:transfer_domain)
+= render 'shared/title', name: t(:transfer_domain)
 
 .row
   .col-md-8

app/views/registrar/invoices/index.haml

@@ -1,16 +1,13 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:add_deposit), new_registrar_deposit_path, class: 'btn btn-primary')
-    %h1.text-center-xs
+  = link_to(t(:account_activity), registrar_account_activities_path, class: 'btn btn-default')
-      = t('your_account')
+= render 'shared/title', name: t(:your_account)
-  .col-sm-6
-    %h1.text-right.text-center-xs
-      = link_to(t('account_activity'), registrar_account_activities_path, class: 'btn btn-default')
-      = link_to(t('add_deposit'), new_registrar_deposit_path, class: 'btn btn-default')
 
-%hr
+= t(:your_current_account_balance_is, 
-= t('your_current_account_balance_is', balance: current_user.registrar.cash_account.balance, currency: current_user.registrar.cash_account.currency)
+  balance: current_user.registrar.cash_account.balance, 
+  currency: current_user.registrar.cash_account.currency)
 
-%h1= t('invoices')
+%h1= t(:invoices)
 %hr
 .row
   .col-md-12
@@ -18,18 +15,18 @@
       %table.table.table-hover.table-condensed
         %thead
           %tr
-            %th{class: 'col-xs-3'}= t('invoice')
+            %th{class: 'col-xs-3'}= t(:invoice)
-            %th{class: 'col-xs-3'}= t('receipt_date')
+            %th{class: 'col-xs-3'}= t(:receipt_date)
-            %th{class: 'col-xs-3'}= t('due_date')
+            %th{class: 'col-xs-3'}= t(:due_date)
-            %th{class: 'col-xs-3'}= t('total')
+            %th{class: 'col-xs-3'}= t(:total)
         %tbody
           - @invoices.each do |x|
             %tr
-              %td= link_to(t('invoice_no', no: x.id), [:registrar, x])
+              %td= link_to(t(:invoice_no, no: x.id), [:registrar, x])
               - if x.receipt_date
                 %td= l(x.receipt_date)
               - else
-                %td{class: 'text-danger'}= t('unpaid')
+                %td{class: 'text-danger'}= t(:unpaid)
               %td= l(x.due_date)
               %td= x.sum
 .row

app/views/registrar/invoices/show.haml

@@ -1,11 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back), :back, class: 'btn btn-default')
-    %h1.text-center-xs
+= render 'shared/title', name: t(:invoice_no, no: @invoice.id)
-      = t('invoice_no', no: @invoice.id)
+
-  .col-sm-6
-    %h1.text-right.text-center-xs
-      = link_to(t('back'), :back, class: 'btn btn-default')
-%hr
 .row
   .col-md-6= render 'registrar/invoices/partials/details'
 .row

app/views/registrar/keyrelays/show.haml

@@ -1,7 +1,5 @@
-.row
+= render 'shared/title', name: t(:keyrelay)
-  .col-sm-8
+
-    %h2.text-center-xs= t(:keyrelay)
-%hr
 .row
   .col-md-8
     = form_tag registrar_keyrelay_path, class: 'form-horizontal', method: :post, multipart: true do
@@ -52,4 +50,4 @@
 
       .form-group
         .col-md-10.text-right
-          %button.btn.btn-primary= t('upload_key')
+          %button.btn.btn-primary= t(:upload_key)

app/views/registrar/polls/show.haml

@@ -56,7 +56,7 @@
                 %dt= t('public_key')
                 %dd= @data.css('pubKey').text
 
-                = form_tag registrar_confirm_keyrelay_poll_path, class: 'js-keyrelay-form' do
+                = form_tag confirm_keyrelay_registrar_poll_path, class: 'js-keyrelay-form' do
                   = hidden_field_tag 'domain[name]', @data.css('name').text
                   = hidden_field_tag 'domain[dnskeys_attributes][0][flags]', @data.css('flags').text
                   = hidden_field_tag 'domain[dnskeys_attributes][0][protocol]', @data.css('protocol').text
@@ -65,7 +65,7 @@
 
               - else
                 - if @data.css('trnData trStatus').any? # this is a transfer request
-                  = form_tag registrar_confirm_transfer_poll_path, class: 'js-transfer-form' do
+                  = form_tag confirm_transfer_registrar_poll_path, class: 'js-transfer-form' do
                     = hidden_field_tag 'domain[name]', @data.css('name').text
 
                 - @data.css('trnData').children.each do |x|

app/views/registrar/sessions/login.haml

@@ -1,7 +1,8 @@
-.form-signin.text-center
+.row
-  %h2.form-signin-heading.text-center= t('log_in')
+  .form-signin.col-md-6.center-block.text-center
-  %hr
+    %h2.form-signin-heading.text-center= t(:log_in)
-    = link_to '/registrar/login/mid' do
+    %hr
-      = image_tag 'mid.gif'
+      = link_to '/registrar/login/mid' do
-    = link_to '/registrar/login/id' do
+        = image_tag 'mid.gif'
-      = image_tag 'id_card.gif'
+      = link_to '/registrar/login/id' do
+        = image_tag 'id_card.gif'

app/views/registrar/sessions/login_mid.haml

@@ -1,41 +1,38 @@
-.form-signin.text-center
+.row
-  %h2.form-signin-heading.text-center= t('log_in_with_mid')
+  .form-signin.col-md-4.center-block.text-center
-  %hr
+    %h2.form-signin-heading.text-center= t(:log_in_with_mid)
-  = link_to '/registrar/login/mid' do
+    %hr
-    = image_tag 'mid.gif'
+    = form_for @user, url: registrar_mid_path, html: {class: 'form-signin'} do |f|
-  = link_to '/registrar/login/id' do
+      = f.text_field :phone, class: 'form-control', placeholder: t(:phone_no), autocomplete: 'off'
-    = image_tag 'id_card.gif'
+      %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t(:log_in)
-  = form_for @user, url: registrar_mid_path, html: {class: 'form-signin'} do |f|
-    = f.text_field :phone, class: 'form-control', placeholder: t('phone_no'), autocomplete: 'off'
-    %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t('log_in')
 
-- if ['development', 'alpha'].include?(Rails.env)
+  - if ['development', 'alpha'].include?(Rails.env)
-  %div.text-center
+    %div.text-center
-    00007, 60000007, 00000766
+      00007, 60000007, 00000766
 
-:coffee
+  :coffee
-  $('.js-login').attr('disabled', false)
+    $('.js-login').attr('disabled', false)
 
-  status_interval = null
+    status_interval = null
-  mid_status = () ->
+    mid_status = () ->
-    status_interval = setInterval((->
+      status_interval = setInterval((->
-      $.post('/registrar/login/mid_status').fail((data) ->
+        $.post('/registrar/login/mid_status').fail((data) ->
-        clearInterval(status_interval)
+          clearInterval(status_interval)
+          flash_alert(data.responseJSON.message)
+          $('.js-login').attr('disabled', false)
+        )
+      ), 1000)
+
+    $('.js-login').on 'click', (e) ->
+      e.preventDefault();
+      $(this).attr('disabled', true)
+
+      $.post($('form').attr('action'), $('form').serialize()).done((data) ->
+        if data.message
+          flash_notice(data.message)
+          mid_status()
+      ).fail((data) ->
         flash_alert(data.responseJSON.message)
         $('.js-login').attr('disabled', false)
       )
-    ), 1000)
-
-  $('.js-login').on 'click', (e) ->
-    e.preventDefault();
-    $(this).attr('disabled', true)
-
-    $.post($('form').attr('action'), $('form').serialize()).done((data) ->
-      if data.message
-        flash_notice(data.message)
-        mid_status()
-    ).fail((data) ->
-      flash_alert(data.responseJSON.message)
-      $('.js-login').attr('disabled', false)
-    )
 

app/views/registrar/shared/_title.haml

@@ -1,11 +0,0 @@
-- content_for :window_title do
-  %title= name
-
-.row
-  .col-sm-6
-    %h1.text-center-xs
-      = truncate(name)
-  .col-sm-6
-    %h1.text-right.text-center-xs
-      = yield :actions
-%hr

app/views/registrar/xml_consoles/show.haml

@@ -1,11 +1,12 @@
-= render 'registrar/shared/title', name: t(:xml_console)
+= render 'shared/title', name: t(:xml_console)
+
 .row
   .col-md-8
     = form_tag(registrar_xml_console_path) do
       .form-group
         = text_area_tag(:payload, params[:payload], class: 'form-control', rows: 15, style: 'font-family:monospace; font-size: 11px;')
 
-      = button_tag t('send_epp_request'), class: 'btn btn-default'
+      = button_tag t(:send_epp_request), class: 'btn btn-default'
   .col-md-4
     %h4 Domain
     %a.js-load-xml{href: 'javascript:void(0)', data: {obj: 'domain', epp_action: 'create'}}

app/views/shared/_title.haml

@@ -0,0 +1,11 @@
+- content_for :head_title do
+  %title= "#{truncate(name, length: 60)}#{head_title_sufix}"
+
+.row
+  .col-sm-6
+    %h1.text-center-xs
+      = truncate(name, length: 35)
+  .col-sm-6
+    %h1.text-right.text-center-xs
+      = yield :actions
+%hr

config/application.rb

@@ -39,6 +39,7 @@ module Registry
 
     # Precompile additional assets
     config.assets.precompile += %w(*.svg *.eot *.woff *.ttf)
+    config.assets.precompile += %w(admin-manifest.css)
 
     # Active Record used to suppresses errors raised within
     # `after_rollback`/`after_commit` callbacks and only printed them to the logs.

config/locales/en.yml

@@ -718,3 +718,7 @@ en:
   invoice_was_not_found: 'Invoice was not found'
   invoice_is_already_binded: 'Invoice is already binded'
   invoice_and_transaction_sums_do_not_match: 'Invoice and transaction sums do not match'
+  registrar_head_title_sufix: ' - EIS Registrar'
+  admin_head_title_sufix: ' - Estonian Internet Foundation'
+  registrar_head_title: 'EIS Registrar'
+  admin_head_title: 'Estonian Internet Foundation'

spec/features/admin/admin_user_spec.rb

@@ -0,0 +1,51 @@
+require 'rails_helper'
+
+feature 'Admin users', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @admin_user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+  end
+
+  context 'as unknown user' do
+    it 'should redirect to login path' do
+      visit admin_admin_users_url
+      current_path.should == '/admin/login'
+    end
+
+    it 'should redirect to login path' do
+      visit admin_admin_user_url(@admin_user)
+      current_path.should == '/admin/login'
+    end
+
+    it 'should redirect to login path' do
+      visit edit_admin_admin_user_url(@admin_user)
+      current_path.should == '/admin/login'
+    end
+  end
+
+  context 'as logged in user' do
+    it 'should show index of contacts' do
+      sign_in @admin_user
+      visit admin_admin_users_url
+
+      current_path.should == '/admin/admin_users'
+      page.should have_content('API users')
+    end
+
+    it 'should show api user' do
+      sign_in @admin_user
+      visit admin_admin_user_url(@admin_user)
+
+      current_path.should == "/admin/admin_users/#{@admin_user.id}"
+    end
+
+    it 'should show api user' do
+      sign_in @admin_user
+      visit edit_admin_admin_user_url(@admin_user)
+
+      current_path.should == "/admin/admin_users/#{@admin_user.id}/edit"
+      page.should have_content("Edit: #{@admin_user.username}")
+    end
+  end
+end

spec/features/admin/api_user_spec.rb

@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+feature 'Api users', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @api_user = Fabricate(:api_user)
+  end
+
+  context 'as unknown user' do
+    it 'should redirect to login path' do
+      visit admin_api_users_url
+
+      current_path.should == '/admin/login'
+    end
+
+    it 'should redirect to login path' do
+      visit admin_api_user_url(@api_user)
+      
+      current_path.should == '/admin/login'
+    end
+
+  end
+
+  context 'as logged in user' do
+    it 'should show index of contacts' do
+      sign_in @user
+      visit admin_api_users_url
+
+      current_path.should == '/admin/api_users'
+      page.should have_content('API users')
+    end
+
+    it 'should show api user' do
+      sign_in @user
+      visit admin_api_user_url(@api_user)
+
+      current_path.should == "/admin/api_users/#{@api_user.id}"
+    end
+  end
+end

spec/features/admin/epp_log_spec.rb

@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+feature 'EPP log', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @contact = Fabricate(:contact, name: 'Mr John')
+  end
+
+  context 'as unknown user' do
+    it 'should redirect to login path' do
+      visit admin_epp_logs_url
+
+      current_path.should == '/admin/login'
+    end
+  end
+
+  context 'as logged in user' do
+    it 'should show index' do
+      sign_in @user
+      visit admin_epp_logs_url
+
+      page.should have_content('REPP logs')
+    end
+  end
+end

spec/features/admin/repp_log_spec.rb

@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+feature 'Repp log', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+  end
+
+  context 'as unknown user' do
+    it 'should redirect to login path' do
+      visit admin_repp_logs_url
+
+      current_path.should == '/admin/login'
+    end
+  end
+
+  context 'as logged in user' do
+    it 'should show index' do
+      sign_in @user
+      visit admin_repp_logs_url
+
+      page.should have_content('REPP logs')
+    end
+  end
+end

spec/features/admin/zonefile_setting_spec.rb

@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+feature 'Zonefile settings', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+  end
+
+  context 'as unknown user' do
+    it 'should redirect to login path' do
+      visit admin_zonefile_settings_url
+
+      current_path.should == '/admin/login'
+    end
+  end
+
+  context 'as logged in user' do
+    it 'should show index of contacts' do
+      sign_in @user
+      visit admin_zonefile_settings_url
+
+      page.should have_content('Zonefile settings')
+    end
+  end
+end

spec/models/contact_spec.rb

@@ -158,7 +158,7 @@ describe Contact do
       contact = @domain.contacts.first
       contact.save
 
-      contact.statuses.map(&:value).should == %w(ok linked)
+      contact.statuses.map(&:value).sort.should == %w(linked ok)
     end
 
     it 'should not have linked status when no domain' do
@@ -167,7 +167,7 @@ describe Contact do
       contact = @domain.contacts.first
       contact.save
 
-      contact.statuses.map(&:value).should == %w(ok linked)
+      contact.statuses.map(&:value).sort.should == %w(linked ok)
 
       contact.domains.first.destroy
       contact.reload