Merge branch 'master' into improve-registrant-area

app/views/registrant/sessions/login.haml

@@ -1,11 +0,0 @@
-.row
-  .form-signin.col-md-6.center-block.text-center
-    %h2.form-signin-heading.text-center= t(:log_in)
-    %hr
-    .row
-      =t "only_estonian_residets_can_signin"
-    %br
-    = link_to '/registrant/login/mid' do
-      = image_tag 'mid.gif'
-    = link_to '/registrant/id', method: :post do
-      = image_tag 'id_card.gif'

app/views/registrant/sessions/login_mid.haml

@@ -1,12 +1,12 @@
 .row
   .form-signin.col-md-4.center-block.text-center
-    %h2.form-signin-heading.text-center= t(:log_in_with_mid)
+    %h2.form-signin-heading.text-center= t '.header'
     %hr
     = form_for @user, url: registrant_mid_path, auto_html5_validation: false, 
       html: {class: 'form-signin'} do |f|
       = f.text_field :phone, class: 'form-control', 
         placeholder: t(:phone_no), autocomplete: 'off', required: true
-      %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t(:log_in)
+      %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t '.submit_btn'
 
   - if ['development', 'alpha'].include?(Rails.env)
     %div.text-center

app/views/registrant/sessions/new.html.erb

@@ -0,0 +1,18 @@
+<div class="row">
+    <div class="form-signin col-md-6 center-block text-center">
+        <h2 class="form-signin-heading text-center">
+            <%= t '.header' %>
+        </h2>
+        <hr/>
+        <div class="row">
+            <%= t '.hint' %>
+        </div>
+        <br/>
+        <%= link_to '/registrant/login/mid' do %>
+            <%= image_tag 'mid.gif' %>
+        <% end %>
+        <%= link_to '/registrant/id', method: :post do %>
+            <%= image_tag 'id_card.gif' %>
+        <% end %>
+    </div>
+</div>