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

removes provisional transparency page

Browse Source
This commit is contained in:
Juanjo Bazán
2015-12-03 12:51:51 +01:00
parent d5fad7cf44
commit 349288b992
11 changed files with 9 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/pages_controller.rb
View File

@@ -34,9 +34,6 @@ class PagesController < ApplicationController
def participation
end
def transparency
end
def proposals_info
end

6
app/helpers/application_helper.rb
View File

@@ -7,16 +7,12 @@ module ApplicationHelper
request.path == '/'
end
def transparency_page?
request.path == '/transparency'
end
def opendata_page?
request.path == '/opendata'
end
def header_css
home_page? || transparency_page? || opendata_page? ? '' : 'results'
home_page? || opendata_page? ? '' : 'results'
end
# if current path is /debates current_path_with_query_params(foo: 'bar') returns /debates?foo=bar

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

@@ -27,7 +27,7 @@
<div class="small-12 medium-4 column">
<h4>
<%= link_to t("layouts.footer.transparency_title"), "/transparency" %>
<%= link_to t("layouts.footer.transparency_title"), t("layouts.footer.transparency_url") %>
</h4>
<p><%= t("layouts.footer.transparency_text") %></p>
</div>

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

@@ -3,8 +3,8 @@
<div class="row">
<%= render "shared/locale_switcher" %>
<div class="external-links">
<%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/transparency") || current_page?("/opendata")) %>&nbsp;|
<%= link_to t("layouts.header.external_link_transparency"), "/transparency", class: ("selected" if current_page?("/transparency")) %>&nbsp;|
<%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
<%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|
<%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
&nbsp;|&nbsp;
<div class="social inline-block">
@@ -37,10 +37,7 @@
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '80x80', alt: t("layouts.header.logo")) %>
<% if transparency_page? %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
<span class="logo-site"><%= t("layouts.header.transparency") %></span>
<% elsif opendata_page? %>
<% if opendata_page? %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
<span class="logo-site"><%= t("layouts.header.open_data") %></span>
<% else %>
@@ -91,20 +88,6 @@
</div>
<% end %>
<% if transparency_page? %>
<div class="row home-page">
<div class="small-12 medium-7 column">
<h1><%= t("pages.transparency.title") %></h1>
<h2><%= t("pages.transparency.slogan_html") %></h2>
<%= link_to t("pages.transparency.go_old"), t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
</div>
<div class="show-for-medium-up small-12 medium-5 column text-center">
<i class="icon-debates icon-home-big"></i>
<i class="icon-debates icon-home-small"></i>
</div>
</div>
<% end %>
<% if opendata_page? %>
<div class="row home-page">
<div class="small-12 medium-7 column">

8
app/views/pages/transparency.html.erb
View File

@@ -1,8 +0,0 @@
<% provide :title do %><%= t('pages.titles.transparency') %><% end %>
<div class="page row-full">
<div class="row">
<div class="alert-box info radius text small-12 column">
<p><%= t('pages.while_unfinished_html') %></p>
</div>
</div>
</div>

4
config/locales/en.yml
View File

@@ -7,7 +7,7 @@ en:
header:
logo: "Madrid"
external_link_transparency: "Transparency"
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
external_link_transparency_url: "https://transparencia.madrid.es"
external_link_opendata: "Open data"
external_link_opendata_url: "http://datos.madrid.es"
external_link_blog: "Blog"
@@ -15,7 +15,6 @@ en:
open_gov: "Open government"
open: "open"
participation_html: "Madrid Decide"
transparency: "Transparency"
open_data: "Open data"
open_city_title: "Love the city, and it will become a city you love."
open_city_slogan_html:
@@ -41,6 +40,7 @@ en:
participation_title: "Participation"
participation_text: "Decide how to shape the Madrid you want to live in."
transparency_title: "Transparency"
transparency_url: "https://transparencia.madrid.es"
transparency_text: "Find out anything about the Madrid City Council."
open_data_title: "Open data"
open_data_text: "Every detail about the City Council is yours to access."

4
config/locales/es.yml
View File

