From a395a73fa0acedf541887e014d73169d5c0b27dc Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 16 Apr 2015 17:12:14 +0300
Subject: [PATCH] Registrar style fixes after style refactor

---
 app/assets/stylesheets/app.sass               | 41 ------------
 .../stylesheets/shared/custom-boostrap.sass   |  4 ++
 app/views/registrar/sessions/login.haml       | 15 +++--
 app/views/registrar/sessions/login_mid.haml   | 65 +++++++++----------
 4 files changed, 43 insertions(+), 82 deletions(-)
 delete mode 100644 app/assets/stylesheets/app.sass

diff --git a/app/assets/stylesheets/app.sass b/app/assets/stylesheets/app.sass
deleted file mode 100644
index 0d4491263..000000000
--- a/app/assets/stylesheets/app.sass
+++ /dev/null
@@ -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
diff --git a/app/assets/stylesheets/shared/custom-boostrap.sass b/app/assets/stylesheets/shared/custom-boostrap.sass
index 8a7e2267d..4f19c1eb1 100644
--- a/app/assets/stylesheets/shared/custom-boostrap.sass
+++ b/app/assets/stylesheets/shared/custom-boostrap.sass
@@ -12,6 +12,10 @@ $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
 
diff --git a/app/views/registrar/sessions/login.haml b/app/views/registrar/sessions/login.haml
index 62611e87f..fa4ede5c6 100644
--- a/app/views/registrar/sessions/login.haml
+++ b/app/views/registrar/sessions/login.haml
@@ -1,7 +1,8 @@
-.form-signin.text-center
-  %h2.form-signin-heading.text-center= t('log_in')
-  %hr
-    = link_to '/registrar/login/mid' do
-      = image_tag 'mid.gif'
-    = link_to '/registrar/login/id' do
-      = image_tag 'id_card.gif'
+.row
+  .form-signin.col-md-6.center-block.text-center
+    %h2.form-signin-heading.text-center= t(:log_in)
+    %hr
+      = link_to '/registrar/login/mid' do
+        = image_tag 'mid.gif'
+      = link_to '/registrar/login/id' do
+        = image_tag 'id_card.gif'
diff --git a/app/views/registrar/sessions/login_mid.haml b/app/views/registrar/sessions/login_mid.haml
index 628c5b8c7..4a81ffa33 100644
--- a/app/views/registrar/sessions/login_mid.haml
+++ b/app/views/registrar/sessions/login_mid.haml
@@ -1,41 +1,38 @@
-.form-signin.text-center
-  %h2.form-signin-heading.text-center= t('log_in_with_mid')
-  %hr
-  = link_to '/registrar/login/mid' do
-    = image_tag 'mid.gif'
-  = link_to '/registrar/login/id' do
-    = image_tag 'id_card.gif'
-  = 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')
+.row
+  .form-signin.col-md-4.center-block.text-center
+    %h2.form-signin-heading.text-center= t(:log_in_with_mid)
+    %hr
+    = 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)
-  %div.text-center
-    00007, 60000007, 00000766
+  - if ['development', 'alpha'].include?(Rails.env)
+    %div.text-center
+      00007, 60000007, 00000766
 
-:coffee
-  $('.js-login').attr('disabled', false)
+  :coffee
+    $('.js-login').attr('disabled', false)
 
-  status_interval = null
-  mid_status = () ->
-    status_interval = setInterval((->
-      $.post('/registrar/login/mid_status').fail((data) ->
-        clearInterval(status_interval)
+    status_interval = null
+    mid_status = () ->
+      status_interval = setInterval((->
+        $.post('/registrar/login/mid_status').fail((data) ->
+          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)
-    )