From 6cea37bdaebd79154f2be08a63a29513cfce708f Mon Sep 17 00:00:00 2001 From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br> Date: Fri, 23 Oct 2015 10:17:04 -0200 Subject: [PATCH] updated users/sign_up page --- .../javascripts/application/accessibility.js | 6 ++ app/assets/stylesheets/application.scss | 4 + app/assets/stylesheets/application/users.scss | 4 + app/views/devise/registrations/new.html.erb | 75 +++++++++++-------- app/views/devise/shared/_links.html.erb | 2 +- 5 files changed, 60 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js index c121b221f..6d9ac31c3 100644 --- a/app/assets/javascripts/application/accessibility.js +++ b/app/assets/javascripts/application/accessibility.js @@ -126,6 +126,12 @@ function readCookie(name) { return null; } +function HandleBrowseClick() +{ + var fileinput = document.getElementById("browse"); + fileinput.click(); +} + // define global variables var fontSize = fontSize(); var contrast = contrast(); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a90ea50c9..5c0f90174 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -508,3 +508,7 @@ input.chk { .white-input input{ border:none; } + +.add-picture{ + color:#1676bc; +} diff --git a/app/assets/stylesheets/application/users.scss b/app/assets/stylesheets/application/users.scss index 18506d84d..662334523 100644 --- a/app/assets/stylesheets/application/users.scss +++ b/app/assets/stylesheets/application/users.scss @@ -78,3 +78,7 @@ $background-grey: #e7e7e8; margin-top: 20px; padding: 20px; } + +.avatar_input { + display: none; +} diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index b8d0ffa2d..434b35b87 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,34 +1,49 @@ -<h2>Cadastrar</h2> - <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <%= devise_error_messages! %> +<div class="container"> + <div class="row"> + <div class="col-md-12"> + <div class="grey-panel"> + <div class="center_data"> + <h2 ><FONT COLOR="#343D3E" FACE="Arial">Cadastre-se</font></h2><br/> + <%= image_tag image_path("user-anon.png")%><br/> + <font> + <input type="file" id="browse" name="fileupload" style="display: none" /> + <%=link_to 'adicionar foto', '#', { :class=>"add-picture", :onclick=>"HandleBrowseClick()" }%> + </font><br/></br> - <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, :value => params[:email], required: true %> - </div> - - <div class="field"> - <%= f.label :password %> - <% if @minimum_password_length %> - <em>(<%= @minimum_password_length %> caracteres mÃnimos)</em> - <% end %><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="actions"> - <%= f.submit "Cadastrar" %> - </div> + <div class="col-md-10"> + <p style="line-height: 170%"><div class="col-md-10"><span class="pull-right">Nome: + <%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%></span></div><br/></p> + <p style="line-height: 15%"><br/></p> + <p style="line-height: 170%"><div class="col-md-10"><span class="pull-right">Email: + <%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %></span></div><br/></p> + <p style="line-height: 15%"><br/></p> + <p style="line-height: 170%"><div class="col-md-10"><span class="pull-right">Senha: + <%= f.password_field :password, autocomplete: "off", style:"width:335px;" %><br/> + <% if @minimum_password_length %> + <em>(<%= @minimum_password_length %> caracteres mÃnimos)</em> + <% end %><br/> + </span></div><br/></p> + <p style="line-height: 15%"><br/></p> + <p style="line-height: 170%"><div class="col-md-10"><span class="pull-right">Confirmar senha: + <%= f.password_field :password_confirmation, autocomplete: "off", style:"width:335px;" %></span></div><br/><br/></p> + </div> + <div class="container-fluid"> + <div class="col-md-offset-3 col-md-5"> + <div class="center_data"> + <div class="col-md-6"> + <br/><span class="pull-right">Já possui conta?</span><br/> + <span class="pull-right"><%= render "devise/shared/links"%></span> + </div> + <div class=" col-md-5"> + <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc" %></span><br/> + </div> + </div> + </div> + </div> + </div> + </div> + </div> +</div> <% end %> - -<%= render "devise/shared/links" %> diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index cd4f77afa..e66478680 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,5 +1,5 @@ <%- if controller_name != 'sessions' %> - <%= link_to "Entrar", new_session_path(resource_name) %><br /> + <%= link_to "Entre Aqui", new_session_path(resource_name) , {:style=>'color:#1676bc'} %><br /> <% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> -- GitLab