@@ -7,7 +7,7 @@ es:
header:
logo: "Madrid"
external_link_transparency: "Transparencia"
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
external_link_transparency_url: "https://transparencia.madrid.es"
external_link_opendata: "Datos abiertos"
external_link_opendata_url: "http://datos.madrid.es"
external_link_blog: "Blog"
@@ -15,7 +15,6 @@ es:
open_gov: "Gobierno %{open}"
open: "abierto"
participation_html: "Madrid Decide"
transparency: "Transparencia"
open_data: "Datos abiertos"
open_city_title: "La ciudad que quieres será la ciudad que quieras."
open_city_slogan_html:
@@ -41,6 +40,7 @@ es:
participation_title: "Participación"
participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres."
transparency_title: "Transparencia"
transparency_url: "https://transparencia.madrid.es"
transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid."
open_data_title: "Datos Abiertos"
open_data_text: "Todos los datos del Ayuntamiento son tuyos."

5
config/locales/pages.en.yml
View File

@@ -3,7 +3,6 @@ en:
titles:
more_information: "More information"
privacy: "Privacy Policy"
transparency: "Transparency"
opendata: "Open Data"
conditions: "Terms of use"
accessibility: "Accessibility"
@@ -18,10 +17,6 @@ en:
By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files.
The data provided will be acquired and processed by the Directorate-General for Civil Participation in the file 'Management of Participatory Activities' mentioned previously in the terms and conditions of use for the Portal."
while_unfinished_html: 'While we finish, we encourage you to visit the <a href="/blog" target="_blank">Citizen Participation Area, Transparency and Open Government blog</a> to know about our progress and news; or the <a href="/">Citizen Participation section</a> where you can decide which is the city you want.'
transparency:
title: "Transparency"
slogan_html: "We are working on the new Madrid City Council Transparency Portal, so that there is absolutely nothing about the city council you can not see.<br>Meanwhile you can visit the actual Transparency Portal:"
go_old: "Go to Transparency Portal"
opendata:
title: "Open Data"
slogan_html: "We are working on the new Madrid City Council Open Data Portal, meanwhile you can visit the actual Open Data Portal:"

5
config/locales/pages.es.yml
View File

@@ -3,7 +3,6 @@ es:
titles:
more_information: "Más información"
privacy: "Política de Privacidad"
transparency: "Transparencia"
opendata: "Datos abiertos"
conditions: "Condiciones de uso"
accessibility: "Accesibilidad"
@@ -18,10 +17,6 @@ es:
Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros.
Los datos aportados serán incorporados y tratados por la Dirección General de Participación Ciudadana en el fichero 'Gestión de Procesos Participativos' indicado anteriormente en las condiciones de uso del portal."
while_unfinished_html: 'Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="/blog" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.'
transparency:
title: "Transparencia"
slogan_html: "Estamos trabajando en el nuevo Portal de Transparencia del Ayuntamiento de Madrid, para que no quede ni una esquina del Ayuntamiento que no puedas ver.<br>Por ahora puedes visitar el portal que existía hasta ahora:"
go_old: "Ir al Portal de Transparencia"
opendata:
title: "Datos abiertos"
slogan_html: "Estamos trabajando en el nuevo Portal de Datos Abiertos del Ayuntamiento de Madrid, por ahora puedes visitar el portal que existía hasta ahora:"

1
config/routes.rb
View File

@@ -269,7 +269,6 @@ Rails.application.routes.draw do
get "/more_information", to: "pages#more_information"
get "/opendata", to: "pages#opendata"
get "/participation", to: "pages#participation"
get "/transparency", to: "pages#transparency"
get "/proposals_info", to: "pages#proposals_info"
get "/participation_facts", to: "pages#participation_facts"
get "/participation_world", to: "pages#participation_world"

5
spec/controllers/pages_controller_spec.rb
View File

@@ -25,11 +25,6 @@ describe PagesController do
end
describe 'Provisional pages' do
it 'should include a transparency page' do
get :transparency
expect(response).to be_ok
end
it 'should include a opendata page' do
get :opendata
expect(response).to be_ok