diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7f8379919..d25b7d1e0 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1106,10 +1106,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { // 09. Search // ---------- -.search-results h2 { - margin-bottom: 0; -} - .advanced-search { float: left; margin: $line-height 0; @@ -1118,7 +1114,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { @include breakpoint(medium) { float: right; margin-bottom: 0; - margin-top: rem-calc(28); + margin-top: $line-height/4; position: absolute; right: 0; z-index: 2; @@ -1126,7 +1122,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { } .advanced-search-form { - margin-top: $line-height; select { height: $line-height*2; diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index de5a56a31..6b3e5d6f6 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -42,8 +42,6 @@ input[type="submit"] { display: none !important; } .filters h2 { margin: 0 !important; font-size: 20px !important; line-height: 20px !important; width: auto !important; } -.search-results h2 { margin: 0 !important; font-size: 20px !important; line-height: 20px !important; } - .admin h2 { font-size: 20px !important; line-height: 20px !important; } .select-order { diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index 4c6871826..4c96d3319 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -18,28 +18,36 @@ <%= render '/budgets/investments/header' %> <% end %> -
+ <% if params[:search].present? %> +
+
+
+

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @investments %> + <%= t("budgets.investments.index.search_results_html", count: @investments.size, search_term: params[:search]) %> +

+
+
+
+ <% end %> + +
-
- - <% if @current_filter == "unfeasible" %> + <% if @current_filter == "unfeasible" %> +

<%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %>

<%= t("budgets.investments.index.unfeasible_text", definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %>
- <% else %> - <%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %> - <% end %> - - <% if params[:search].present? %> -

- <%= page_entries_info @investments %> - <%= t("budgets.investments.index.search_results", count: @investments.size, search_term: params[:search]) %> -

- <% end %> -
+
+ <% elsif @heading.present? %> +
+

<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>

+
+ <% end %> <%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %> diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index b7796f0ba..a92735c2d 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -11,25 +11,33 @@

<%= t("shared.outline.debates") %>

+ <% if @search_terms || @advanced_search_terms || @tag_filter %> +
+
+
+ <% if @search_terms || @advanced_search_terms %> +

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @debates %> + <% if !@advanced_search_terms %> + <%= t("debates.index.search_results_html", count: @debates.size, search_term: @search_terms) %> + <% end %> +

+ <% elsif @tag_filter %> +

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @debates %> + <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> +

+ <% end %> +
+
+
+ <% end %> +
-
- <% if @search_terms || @advanced_search_terms %> -

- <%= page_entries_info @debates %> - <% if !@advanced_search_terms %> - <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %> - <% end %> -

- <% elsif @tag_filter %> -

- <%= page_entries_info @debates %> - <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> -

- <% end %> -
- <% if has_banners? %> <%= render "shared/banner" %> <% end %> diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index fb31e9af0..65a02a9c1 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -11,26 +11,34 @@

<%= t("shared.outline.proposals") %>

-
-
- -
- <% if @search_terms || @advanced_search_terms %> -

+ <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %> +
+
+
+ <% if @search_terms || @advanced_search_terms %> +

<%= t("shared.search_results") %>

+

<%= page_entries_info @proposals %> <% if !@advanced_search_terms %> - <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %> + <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> <% end %> -

- <% elsif @tag_filter %> -

- <%= page_entries_info @proposals %> - <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> -

- <% elsif params[:retired].present? %> -

<%= t("proposals.index.retired_proposals") %> - <% end %> +

+ <% elsif @tag_filter %> +

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @proposals %> + <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> +

+ <% elsif params[:retired].present? %> +

<%= t("proposals.index.retired_proposals") %>

+ <% end %> +
+
+ <% end %> + +
+
<% if has_banners? %> <%= render "shared/banner" %> diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 6fba08534..8647b0c92 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -54,9 +54,9 @@ en: button: Search placeholder: Search investment projects... title: Search - search_results: - one: " containing the term '%{search_term}'" - other: " containing the term '%{search_term}'" + search_results_html: + one: " containing the term '%{search_term}'" + other: " containing the term '%{search_term}'" sidebar: my_ballot: My ballot voted_html: diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 1cb308472..f3acbe271 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -54,9 +54,9 @@ es: button: Buscar placeholder: Buscar propuestas de inversión... title: Buscar - search_results: - one: " que contiene '%{search_term}'" - other: " que contienen '%{search_term}'" + search_results_html: + one: " que contiene '%{search_term}'" + other: " que contienen '%{search_term}'" sidebar: my_ballot: Mis votos voted_html: diff --git a/config/locales/en.yml b/config/locales/en.yml index fdfd821bd..90b8ceadb 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -104,9 +104,9 @@ en: button: Search placeholder: Search debates... title: Search - search_results: - one: " containing the term '%{search_term}'" - other: " containing the term '%{search_term}'" + search_results_html: + one: " containing the term '%{search_term}'" + other: " containing the term '%{search_term}'" select_order: Order by start_debate: Start a debate title: Debates @@ -330,9 +330,9 @@ en: button: Search placeholder: Search proposals... title: Search - search_results: - one: " containing the term '%{search_term}'" - other: " containing the term '%{search_term}'" + search_results_html: + one: " containing the term '%{search_term}'" + other: " containing the term '%{search_term}'" select_order: Order by select_order_long: 'You are viewing proposals according to:' start_proposal: Create a proposal @@ -470,6 +470,7 @@ en: login_to_comment: 'You must %{signin} or %{signup} to leave a comment.' "yes": "Yes" "no": "No" + search_results: "Search results" advanced_search: author_type: 'By author category' author_type_blank: 'Select a category' diff --git a/config/locales/es.yml b/config/locales/es.yml index ca5b33a4e..4f38fc369 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -104,9 +104,9 @@ es: button: Buscar placeholder: Buscar debates... title: Buscar - search_results: - one: " que contiene '%{search_term}'" - other: " que contienen '%{search_term}'" + search_results_html: + one: " que contiene '%{search_term}'" + other: " que contienen '%{search_term}'" select_order: Ordenar por start_debate: Empieza un debate title: Debates @@ -330,9 +330,9 @@ es: button: Buscar placeholder: Buscar propuestas... title: Buscar - search_results: - one: " que contiene '%{search_term}'" - other: " que contienen '%{search_term}'" + search_results_html: + one: " que contiene '%{search_term}'" + other: " que contienen '%{search_term}'" select_order: Ordenar por select_order_long: Estas viendo las propuestas start_proposal: Crea una propuesta @@ -470,6 +470,7 @@ es: login_to_comment: 'Necesitas %{signin} o %{signup} para comentar.' "yes": "Sí" "no": "No" + search_results: "Resultados de búsqueda" advanced_search: author_type: 'Por categoría de autor' author_type_blank: 'Elige una categoría' diff --git a/config/locales/kaminari.en.yml b/config/locales/kaminari.en.yml index 35590c1ca..aa04df74c 100755 --- a/config/locales/kaminari.en.yml +++ b/config/locales/kaminari.en.yml @@ -7,11 +7,11 @@ en: other: Entries zero: Entries more_pages: - display_entries: Displaying %{first} - %{last} of %{total} %{entry_name} + display_entries: Displaying %{first} - %{last} of %{total} %{entry_name} one_page: display_entries: - one: There is 1 %{entry_name} - other: There are %{count} %{entry_name} + one: There is 1 %{entry_name} + other: There are %{count} %{entry_name} zero: "%{entry_name} cannot be found" views: pagination: diff --git a/config/locales/kaminari.es.yml b/config/locales/kaminari.es.yml index 7869cea2a..7cf5bf57e 100644 --- a/config/locales/kaminari.es.yml +++ b/config/locales/kaminari.es.yml @@ -7,11 +7,11 @@ es: other: entradas zero: entradas more_pages: - display_entries: Mostrando %{first} - %{last} de un total de %{total} %{entry_name} + display_entries: Mostrando %{first} - %{last} de un total de %{total} %{entry_name} one_page: display_entries: - one: Hay 1 %{entry_name} - other: Hay %{count} %{entry_name} + one: Hay 1 %{entry_name} + other: Hay %{count} %{entry_name} zero: No se han encontrado %{entry_name} views: pagination: