From 7732a6704c8f0871b943512008ffbfc9b711ca3e Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 25 May 2018 18:56:11 +0200 Subject: [PATCH] Adds styles and i18n for homepage --- app/assets/images/welcome_process.png | Bin 0 -> 2863 bytes app/assets/stylesheets/layout.scss | 85 +++++++++++++++++++++++--- app/helpers/feeds_helper.rb | 15 +++++ app/views/welcome/_card.html.erb | 2 +- app/views/welcome/_cards.html.erb | 2 + app/views/welcome/_feeds.html.erb | 50 ++++++++++++--- app/views/welcome/_header.html.erb | 1 + app/views/welcome/_processes.html.erb | 29 +++++++++ app/views/welcome/index.html.erb | 11 +++- config/locales/en/activerecord.yml | 2 +- config/locales/en/general.yml | 12 ++++ config/locales/es/activerecord.yml | 2 +- config/locales/es/general.yml | 12 ++++ 13 files changed, 203 insertions(+), 20 deletions(-) create mode 100644 app/assets/images/welcome_process.png create mode 100644 app/helpers/feeds_helper.rb create mode 100644 app/views/welcome/_processes.html.erb diff --git a/app/assets/images/welcome_process.png b/app/assets/images/welcome_process.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd74d2d29922c5607d669a803a8d6954ab50d76 GIT binary patch literal 2863 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 +
<%= link_to card.link_url do %>
<% if card.image.present? %> diff --git a/app/views/welcome/_cards.html.erb b/app/views/welcome/_cards.html.erb index 89596901d..15347f384 100644 --- a/app/views/welcome/_cards.html.erb +++ b/app/views/welcome/_cards.html.erb @@ -1,3 +1,5 @@ +

<%= t("welcome.cards.title") %>

+
<% @cards.all.each do |card| %> <%= render "card", card: card %> diff --git a/app/views/welcome/_feeds.html.erb b/app/views/welcome/_feeds.html.erb index 9c72efc43..8a0804705 100644 --- a/app/views/welcome/_feeds.html.erb +++ b/app/views/welcome/_feeds.html.erb @@ -1,14 +1,46 @@ -
-
- <% @feeds.each do |feed| %> +
+ <% @feeds.each do |feed| %> - Most active <%= feed.kind %> + <% if feed_proposals?(feed) %> +
+
+

<%= t("welcome.feed.most_active.#{feed.kind}") %>

- <% feed.items.each do |item| %> -
- <%= item.title %> + <% feed.items.each do |item| %> +
+
+ <% if feature?(:allow_images) && item.image.present? %> + <%= image_tag item.image_url(:thumb), + alt: item.image.title.unicode_normalize %> + <% end %> +
+
+ <%= link_to item.title, url_for(item) %>
+

<%= item.summary %>

+
+
+ <% end %> + + <%= link_to t("welcome.feed.see_all_proposals"), proposals_path, class: "float-right see-all" %>
- <% end %> +
<% end %> -
+ + <% if feed_debates?(feed) %> +
+
+

<%= t("welcome.feed.most_active.#{feed.kind}") %>

+ + <% feed.items.each do |item| %> +
+ <%= link_to item.title, url_for(item) %> +
+ <% end %> + + <%= link_to t("welcome.feed.see_all_debates"), debates_path, class: "float-right see-all" %> +
+
+ <% end %> + + <% end %>
diff --git a/app/views/welcome/_header.html.erb b/app/views/welcome/_header.html.erb index 3b49233bc..924eba262 100644 --- a/app/views/welcome/_header.html.erb +++ b/app/views/welcome/_header.html.erb @@ -18,4 +18,5 @@ <% end %>
+
<% end %> diff --git a/app/views/welcome/_processes.html.erb b/app/views/welcome/_processes.html.erb new file mode 100644 index 000000000..ea02baeb4 --- /dev/null +++ b/app/views/welcome/_processes.html.erb @@ -0,0 +1,29 @@ +
+ <% @feeds.each do |feed| %> + + <% if feed_processes?(feed) %> +
+
+

<%= t("welcome.feed.most_active.#{feed.kind}") %>

+ + <% feed.items.each do |item| %> + <%= link_to url_for(item) do %> +
+ <%= image_tag("welcome_process.png", alt: "") %> +
+ <%= t("welcome.feed.process_label") %>
+

<%= item.title %>

+
+
+

<%= item.summary %>

+

<%= t("welcome.feed.see_process") %>

+ <% end %> + <% end %> + + <%= link_to t("welcome.feed.see_all_processes"), legislation_processes_path, class: "float-right see-all" %> +
+
+ <% end %> + + <% end %> +
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 1bea29cf7..ab4148712 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -14,7 +14,16 @@
<%= render "feeds" %> - <%= render "cards" %> + +
+
+ <%= render "cards" %> +
+ +
+ <%= render "processes" %> +
+
<% if feature?("user.recommendations") && (@recommended_debates.present? || @recommended_proposals.present?) %> <%= render "recommended", diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 6bad6d150..8469d025d 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -246,7 +246,7 @@ en: from: From body: Email content widget/card: - label: Label + label: Label (optional) title: Title description: Description link_text: Link text diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index b307a1c77..8d485e023 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -784,6 +784,18 @@ en: one: "You can only support investment projects in %{count} district" other: "You can only support investment projects in %{count} districts" welcome: + feed: + most_active: + debates: "Most active debates" + proposals: "Most active proposals" + processes: "Open processes" + see_all_debates: See all debates + see_all_proposals: See all proposals + see_all_processes: See all processes + process_label: Process + see_process: See process + cards: + title: Featured recommended: title: Recommendations that may interest you help: "These recommendations are generated by the tags of the debates and proposals you are following." diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index e7e3c3761..564d48159 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -242,7 +242,7 @@ es: from: Enviado por body: Contenido del email widget/card: - label: Etiqueta + label: Etiqueta (opcional) title: Título description: Descripción link_text: Texto del enlace diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 4a3991b3f..fee56b4c9 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -783,6 +783,18 @@ es: one: "Sólo puedes apoyar proyectos de gasto de %{count} distrito" other: "Sólo puedes apoyar proyectos de gasto de %{count} distritos" welcome: + feed: + most_active: + debates: "Debates más activos" + proposals: "Propuestas más activas" + processes: "Procesos abiertos" + see_all_debates: Ver todos los debates + see_all_proposals: Ver todas las propuestas + see_all_processes: Ver todos los procesos + process_label: Proceso + see_process: Ver proceso + cards: + title: Destacados recommended: title: Recomendaciones que te pueden interesar help: "Estas recomendaciones se generan por las etiquetas de los debates y propuestas que estás siguiendo."