consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112 from AyuntamientoMadrid/devise_layout

Browse Source 
Devise layout
This commit is contained in:
Raimond Garcia
2015-08-07 09:19:32 +02:00
parent 8d36487cd0 beb05106cb
commit 3a70d6e2dd
8 changed files with 150 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/auth_bg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 115 KiB

BIN
app/assets/images/logo_madrid_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

40
app/assets/stylesheets/debates.scss
View File

@@ -673,14 +673,45 @@ header {
// 08.1. Login
// - - - - - - - - - - - -
.auth-page {
background: url('auth_bg.jpg');
margin-top: $line-height;
@media (min-width: 480px) {
margin-top: $line-height*2;
}
h1 {
a {
color: white;
font-family: 'Lato';
font-size: rem-calc(20);
font-weight: lighter;
line-height: $line-height*4;
padding-left: rem-calc(6);
span {
font-size: rem-calc(16);
font-weight: lighter;
vertical-align: top;
}
@media (min-width: 480px) {
font-size: rem-calc(30);
span {
font-size: rem-calc(20);
}
}
}
}
}
.auth {
background: $background;
box-shadow: 0px -4px 5px $background;
min-height: $line-height*20;
.panel {
background: white;
margin-top: $line-height*2;
h1 {
font-size: rem-calc(30);
@@ -725,7 +756,6 @@ form {
}
}
// 10. Alerts
// - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -755,5 +785,3 @@ form {
color: $alert-color;
}
}

10
app/controllers/application_controller.rb
View File

@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
respond_to :html
before_action :set_locale
layout :set_layout
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
@@ -22,8 +23,17 @@ class ApplicationController < ActionController::Base
I18n.locale = session[:locale]
end
def set_layout
if devise_controller?
"devise"
else
"application"
end
end
def verify_captcha?(resource)
return true unless recaptcha_keys?
verify_recaptcha(model: resource)
end
end

34
app/views/devise/confirmations/new.html.erb
View File

@@ -1,16 +1,24 @@
<h2><%= t("devise_views.confirmations.title") %></h2>
<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| %>
<%= devise_error_messages! %>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div class="field">
<%= f.label :email, t("devise_views.confirmations.email_label") %><br />
<%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
<div class="row">
<div class="small-12 columns">
<%= f.label :email, t("devise_views.confirmations.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.confirmations.email_label"), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
</div>
<div class="small-12 columns">
<%= f.submit(t("devise_views.confirmations.submit"), class: "button radius expand") %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
</div>
<div class="actions">
<%= f.submit(t("devise_views.confirmations.submit"), class: "button radius") %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>

44
app/views/devise/passwords/new.html.erb
View File

@@ -1,28 +1,22 @@
<div class="row-full auth">
<div class="row">
<div class="small-12 medium-8 large-8 column small-centered">
<div class="panel">
<h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
<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| %>
<%= devise_error_messages! %>
<div class="row">
<div class="small-12 column">
<%= f.label :email, t("devise_views.passwords.new.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %>
</div>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div class="small-12 column text-center">
<%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius expand" %>
</div>
</div>
<% end %>
<div class="row">
<div class="small-12 column">
<%= f.label :email, t("devise_views.passwords.new.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %>
</div>
</div>
<div class="row">
<div class="small-12 column text-center">
<%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius" %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
</div>
</div>
<%= render "devise/shared/links" %>
</div>
</div>
</div>

62
app/views/devise/sessions/new.html.erb
View File

@@ -1,42 +1,34 @@
<div class="row-full auth">
<div class="row">
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h1 class="text-center"><%= t("devise_views.sessions.new.title") %></h1>
<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.sessions.new.title") %></h1>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="row">
<div class="small-12 columns">
<%= f.label :email, t("devise_views.sessions.new.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %>
</div>
</div>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="row">
<div class="small-12 columns">
<%= f.label :email, t("devise_views.sessions.new.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %>
</div>
<div class="row">
<div class="small-12 columns">
<%= f.label :password, t("devise_views.sessions.new.password_label") %>
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
</div>
</div>
<div class="small-12 columns">
<%= f.label :password, t("devise_views.sessions.new.password_label") %>
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
</div>
<% if devise_mapping.rememberable? -%>
<div class="row">
<div class="small-12 columns">
<%= f.check_box :remember_me %>
<%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %>
</div>
</div>
<% end -%>
<div class="row">
<div class="small-12 columns">
<%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
<% if devise_mapping.rememberable? -%>
<div class="small-12 columns">
<%= f.check_box :remember_me %>
<%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %>
</div>
<% end -%>
<div class="small-12 columns">
<%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
</div>
</div>

39
app/views/layouts/devise.html.erb Normal file
View File

@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="es">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
<script src="https://www.google.com/recaptcha/api.js?hl=<%= I18n.locale %>"></script>
</head>
<body class="auth-page">
<% if notice %>
<p class="alert-box success"><%= notice %></p>
<% end %>
<% if alert %>
<p class="alert-box"><%= alert %></p>
<% end %>
<div class="row">
<div class="small-12 medium-8 large-5 column small-centered">
<h1>
<%= link_to root_path do %>
<%= image_tag('logo_madrid_white.png', class: 'left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> | <span><%= t("layouts.header.participation") %></span>
<% end %>
</h1>
</div>
</div>
<%= yield %>
</body>
</html>