diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 97a0c18003ea6daedf31190ec395244a701cf5bd..c2c488bf17bb0e0724da814366a44b4d7b51368b 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,49 +1,63 @@
-<h2>Editar <%= resource_name.to_s.humanize %></h2>
-
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, multipart: true}) do |f| %>
<%= devise_error_messages! %>
-
- <div class="field">
- <%= f.label :name %><br/>
- <%= f.text_field :name, autofocus: true, required: true %>
- </div>
-
- <div class="field">
- <%= f.label :email %><br/>
- <%= f.email_field :email, autofocus: true %>
- </div>
-
- <div class="field">
- <%= f.label :avatar %><br/>
- <%= f.file_field :avatar %>
- </div>
-
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
- <% end %>
-
- <div class="field">
- <%= f.label :password, "Nova senha" %> <i>(deixe em branco caso não queira mudar a senha)</i><br/>
- <%= f.password_field :password, autocomplete: "off" %>
- </div>
-
- <div class="field">
- <%= f.label :password_confirmation %><br/>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
- </div>
-
- <div class="field">
- <%= f.label :current_password %> <i>(precisamos da sua senha atual para confirmar suas mudanças)</i><br/>
- <%= f.password_field :current_password, autocomplete: "off" %>
- </div>
-
- <div class="actions">
- <%= f.submit "Salvar" %>
+<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;' %><br/><%= f.file_field :avatar %>
+ </div>
+ <div class="col-md-10">
+ <div style="text-align:left">
+ <%= f.text_field :name, autofocus: true, required: true, style:"width:515px; height:60px;font-size:18pt;font-weight:bold; margin-bottom: 5px;" %>
+ <input type="text" size="55" 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:
+ <%= f.email_field :email, autofocus: true, style:"width:445px;" %>
+ <br/><br/>
+ <b>Alterar senha</b><br/>
+
+ <table style="margin: 20px auto;">
+ <tr>
+ <td>Senha atual:</td><td> <%= f.password_field :current_password, autocomplete: "off" ,style:"width:370px;" %></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> <div style="margin-bottom: 15px"> Nova senha:</div></td><td> <%= f.password_field :password, autocomplete: "off",style:"width:370px;" %></td>
+ </tr>
+ <tr>
+ <td> Confirmar senha:</td><td> <%= f.password_field :password_confirmation, autocomplete: "off" ,style:"width:370px;"%></td>
+ </tr>
+ </table>
+ <b>Conta</b><br/>
+ <div style="margin: 5px 5px;">
+ <%= link_to 'Deletar conta', search_path, style:'color: #FF3300;'%>
+ <!-- <%= button_to "Deletar conta", registration_path(resource_name), data: {confirm: "Are you sure?"}, method: :delete, style:'color: #FF3300;' %>
+ --></div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <%= link_to 'Cancelar',:back, class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #FF3300;' %>
+ <%= f.submit "Salvar",class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #1676bc;' %>
+ </div>
+ </div>
+ </div>
</div>
+ </div>
+</div>
<% end %>
-
-<h3>Excluir minha conta</h3>
-
-<p><%= button_to "Excluir", registration_path(resource_name), data: {confirm: "Você tem certeza?"}, method: :delete %></p>
-
-<%= link_to "Voltar", :back %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index c7395b8849ce3c3d97fd3004659194de5299745d..fe3d444de41b7cc9b1e52de9de517ada33b80035 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -7,36 +7,49 @@
<h2>Entrar</h2>
<br/>
<%= image_tag image_path('user-anon.png'), class: "logo" %><br/><br/>
- <table style="margin: 20px auto;">
- <tr>
- <td>Email:</td><td> </td>
- <td style=" padding: 10px;"><%= f.email_field :email, autofocus: true %></td>
- </tr>
- <tr>
- <td>Senha:</td><td> </td>
- <td><%= f.password_field :password, autocomplete: "off" %></td>
- </tr>
- <tr>
- <td></td><td></td>
- <td style="text-align: left;">
- <% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %>
- <%= f.label :remember_me %>
- <% end -%>
- <span class="pull-right"><%= link_to 'Esqueceu sua senha?', search_path, style:'color: #FF3300;' %></span></td>
- </tr>
- </table>
+ <form action="" method="">
+ <table style="margin: 20px auto;">
+ <tr>
+ <td>Email:</td><td> </td>
+ <td style=" padding: 10px;">
+ <%= f.email_field :email, autofocus: true , style:"width:375px;"%>
+ </td>
+ </tr>
+
+ <tr>
+ <td>Senha:</td><td> </td>
+ <td><%= f.password_field :password, autocomplete: "off", style:"width:375px;" %></td>
+ </tr>
+ <tr>
+ <td></td><td></td>
+ <td>
+ <span class="pull-right">
+ <% if devise_mapping.rememberable? -%>
+ <div class="field">
+ <%= f.check_box :remember_me %>
+ <%= f.label :remember_me %>
+ </div>
+ <% end -%>
+ <%= link_to "Esqueceu sua senha?", new_password_path(resource_name) , style:'color: #FF3300;' %>
+ </span></td>
+ </tr>
+ </table>
+ </form>
<br/>
<br/>
<div class="container-fluid">
<div class="col-md-offset-3 col-md-4">
<div class="col-md-7">
<span class="pull-right">Não possui conta?</span><br/>
- <span class="pull-right"><%= link_to 'Cadastre-se', search_path,style:'color: #1676bc;' %></span>
+ <span class="pull-right">
+ <%= link_to "Cadastre-se", new_registration_path(resource_name),style:'color: #1676bc;' %>
+ </span>
</div>
<div class=" col-md-3">
- <span class="pull-left"><%= f.submit "Entrar", class: "btn", style: ' width: 230px; color:white; background-color: #1676bc;' %></span>
+ <span class="pull-left">
+ <%= f.submit "Entrar", class: "btn", style: ' width: 230px; color:white; background-color: #1676bc;' %>
+ </span>
<br/>
</div>
</div>
diff --git a/app/views/welcome/account.html.erb b/app/views/welcome/account.html.erb
deleted file mode 100644
index 6b9a70affd78ae5798b804fb350fc7a9206f3937..0000000000000000000000000000000000000000
--- a/app/views/welcome/account.html.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-<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> <div style="margin-bottom: 15px"> Nova senha:</div></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 25px;"><%= 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: 'height: 35px; width: 130px; color:white; background-color: #FF3300;' %>
- <%= link_to 'Salvar', search_path, class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #1676bc;' %>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
diff --git a/app/views/welcome/add_file.html.erb b/app/views/welcome/add_file.html.erb
index ce941d7f0cb75123c9e0d3c354d36f98eccaa898..d7b64b59b66aa378834aa9d0555f34cd7b97b13e 100644
--- a/app/views/welcome/add_file.html.erb
+++ b/app/views/welcome/add_file.html.erb
@@ -15,20 +15,45 @@
<div class="white-input">
<div class="col-md-3">
- <%= image_tag image_path('user-anon.png'), class: "logo" %><br/>
+ <%= image_tag image_path('icons/square.png'), style:"width:250px; height:150px;" %><br/>
<%= link_to 'editar foto', search_path,style:'color: #1676bc;' %>
</div>
<div class="col-md-9">
- <table style="margin: 20px auto;">
+ <table style="margin-left:0px;">
<tr>
- <td>TÃtulo do arquivo</td><td> <input type="password" size="35" placeholder="email"></td>
+ <td colspan="2">
+ <input type="text" size="70px" style="height:30px;font-size:14pt; margin-bottom: 10px;" placeholder="TÃtulo do arquivo">
+ </td>
</tr>
<tr>
- <td> <div style="margin-bottom: 15px"> Descrição</div></td><td> <input type="password" size="35" placeholder="email"></td>
+ <td colspan="2">
+ <input type="text" size="70px" style="height:65px;font-size:14pt; margin-bottom: 10px;" placeholder="Descrição">
+ <br/>
+ </td>
</tr>
<tr>
- <td> Confirmar senha:</td><td> <input type="password" size="35" placeholder="email"></td>
+ <td colspan="2"> <input type="text" size="70px" style="height:30px;font-size:14pt; margin-bottom: 10px;" placeholder="Assunto"></td>
+ </tr>
+ <tr>
+ <td>
+ <select style="width: 345px; margin-left:8px">
+ <option value="">NÃvel</option>
+ <option value="">..</option>
+ </select>
+
+ </td>
+ <td>
+ <select style="width: 345px;">
+ <option value="">Adicionar à coleção</option>
+ <option value="">..</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <div class=" pull-right"> <%= button_to "Remover", new_user_registration_path,class: "btn btn-danger", style: 'margin-top: 15px; width: 130px; background-color: #FF2134;'%></div>
+ </td>
</tr>
</table>
@@ -37,6 +62,16 @@
</div>
</div>
</div>
+ <div class="col-md-12">
+ <div class="container-fluid" >
+ <div class="pull-right">
+ <input type="checkbox" > Li e concordo com os <%= link_to 'termos e condições', search_path, style:'color: #1676bc;' %> de upload e copyright<br/><br/>
+ <div class="pull-left"><div style= 'margin-left:130px;'><%= link_to 'Cancelar', search_path %></div></div>
+ <div class="pull-right"><%= button_to "Salvar", search_path,class: "btn pull-right", style: 'margin-top: -10px; width: 230px; color:white; background-color: #1676bc;'%></div>
+
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/config/routes.rb b/config/routes.rb
index ff758ad21852acb4adb7c70f70ae81204c029b6b..a5950c90d506ba86dee06764f5eaa302e7ecbdb0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -49,7 +49,6 @@ Rails.application.routes.draw do
get '/search/fetch' => 'search#fetch', as: 'search_fetch'
get '/subject/:id' => 'welcome#subject', as:'subject_index'
get '/collection' => 'welcome#collection'
- get '/account' => 'welcome#account'
get '/add_file' => 'welcome#add_file'
get '/signup' => 'welcome#signup'
get '/follow_collection' => 'welcome#follow_collection'