From a98b8aca1018efb91467fd3cf0e7118b9bfe6cf2 Mon Sep 17 00:00:00 2001
From: Ina <inaloena@gmail.com>
Date: Thu, 15 Oct 2015 11:45:21 -0300
Subject: [PATCH] login account footer
---
app/assets/stylesheets/application.scss | 4 ++
app/views/shared/application/_footer.html.erb | 7 +++
app/views/welcome/account.html.erb | 56 +++++++++++++++++++
app/views/welcome/login.html.erb | 12 ++--
config/routes.rb | 3 +-
5 files changed, 75 insertions(+), 7 deletions(-)
create mode 100644 app/views/welcome/account.html.erb
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f36ee52a3..1bb06b753 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -421,3 +421,7 @@ input.chk{
margin-top:5px;
margin-left:5px;
}
+
+.white-input input{
+ border:none;
+}
diff --git a/app/views/shared/application/_footer.html.erb b/app/views/shared/application/_footer.html.erb
index 41c2827a9..82c9066f9 100644
--- a/app/views/shared/application/_footer.html.erb
+++ b/app/views/shared/application/_footer.html.erb
@@ -1,4 +1,11 @@
<footer>
+ <div style="background-color: #1676bc;">
+
+ <%= link_to 'http://www.fnde.gov.br/' do %>
+ <%= image_tag 'logo.png', style: 'width: auto; height:200px; padding: 45px 40%;' %>
+ <% end %>
+
+ </div>
<div class="main" style="background-color: #E6E6E6;">
<div class="container" style="min-height: 200px;">
diff --git a/app/views/welcome/account.html.erb b/app/views/welcome/account.html.erb
new file mode 100644
index 000000000..e3bc9ae69
--- /dev/null
+++ b/app/views/welcome/account.html.erb
@@ -0,0 +1,56 @@
+<div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="grey-panel">
+ <div class="container-fluid">
+ <div class="col-md-8">
+
+ <div class="row">
+ <div class="white-input">
+ <div class="col-md-2">
+ <%= image_tag image_path('user-anon.png'), class: "logo" %><br/>
+ <%= link_to 'editar foto', search_path,style:'color: #1676bc;' %>
+ </div>
+ <div class="col-md-10">
+ <div style="text-align:left">
+ <input type="text" size="35px" style="height:60px;font-size:18pt;font-weight:bold; margin-bottom: 5px;" placeholder="Meu nome"><br/>
+ <input type="text" size="56" placeholder="Nome instituição">
+ </div>
+ <span class="pull-right"><input type="checkbox"> Conta de instituição</span><br/><br/>
+
+ <div style="text-align:left">
+ Email: <input type="text" size="45" placeholder="email"><br/><br/>
+ <b>Alterar senha</b><br/>
+
+ <table style="margin: 20px auto;">
+ <tr>
+ <td>Senha atual:</td><td> <input type="password" size="35" placeholder="email"></td>
+ </tr>
+ <tr>
+ <td colspan="2"><span class="pull-right"><div style="margin-bottom: 5px"><%= link_to 'Esqueci a senha', search_path, style:'color: #1676bc;'%></div></span></td>
+ </tr>
+ <tr>
+ <td> Nova senha:</td><td> <input type="password" size="35" placeholder="email"></td>
+ </tr>
+ <tr>
+ <td> Confirmar senha:</td><td> <input type="password" size="35" placeholder="email"></td>
+ </tr>
+ </table>
+
+ <b>Conta</b><br/>
+ <div style="margin: 5px 20px;"><%= link_to 'Deletar conta', search_path, style:'color: #FF3300;'%></div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <%= link_to 'Cancelar', search_path, class: "btn", style: ' width: 130px; color:white; background-color: #FF3300;' %>
+ <%= link_to 'Salvar', search_path, class: "btn", style: ' width: 130px; color:white; background-color: #1676bc;' %>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/app/views/welcome/login.html.erb b/app/views/welcome/login.html.erb
index ebe0498e0..05d42dc1a 100644
--- a/app/views/welcome/login.html.erb
+++ b/app/views/welcome/login.html.erb
@@ -1,7 +1,7 @@
<div class="container">
<div class="row">
<div class=" col-md-12">
-
+ <div class="white-input">
<div class="grey-panel">
<h2>Entrar</h2>
<br/>
@@ -11,17 +11,16 @@
<table style="margin: 20px auto;">
<tr>
<td>Email:</td><td> </td>
- <td><input type="text" placeholder="email"></td>
- </tr>
- <tr>
+ <td style=" padding: 10px;"><input type="text" size="40" placeholder="email"></td>
</tr>
+
<tr>
<td>Senha:</td><td> </td>
- <td><input type="text" placeholder="senha"></td>
+ <td><input type="text" size="40" placeholder="senha"></td>
</tr>
<tr>
<td></td><td></td>
- <td> <span class="pull-right"><%= link_to 'Esqueceu sua senha?', search_path %></span></td>
+ <td> <span class="pull-right"><%= link_to 'Esqueceu sua senha?', search_path, style:'color: #FF3300;' %></span></td>
</tr>
</table>
</form>
@@ -52,5 +51,6 @@
</div>
</div>
+ </div>
</div>
</div>
diff --git a/config/routes.rb b/config/routes.rb
index 87966b850..065b616dd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,5 +57,6 @@ Rails.application.routes.draw do
get '/search' => 'search#index', as: 'search'
get '/subject/:id' => 'welcome#subject', as:'subject_index'
get '/collection' => 'welcome#collection'
- get '/login' => 'welcome#login'
+ get '/login' => 'welcome#login'
+ get '/account' => 'welcome#account'
end
--
GitLab