Registrar style fixes after style refactor

This commit is contained in:
Priit Tark 2015-04-16 17:12:14 +03:00
parent eeefe294b1
commit a395a73fa0
4 changed files with 43 additions and 82 deletions

View file

@ -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

View file

@ -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

View file

@ -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'

View file

@ -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)
)