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

improves styles displaying search results

Browse Source
This commit is contained in:
decabeza
2017-06-05 16:18:32 +02:00
parent 10d09686c3
commit f374478ddf
11 changed files with 98 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/layout.scss
View File

@@ -1106,10 +1106,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
// 09. Search // 09. Search
// ---------- // ----------
.search-results h2 {
margin-bottom: 0;
}
.advanced-search { .advanced-search {
float: left; float: left;
margin: $line-height 0; margin: $line-height 0;
@@ -1118,7 +1114,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
@include breakpoint(medium) { @include breakpoint(medium) {
float: right; float: right;
margin-bottom: 0; margin-bottom: 0;
margin-top: rem-calc(28); margin-top: $line-height/4;
position: absolute; position: absolute;
right: 0; right: 0;
z-index: 2; z-index: 2;
@@ -1126,7 +1122,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
} }
.advanced-search-form { .advanced-search-form {
margin-top: $line-height;
select { select {
height: $line-height*2; height: $line-height*2;

2
app/assets/stylesheets/print.css
View File

@@ -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; } .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; } .admin h2 { font-size: 20px !important; line-height: 20px !important; }
.select-order { .select-order {

38
app/views/budgets/investments/index.html.erb
View File

@@ -18,28 +18,36 @@
<%= render '/budgets/investments/header' %> <%= render '/budgets/investments/header' %>
<% end %> <% end %>
<div class="wrap row"> <% if params[:search].present? %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 column">
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @investments %>
<%= t("budgets.investments.index.search_results_html", count: @investments.size, search_term: params[:search]) %>
</p>
</div>
</div>
</div>
<% end %>
<div class="row">
<div id="budget-investments" class="budget-investments-list small-12 medium-9 column"> <div id="budget-investments" class="budget-investments-list small-12 medium-9 column">
<div class="small-12 search-results margin-bottom"> <% if @current_filter == "unfeasible" %>
<div class="small-12 margin-bottom">
<% if @current_filter == "unfeasible" %>
<h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2> <h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
<div class="callout primary margin"> <div class="callout primary margin">
<%= t("budgets.investments.index.unfeasible_text", <%= 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 %> definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %>
</div> </div>
<% else %> </div>
<%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %> <% elsif @heading.present? %>
<% end %> <div class="small-12 margin-bottom">
<h2><%= t("budgets.investments.index.by_heading", heading: @heading.name) %></h2>
<% if params[:search].present? %> </div>
<h2> <% end %>
<%= page_entries_info @investments %>
<%= t("budgets.investments.index.search_results", count: @investments.size, search_term: params[:search]) %>
</h2>
<% end %>
</div>
<%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %> <%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %>

40
app/views/debates/index.html.erb
View File

@@ -11,25 +11,33 @@
<main> <main>
<h1 class="sr-only"><%= t("shared.outline.debates") %></h1> <h1 class="sr-only"><%= t("shared.outline.debates") %></h1>
<% if @search_terms || @advanced_search_terms || @tag_filter %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 column">
<% if @search_terms || @advanced_search_terms %>
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @debates %>
<% if !@advanced_search_terms %>
<%= t("debates.index.search_results_html", count: @debates.size, search_term: @search_terms) %>
<% end %>
</p>
<% elsif @tag_filter %>
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</p>
<% end %>
</div>
</div>
</div>
<% end %>
<div class="row"> <div class="row">
<div id="debates" class="debates-list small-12 medium-9 column"> <div id="debates" class="debates-list small-12 medium-9 column">
<div class="small-12 search-results">
<% if @search_terms || @advanced_search_terms %>
<h2>
<%= page_entries_info @debates %>
<% if !@advanced_search_terms %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
<% end %>
</h2>
<% elsif @tag_filter %>
<h2>
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2>
<% end %>
</div>
<% if has_banners? %> <% if has_banners? %>
<%= render "shared/banner" %> <%= render "shared/banner" %>
<% end %> <% end %>

40
app/views/proposals/index.html.erb
View File

@@ -11,26 +11,34 @@
<main> <main>
<h1 class="sr-only"><%= t("shared.outline.proposals") %></h1> <h1 class="sr-only"><%= t("shared.outline.proposals") %></h1>
<div class="row"> <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
<div id="proposals" class="proposals-list small-12 medium-9 column"> <div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 search-results"> <div class="small-12 column">
<% if @search_terms || @advanced_search_terms %> <% if @search_terms || @advanced_search_terms %>
<h2> <h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @proposals %> <%= page_entries_info @proposals %>
<% if !@advanced_search_terms %> <% 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 %> <% end %>
</h2> <p>
<% elsif @tag_filter %> <% elsif @tag_filter %>
<h2> <h2><%= t("shared.search_results") %></h2>
<%= page_entries_info @proposals %> <p>
<%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> <%= page_entries_info @proposals %>
</h2> <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
<% elsif params[:retired].present? %> </p>
<h2><%= t("proposals.index.retired_proposals") %> <% elsif params[:retired].present? %>
<% end %> <h2><%= t("proposals.index.retired_proposals") %></h2>
<% end %>
</div>
</div> </div>
</div>
<% end %>
<div class="row">
<div id="proposals" class="proposals-list small-12 medium-9 column">
<% if has_banners? %> <% if has_banners? %>
<%= render "shared/banner" %> <%= render "shared/banner" %>

6
config/locales/budgets.en.yml
View File

@@ -54,9 +54,9 @@ en:
button: Search button: Search
placeholder: Search investment projects... placeholder: Search investment projects...
title: Search title: Search
search_results: search_results_html:
one: " containing the term '%{search_term}'" one: " containing the term <strong>'%{search_term}'</strong>"
other: " containing the term '%{search_term}'" other: " containing the term <strong>'%{search_term}'</strong>"
sidebar: sidebar:
my_ballot: My ballot my_ballot: My ballot
voted_html: voted_html:

6
config/locales/budgets.es.yml
View File

@@ -54,9 +54,9 @@ es:
button: Buscar button: Buscar
placeholder: Buscar propuestas de inversión... placeholder: Buscar propuestas de inversión...
title: Buscar title: Buscar
search_results: search_results_html:
one: " que contiene '%{search_term}'" one: " que contiene <strong>'%{search_term}'</strong>"
other: " que contienen '%{search_term}'" other: " que contienen <strong>'%{search_term}'</strong>"
sidebar: sidebar:
my_ballot: Mis votos my_ballot: Mis votos
voted_html: voted_html:

13
config/locales/en.yml
View File

@@ -104,9 +104,9 @@ en:
button: Search button: Search
placeholder: Search debates... placeholder: Search debates...
title: Search title: Search
search_results: search_results_html:
one: " containing the term '%{search_term}'" one: " containing the term <strong>'%{search_term}'</strong>"
other: " containing the term '%{search_term}'" other: " containing the term <strong>'%{search_term}'</strong>"
select_order: Order by select_order: Order by
start_debate: Start a debate start_debate: Start a debate
title: Debates title: Debates
@@ -330,9 +330,9 @@ en:
button: Search button: Search
placeholder: Search proposals... placeholder: Search proposals...
title: Search title: Search
search_results: search_results_html:
one: " containing the term '%{search_term}'" one: " containing the term <strong>'%{search_term}'</strong>"
other: " containing the term '%{search_term}'" other: " containing the term <strong>'%{search_term}'</strong>"
select_order: Order by select_order: Order by
select_order_long: 'You are viewing proposals according to:' select_order_long: 'You are viewing proposals according to:'
start_proposal: Create a proposal start_proposal: Create a proposal
@@ -470,6 +470,7 @@ en:
login_to_comment: 'You must %{signin} or %{signup} to leave a comment.' login_to_comment: 'You must %{signin} or %{signup} to leave a comment.'
"yes": "Yes" "yes": "Yes"
"no": "No" "no": "No"
search_results: "Search results"
advanced_search: advanced_search:
author_type: 'By author category' author_type: 'By author category'
author_type_blank: 'Select a category' author_type_blank: 'Select a category'

13
config/locales/es.yml
View File

@@ -104,9 +104,9 @@ es:
button: Buscar button: Buscar
placeholder: Buscar debates... placeholder: Buscar debates...
title: Buscar title: Buscar
search_results: search_results_html:
one: " que contiene '%{search_term}'" one: " que contiene <strong>'%{search_term}'</strong>"
other: " que contienen '%{search_term}'" other: " que contienen <strong>'%{search_term}'</strong>"
select_order: Ordenar por select_order: Ordenar por
start_debate: Empieza un debate start_debate: Empieza un debate
title: Debates title: Debates
@@ -330,9 +330,9 @@ es:
button: Buscar button: Buscar
placeholder: Buscar propuestas... placeholder: Buscar propuestas...
title: Buscar title: Buscar
search_results: search_results_html:
one: " que contiene '%{search_term}'" one: " que contiene <strong>'%{search_term}'</strong>"
other: " que contienen '%{search_term}'" other: " que contienen <strong>'%{search_term}'</strong>"
select_order: Ordenar por select_order: Ordenar por
select_order_long: Estas viendo las propuestas select_order_long: Estas viendo las propuestas
start_proposal: Crea una propuesta start_proposal: Crea una propuesta
@@ -470,6 +470,7 @@ es:
login_to_comment: 'Necesitas %{signin} o %{signup} para comentar.' login_to_comment: 'Necesitas %{signin} o %{signup} para comentar.'
"yes": "Sí" "yes": "Sí"
"no": "No" "no": "No"
search_results: "Resultados de búsqueda"
advanced_search: advanced_search:
author_type: 'Por categoría de autor' author_type: 'Por categoría de autor'
author_type_blank: 'Elige una categoría' author_type_blank: 'Elige una categoría'

6
config/locales/kaminari.en.yml
View File

@@ -7,11 +7,11 @@ en:
other: Entries other: Entries
zero: Entries zero: Entries
more_pages: more_pages:
display_entries: Displaying <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> %{entry_name} display_entries: Displaying <strong>%{first}&nbsp;-&nbsp;%{last}</strong> of <strong>%{total} %{entry_name}</strong>
one_page: one_page:
display_entries: display_entries:
one: There is <b>1</b> %{entry_name} one: There is <strong>1 %{entry_name}</strong>
other: There are <b> %{count}</b> %{entry_name} other: There are <strong>%{count} %{entry_name}</strong>
zero: "%{entry_name} cannot be found" zero: "%{entry_name} cannot be found"
views: views:
pagination: pagination:

6
config/locales/kaminari.es.yml
View File

@@ -7,11 +7,11 @@ es:
other: entradas other: entradas
zero: entradas zero: entradas
more_pages: more_pages:
display_entries: Mostrando <b>%{first}&nbsp;-&nbsp;%{last}</b> de un total de <b>%{total}</b> %{entry_name} display_entries: Mostrando <strong>%{first}&nbsp;-&nbsp;%{last}</strong> de un total de <strong>%{total} %{entry_name}</strong>
one_page: one_page:
display_entries: display_entries:
one: Hay <b>1</b> %{entry_name} one: Hay <strong>1 %{entry_name}</strong>
other: Hay <b> %{count}</b> %{entry_name} other: Hay <strong>%{count} %{entry_name}</strong>
zero: No se han encontrado %{entry_name} zero: No se han encontrado %{entry_name}
views: views:
pagination: pagination: