Merge branch 'layoutnovo'

app/assets/stylesheets/application.scss

@@ -589,6 +589,16 @@ input.chk {
     position: relative;
     overflow: hidden;
 }
+
+.add-picture{
+  color:#1676bc;
+}
+
+ .btn-file {
+    position: relative;
+    overflow: hidden;
+}
+
 .btn-file input[type=file] {
     position: absolute;
     top: 0;
@@ -604,3 +614,8 @@ input.chk {
     cursor: inherit;
     display: block;
 }
+
+.style-cadastro{
+  font-color: #343D3E;
+  font: Arial;
+}

app/assets/stylesheets/application/users.scss

@@ -78,3 +78,7 @@ $background-grey: #e7e7e8;
   margin-top: 20px;
   padding: 20px;
 }
+
+.avatar_input {
+  display: none;
+}

app/views/devise/registrations/new.html.erb

-<h2>Cadastrar</h2>
-
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) 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, :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="container">
+ <div class="row">
+   <div class="col-md-12">
+     <div class="grey-panel">
+       <div class="center_data">
+         <div class="style-cadastro">
+           <h2>
+             <font>Cadastre-se</font>
+           </h2><br/>
+         </div>
+         <font>
+           <%= image_tag image_path("user-anon.png")%><br/>
+           <div class="btn-file">
+             <%=link_to 'adicionar foto', '#', { :class=>"add-picture"}%>
+             <%= f.file_field :avatar%>
+          </div>
+        </font><br/></br>
+         <div class="col-md-10">
+             <p style="line-height: 170%">
+               <div class="col-md-10">
+                 <span class="pull-right">Nome:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                 <%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%></span><br/>
+             </p>
+             <p style="line-height: 15%"><br/></p>
+             <p style="line-height: 170%">
+                 <span class="pull-right">Email:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                 <%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %></span><br/>
+            </p>
+             <p style="line-height: 15%"><br/></p>
+             <p style="line-height: 170%">
+                 <span class="pull-right">Senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                   <%= 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>
+            <br/></p></div>
+            <p style="line-height: 15%"><br/></p>
+            <p style="line-height: 170%">
+              <div class="col-md-10">
+                <span class="pull-right">Confirmar senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                 <%= 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" %>

app/views/devise/shared/_links.html.erb

 <%- if controller_name != 'sessions' %>
-  <%= link_to "Entrar", new_session_path(resource_name) %><br />
+  <%= link_to "Entre Aqui",  new_session_path(resource_name) , {:class=>'add-picture'} %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>