From 7e065f069014baeaeaa095e88a61d36870b72bef Mon Sep 17 00:00:00 2001 From: jroers Date: Fri, 5 Feb 2016 14:44:56 -0800 Subject: [PATCH 1/3] Changed the placeholder values to be strings, No need for clownhats for 'Remember Me' Fixes #7 --- app/views/devise/sessions/new.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 7e46ab0ba..62416c63e 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -5,15 +5,15 @@ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.text_field :login, class: 'form-control', placeholder: t('.login'), autofocus: true %> + <%= f.text_field :login, class: 'form-control', placeholder: 'Login', autofocus: true %>
- <%= f.password_field :password, class: 'form-control', placeholder: t('.password'), autocomplete: 'off' %> + <%= f.password_field :password, class: 'form-control', placeholder: 'Password', autocomplete: 'off' %>
- <%= f.check_box :remember_me %> <%= t('.remember_me') %> + <%= f.check_box :remember_me %>Remember Me
From 95a4a07d60e2c16ae139e5cf5a7e4469c06979ab Mon Sep 17 00:00:00 2001 From: jroers Date: Fri, 5 Feb 2016 15:46:25 -0800 Subject: [PATCH 2/3] Followed the same interpolation structure as in the content_for :page_title helper --- app/views/devise/sessions/new.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 62416c63e..9116f345a 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -5,15 +5,15 @@ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.text_field :login, class: 'form-control', placeholder: 'Login', autofocus: true %> + <%= f.text_field :login, class: 'form-control', placeholder: "#{t('.login', :default => "Login")}", autofocus: true %>
- <%= f.password_field :password, class: 'form-control', placeholder: 'Password', autocomplete: 'off' %> + <%= f.password_field :password, class: 'form-control', placeholder: "#{t('.password', :default => "Password")}", autocomplete: 'off' %>
- <%= f.check_box :remember_me %>Remember Me + <%= f.check_box :remember_me %> <%= "#{t('.remember_me', :default => "Remember Me")}" %>
From 6a8f30c49eeab93e749505d2afd0044244ce003a Mon Sep 17 00:00:00 2001 From: jroers Date: Fri, 5 Feb 2016 20:09:14 -0800 Subject: [PATCH 3/3] Referenced I18n yml files' structure. NOTE: Remember Me does NOT have translations added --- app/views/devise/sessions/new.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 9116f345a..ef5049eea 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -5,15 +5,15 @@ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.text_field :login, class: 'form-control', placeholder: "#{t('.login', :default => "Login")}", autofocus: true %> + <%= f.text_field :login, class: 'form-control', placeholder: t('admin.users.form.login'), autofocus: true %>
- <%= f.password_field :password, class: 'form-control', placeholder: "#{t('.password', :default => "Password")}", autocomplete: 'off' %> + <%= f.password_field :password, class: 'form-control', placeholder: t('admin.users.form.password'), autocomplete: 'off' %>
- <%= f.check_box :remember_me %> <%= "#{t('.remember_me', :default => "Remember Me")}" %> + <%= f.check_box :remember_me %> <%= "#{t('admin.users.remember_me', :default => "Remember Me")}" %>