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

Merge pull request #364 from AyuntamientoMadrid/error_pages

Browse Source 
Error pages
This commit is contained in:
Raimond Garcia
2015-09-05 00:49:53 +02:00
parent 0a33a64c93 83b44fd53a
commit 8c678c88e8
11 changed files with 70 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

30
app/assets/stylesheets/participacion.scss
View File

@@ -51,6 +51,7 @@
@media (min-width: $small-breakpoint) {
font-size: rem-calc(28);
span {
font-size: rem-calc(20);
}
@@ -405,8 +406,15 @@ header {
background: none;
}
.toggle-topbar a {
font-size: rem-calc(10);
.toggle-topbar {
a {
font-size: rem-calc(10);
}
&.menu-icon a {
padding: 0 rem-calc(24);
}
}
&.expanded .toggle-topbar a {
@@ -643,7 +651,7 @@ footer {
.tags {
a {
background: #f2f2f2;
background: $border;
border-radius: rem-calc(30);
color: #4d4d4d;
display: inline-block;
@@ -705,6 +713,14 @@ footer {
h1 {
@include logo;
a {
line-height: $line-height;
span {
vertical-align: middle;
}
}
}
}
@@ -1202,6 +1218,7 @@ table {
.page {
background: white;
min-height: rem-calc(480);
padding-bottom: rem-calc(48);
.menu {
@@ -1260,6 +1277,7 @@ table {
padding-bottom: rem-calc(12);
padding-left: rem-calc(36);
position: relative;
text-align: left;
span {
color: $text-medium;
@@ -1277,12 +1295,16 @@ table {
}
&:after {
content: 'c';
content: none;
color: $text-light;
font-family: "icons" !important;
position: absolute;
right: 0;
top: rem-calc(6);
@media (min-width: $small-breakpoint) {
content: 'c';
}
}
}
}

9
app/views/debates/_form.html.erb
View File

@@ -25,7 +25,12 @@
<div class="small-12 column">
<% if @debate.new_record? %>
<%= f.check_box :terms_of_service, label: t("form.accept_terms") %>
<%= f.label :terms_of_service do %>
<%= f.check_box :terms_of_service, label: false %>
<%= t("form.accept_terms",
policy: link_to(t("form.policy"), "/privacy", target: "blank"), conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe
%>
<% end %>
<% end %>
</div>
@@ -38,3 +43,5 @@
</div>
</div>
<% end %>

2
app/views/layouts/_admin_header.html.erb
View File

@@ -14,7 +14,7 @@
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> | <span><%= t("admin.dashboard.index.title") %></span>
<% end %>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span><%= t("layouts.header.menu") %></span></a></li>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
</ul>
<section class="top-bar-section">

2
app/views/layouts/_header.html.erb
View File

@@ -13,7 +13,7 @@
<div class="contain-to-grid clear">
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="toggle-topbar menu-icon"><a href="#"><span><%= t("layouts.header.menu") %></span></a></li>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
<li class="name">
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %>

3
app/views/layouts/devise.html.erb
View File

@@ -34,8 +34,7 @@
<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>
<%= image_tag("auth_logo.png", class: "left", size: "450x96", alt: t('layouts.header.logo')) %>
<% end %>
</h1>
</div>

2
app/views/pages/more_information.html.erb
View File

@@ -1,6 +1,6 @@
<div class="page row-full">
<div class="row">
<div class="more-information text small-12 medium-8">
<div class="more-information text small-12 medium-8 column">
<h1>Más información</h1>
<ul>
<a href="/how_it_works">

6
config/locales/en.yml
View File

@@ -10,8 +10,8 @@ en:
external_link_blog_url: "http://diario.madrid.es/participa/"
open_gov: "%{open} government"
open: "Open"
logo: "Open government | Participation"
participation: Participation
menu: Menu
open_city_title: "The city you want, it will be the city you want."
open_city_slogan:
"Start listening to Madrid.
@@ -56,7 +56,9 @@ en:
error: error
errors: errors
not_saved: "prohibited this %{resource} from being saved:"
accept_terms: "I accept the Privacy policy and the Terms of use"
accept_terms: "I accept the %{policy} and the %{conditions}"
policy: "Privacy policy"
conditions: "Terms of use"
user: account
debate: debate
verification::sms: phone

6
config/locales/es.yml
View File

@@ -10,8 +10,8 @@ es:
external_link_blog_url: "http://diario.madrid.es/participa/"
open_gov: "Gobierno %{open}"
open: "abierto"
logo: "Gobierno abierto | Participación"
participation: Participación
menu: Menú
open_city_title: "La ciudad que quieres será la ciudad que quieras."
open_city_slogan:
"Empecemos escuchando qué tiene que decir Madrid.
@@ -56,7 +56,9 @@ es:
error: error
errors: errores
not_saved: "impidieron guardar %{resource}:"
accept_terms: "Acepto la Política de privacidad y las Condiciones de uso"
accept_terms: "Acepto la %{policy} y las %{conditions}"
policy: "Política de privacidad"
conditions: "Condiciones de uso"
user: la cuenta
debate: el debate
verification::sms: el teléfono

57
public/404.html
View File

@@ -1,67 +1,34 @@
<!DOCTYPE html>
<html>
<head>
<title>The page you were looking for doesn't exist (404)</title>
<title>Error 404 | Not found</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<style>
body {
background-color: #EFEFEF;
background: #065687;
color: #2E2F30;
text-align: center;
font-family: arial, sans-serif;
margin: 0;
}
div.dialog {
width: 95%;
max-width: 33em;
margin: 4em auto 0;
}
div.dialog > div {
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
border-bottom-color: #BBB;
border-top: #B00100 solid 4px;
border-top-left-radius: 9px;
border-top-right-radius: 9px;
background-color: white;
padding: 7px 12% 0;
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
text-align: center;
}
h1 {
font-size: 100%;
color: #730E15;
line-height: 1.5em;
color: white;
font-size: 160px;
line-height: 160px;
margin-bottom: 0;
}
div.dialog > p {
margin: 0 0 1em;
padding: 1em;
background-color: #F7F7F7;
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
border-bottom-color: #999;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-top-color: #DADADA;
color: #666;
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
h2 {
color: white;
}
</style>
</head>
<body>
<!-- This file lives in public/404.html -->
<div class="dialog">
<div>
<h1>The page you were looking for doesn't exist.</h1>
<p>You may have mistyped the address or the page may have moved.</p>
</div>
<p>If you are the application owner check the logs for more information.</p>
<div>
<h1>404</h1>
<h2>Not found.</h2>
</div>
</body>
</html>

56
public/500.html
View File

@@ -1,66 +1,34 @@
<!DOCTYPE html>
<html>
<head>
<title>We're sorry, but something went wrong (500)</title>
<title>Error 500 | Internal server error</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<style>
body {
background-color: #EFEFEF;
background: #065687;
color: #2E2F30;
text-align: center;
font-family: arial, sans-serif;
margin: 0;
}
div.dialog {
width: 95%;
max-width: 33em;
margin: 4em auto 0;
}
div.dialog > div {
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
border-bottom-color: #BBB;
border-top: #B00100 solid 4px;
border-top-left-radius: 9px;
border-top-right-radius: 9px;
background-color: white;
padding: 7px 12% 0;
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
text-align: center;
}
h1 {
font-size: 100%;
color: #730E15;
line-height: 1.5em;
color: white;
font-size: 160px;
line-height: 160px;
margin-bottom: 0;
}
div.dialog > p {
margin: 0 0 1em;
padding: 1em;
background-color: #F7F7F7;
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
border-bottom-color: #999;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-top-color: #DADADA;
color: #666;
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
h2 {
color: white;
}
</style>
</head>
<body>
<!-- This file lives in public/500.html -->
<div class="dialog">
<div>
<h1>We're sorry, but something went wrong.</h1>
</div>
<p>If you are the application owner check the logs for more information.</p>
<div>
<h1>500</h1>
<h2>Internal server error.</h2>
</div>
</body>
</html>