Merge pull request #1056 from AyuntamientoMadrid/welcome-page

removes closed processes from welcome page
AyuntamientoMadrid · Dec 14, 2017 · 43a9267 · 43a9267
2 parents 614345e + 64d9914
commit 43a9267
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 66 deletions.
diff --git a/app/assets/images/custom/welcome/citizenship.jpg b/app/assets/images/custom/welcome/citizenship.jpg
diff --git a/app/assets/images/custom/welcome/home_help.jpg b/app/assets/images/custom/welcome/home_help.jpg
diff --git a/app/assets/images/custom/welcome/proposals.jpg b/app/assets/images/custom/welcome/proposals.jpg
diff --git a/app/views/welcome/_cards.html.erb b/app/views/welcome/_cards.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="small-12 medium-6 column margin-bottom">
+  <div class="small-12 medium-4 column margin-bottom">
     <figure class="figure-card">
       <%= link_to t("welcome.proposals.url"), title: t("welcome.proposals.link") + t("shared.target_blank_html"), target: "_blank" do %>
         <%= image_tag "welcome/proposals.jpg", alt: t("welcome.proposals.alt") %>
@@ -17,46 +17,7 @@
     </p>
   </div>
 
-  <div class="small-12 medium-6 column margin-bottom">
-    <figure class="figure-card">
-      <%= link_to debate_legislation_process_url(34), title: t("welcome.citizenship.link") do %>
-        <%= image_tag "welcome/citizenship.jpg", alt: t("welcome.citizenship.alt") %>
-      <% end %>
-      <figcaption>
-        <%= link_to debate_legislation_process_url(34), title: t("welcome.citizenship.link") do %>
-          <span><%= t("welcome.citizenship.label") %></span><br>
-          <p class="title"><%= t("welcome.citizenship.title") %></p>
-        <% end %>
-      </figcaption>
-    </figure>
-    <p><%= t("welcome.citizenship.text") %></p>
-    <p>
-      <%= link_to t("welcome.citizenship.link"), debate_legislation_process_url(34) %>
-    </p>
-  </div>
-
-  <div class="small-12 medium-6 column margin-bottom end">
-    <figure class="figure-card">
-      <%= link_to debate_legislation_process_url(27), title: t("welcome.home_help.link") do %>
-        <%= image_tag "welcome/home_help.jpg", alt: t("welcome.home_help.alt") %>
-      <% end %>
-      <figcaption>
-        <%= link_to debate_legislation_process_url(27), title: t("welcome.home_help.link") do %>
-          <span><%= t("welcome.home_help.label") %></span><br>
-          <p class="title"><%= t("welcome.home_help.title") %></p>
-        <% end %>
-      </figcaption>
-    </figure>
-    <p><%= t("welcome.home_help.text") %></p>
-    <p>
-      <%= link_to t("welcome.home_help.link"), debate_legislation_process_url(27) %>
-    </p>
-  </div>
-
-</div>
-
-<div class="row">
-  <div class="small-12 medium-6 column margin-bottom">
+  <div class="small-12 medium-4 column margin-bottom">
     <figure class="figure-card">
       <%= link_to once_plazas_results_path, title: t("welcome.once_plazas.link") do %>
         <%= image_tag "welcome/once_plazas.jpg", alt: t("welcome.once_plazas.alt") %>
@@ -74,7 +35,7 @@
     </p>
   </div>
 
-  <div class="small-12 medium-6 column margin-bottom">
+  <div class="small-12 medium-4 column margin-bottom">
     <figure class="figure-card">
       <%= link_to root_url + "/system/budgets/2016/estado_propuestas_2016_b.xlsx", title: t("welcome.budgets.link") do %>
         <%= image_tag "welcome/budgets.jpg", alt: t("welcome.budgets.alt") %>

diff --git a/config/locales/custom/en/custom.yml b/config/locales/custom/en/custom.yml
@@ -170,18 +170,6 @@ en:
       title: "Do you have an idea to change Madrid?"
       text: "Madrid City Council will carry out your proposal if it reaches a citizen voting. You need 27,064 supports in Decide Madrid, the 1% of the population with the right to vote."
       button: "Create a proposal"
-    citizenship:
-      label: "Public consultation"
-      title: "New Regulation of Attention to Citizenship"
-      text: "Give your ideas for the new Regulation on Attention to Citizenship and e-Administration."
-      link: "Participate on new regulation of attention to citizenship"
-      alt: "Office of Attention to the Citizenship in Madrid"
-    home_help:
-      label: "Public consultation"
-      title: "New Home Help Service Ordinance"
-      text: "Participate to create a new ordinance that affects elderly, disabled, day centers and residences."
-      link: "Participate on new home help service ordinance"
-      alt: "Auxiliary helping an older person"
     proposals:
       label: "Proposals"
       title: "What is it and how to create a citizen proposal?"

diff --git a/config/locales/custom/es/custom.yml b/config/locales/custom/es/custom.yml
@@ -173,18 +173,6 @@ es:
       title: "¿Tienes una idea para cambiar Madrid?"
       text: "El Ayuntamiento de Madrid llevará a cabo tu propuesta si consigues que pase a votación ciudadana. Necesitas 27.064 apoyos en Decide Madrid, el 1% de la población con derecho a voto."
       button: "Crea una propuesta"
-    citizenship:
-      label: "Consulta pública"
-      title: "Nuevo Reglamento de Atención a la Ciudadanía"
-      text: "Aporta tus ideas para el nuevo Reglamento de Atención a la Ciudadanía y Administración Electrónica."
-      link: "Participa en el nuevo Reglamento de Atención a la Ciudadanía"
-      alt: "Oficina de Atención a la Ciudadanía en Madrid"
-    home_help:
-      label: "Consulta pública"
-      title: "Nueva Ordenanza del Servicio de Ayuda a Domicilio"
-      text: "Participa en la creación de una nueva ordenanza que afecta a personas mayores, con discapacidad, centros de día y residencias."
-      link: "Participa en la nueva ordenanza del servicio de ayuda a domicilio"
-      alt: "Auxiliar ayudando a una persona mayor"
     proposals:
       label: "Propuestas"
       title: "¿Qué es y cómo se crea una propuesta ciudadana?"