Improves styles and texts for devise pages

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

@@ -1,6 +1,3 @@
-<div class="auth row">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h1 class="text-center"><%= t("devise_views.confirmations.title") %></h1>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
@@ -18,6 +15,3 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-    </div>
-  </div>
-</div>

app/views/devise/passwords/edit.html.erb

@@ -1,6 +1,3 @@
-<div class="row auth">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h1 class="text-center"><%= t("devise_views.passwords.edit.title") %></h1>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
@@ -24,7 +21,3 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-
-    </div>
-  </div>
-</div>

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

@@ -1,6 +1,3 @@
-<div class="row auth">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= render 'shared/errors', resource: resource %>
@@ -17,6 +14,3 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-    </div>
-  </div>
-</div>

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

@@ -1,10 +1,12 @@
-<div class="auth row">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h2><%= t("devise_views.sessions.new.title") %></h2>
 
 <%# render 'devise/omniauth_form' %>
 
+<p>
+  <%= t("devise_views.shared.links.signup",
+      signup_link: link_to(t("devise_views.shared.links.signup_link"), new_user_registration_path)).html_safe %>
+</p>
+
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="row">
     <div class="small-12 columns">
@@ -12,12 +14,16 @@
     </div>
 
     <div class="small-12 columns">
+      <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "right" %>
       <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
     </div>
 
     <% if devise_mapping.rememberable? -%>
       <div class="small-12 columns">
-              <%= f.check_box :remember_me, label: t("devise_views.sessions.new.remember_me") %>
+        <%= f.label :remember_me do %>
+          <%= f.check_box :remember_me, label: false %>
+          <span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span>
+        <% end %>
       </div>
     <% end -%>
 
@@ -28,6 +34,5 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-    </div>
+
-  </div>
+
-</div>

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

@@ -3,19 +3,19 @@
 	  <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %><br>
 	<% end -%>
 
-  <%- if devise_mapping.registerable? &&
+  <%#- if devise_mapping.registerable? &&
         controller_name != 'registrations' ||
         controller_path != 'users/registrations' %>
-	  <%= link_to t("devise_views.shared.links.signup"), new_user_registration_path %><br>
+	  <%#= link_to t("devise_views.shared.links.signup"), new_user_registration_path %><!-- <br> -->
-	<% end -%>
+	<%# end -%>
 
-  <%- if devise_mapping.registerable? && controller_name == 'registrations' && controller_path != 'organizations/registrations' %>
+  <%#- if devise_mapping.registerable? && controller_name == 'registrations' && controller_path != 'organizations/registrations' %>
-    <%= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %><br>
+    <%#= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %>
-  <% end -%>
+  <%# end -%>
 
-	<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+	<%#- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-	  <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %><br>
+	  <%#= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %><!-- <br> -->
-	<% end -%>
+	<%# end -%>
 
 	<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
 	  <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %><br>

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

@@ -1,6 +1,3 @@
-<div class="row auth">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h1 class="text-center"><%= t("devise_views.unlocks.new.title") %></h1>
 
 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
@@ -17,7 +14,3 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-
-    </div>
-  </div>
-</div>

app/views/layouts/devise.html.erb

@@ -14,24 +14,6 @@
 
   <body class="auth-page">
 
-    <% if notice %>
-      <div data-alert class="alert-box success alert-layout">
-        <a href="#" class="close">&times;</a>
-        <div class="row">
-          <%= notice %>
-        </div>
-      </div>
-    <% end %>
-
-    <% if alert %>
-      <div data-alert class="alert-box alert alert-layout">
-        <a href="#" class="close">&times;</a>
-        <div class="row">
-          <%= alert %>
-        </div>
-      </div>
-    <% end %>
-
     <div class="row">
       <div class="small-12 medium-8 large-5 column small-centered">
         <h1>
@@ -42,7 +24,27 @@
       </div>
     </div>
 
+    <div class="row auth">
+    <div class="small-12 medium-8 large-5 column small-centered">
+      <div class="panel">
+        <% if notice %>
+          <div data-alert class="alert-box radius success">
+            <a href="#" class="close">&times;</a>
+              <%= notice %>
+          </div>
+        <% end %>
+
+        <% if alert %>
+          <div data-alert class="alert-box radius warning">
+            <a href="#" class="close">&times;</a>
+              <%= alert %>
+          </div>
+        <% end %>
+
         <%= yield %>
 
+      </div>
+    </div>
+  </div>
   </body>
 </html>

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

@@ -1,6 +1,3 @@
-<div class="auth row">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h2><%= t("devise_views.organizations.registrations.new.title") %></h2>
 
  <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %>
@@ -25,12 +22,18 @@
 
       <%= f.simple_captcha input_html: {required: false} %>
 
+      <!-- Makes me work! -->
+      <%= f.label :remember_me do %>
+        <%= f.check_box :remember_me, label: false %>
+        <span class="checkbox">
+          <%= t("devise_views.users.registrations.new.terms",
+              terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", target: "_blank")).html_safe %></span>
+      <% end %>
+      <!-- /. Makes me work! -->
+
       <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button radius expand" %>
     </div>
   </div>
 <% end %>
 
 <%= render "devise/shared/links" %>
-    </div>
-  </div>
-</div>

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

@@ -1,6 +1,3 @@
-<div class="auth row">
-  <div class="small-12 medium-8 large-5 column small-centered">
-    <div class="panel">
 <h2><%= t("devise_views.users.registrations.new.title") %></h2>
 
 <%# render 'devise/omniauth_form' %>
@@ -8,8 +5,10 @@
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= render 'shared/errors', resource: resource %>
 
-        <%= link_to t("devise_views.users.registrations.new.organization_signup"), new_organization_registration_path %><br>
+  <p>
-        <br>
+    <%= t("devise_views.users.registrations.new.organization_signup",
+        signup_link: link_to(t("devise_views.users.registrations.new.organization_signup_link"), new_organization_registration_path)).html_safe %>
+  </p>
 
   <div class="row">
     <div class="small-12 column">
@@ -29,12 +28,18 @@
 
       <%= f.simple_captcha input_html: {required: false} %>
 
+      <!-- Makes me work! -->
+      <%= f.label :remember_me do %>
+        <%= f.check_box :remember_me, label: false %>
+        <span class="checkbox">
+          <%= t("devise_views.users.registrations.new.terms",
+              terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", target: "_blank")).html_safe %></span>
+      <% end %>
+      <!-- /. Makes me work! -->
+
       <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
     </div>
   </div>
 <% end %>
 
 <%= render "devise/shared/links" %>
-    </div>
-  </div>
-</div>

config/locales/devise_views.en.yml

@@ -59,7 +59,10 @@ en:
           password_label: "Password"
           password_confirmation_label: "Confirm password"
           submit: "Sign up"
-          organization_signup: "Do you represent an organization / group? Enter here"
+          organization_signup: "Do you represent an organization / group? %{signup_link}"
+          organization_signup_link: "Sign up here"
+          terms: "To sign up in this site your accept the %{terms}"
+          terms_link: "terms of use"
     organizations:
       registrations:
         new:
@@ -92,7 +95,8 @@ en:
     shared:
       links:
         login: "Log in"
-        signup: "Sign up"
+        signup: "Don't have an account? %{signup_link}"
+        signup_link: "Sign up"
         signin_with_provider: "Sign in with %{provider}"
         organization_signup: "Sign up as an organization / collective"
         new_password: "Forgot your password?"

config/locales/devise_views.es.yml

@@ -59,7 +59,10 @@ es:
           password_label: "Contraseña"
           password_confirmation_label: "Confirmar contraseña"
           submit: "Registrarse"
-          organization_signup: "¿Representas a una organización / colectivo? Entra aquí"
+          organization_signup: "¿Representas a una organización / colectivo? %{signup_link}"
+          organization_signup_link: "Regístrate aquí"
+          terms: "Al registrarte aceptas las %{terms}"
+          terms_link: "condiciones de uso"
     organizations:
       registrations:
         new:
@@ -92,7 +95,8 @@ es:
     shared:
       links:
         login: "Entrar"
-        signup: "Registrarse"
+        signup: "¿No tienes una cuenta? %{signup_link}"
+        signup_link: "Regístrate"
         organization_signup: "Registro para organizaciones / colectivos"
         signin_with_provider: "Entrar con %{provider}"
         new_password: "¿Olvidaste tu contraseña?"