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

Merge branch 'master' into budgets

Browse Source
This commit is contained in:
kikito
2016-12-27 14:02:12 +01:00
parent d8b2e703ca 4e1bb62654
commit 9d97421b0e
74 changed files with 1355 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/shared/_advanced_search.html.erb
View File

@@ -15,14 +15,14 @@
</div>
<div class="small-12 large-3 column">
<label><%= t("shared.advanced_search.author_type") %></label>
<label for="advanced_search_official_level"><%= t("shared.advanced_search.author_type") %></label>
<%= select_tag('advanced_search[official_level]', official_level_search_options,
include_blank: t("shared.advanced_search.author_type_blank")) %>
</div>
<div class="small-12 large-9">
<div class="small-12 large-4 column">
<label><%= t("shared.advanced_search.date") %></label>
<label for="js-advanced-search-date-min"><%= t("shared.advanced_search.date") %></label>
<%= select_tag('advanced_search[date_min]', date_range_options,
include_blank: t("shared.advanced_search.date_range_blank"),
id: 'js-advanced-search-date-min') %>
@@ -31,14 +31,18 @@
<div id='js-custom-date' class='small-12 large-8 column' style="display: none">
<div class="row">
<div class='small-12 large-6 column'>
<label><%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)</label>
<label for="advanced_search_date_min">
<%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)
</label>
<%= text_field_tag 'advanced_search[date_min]',
params[:advanced_search].try(:[], :date_min),
placeholder: t("shared.advanced_search.date_placeholder"),
class: 'js-calendar' %>
</div>
<div class='small-12 large-6 column'>
<label><%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)</label>
<label for="advanced_search_date_max">
<%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)
</label>
<%= text_field_tag 'advanced_search[date_max]',
params[:advanced_search].try(:[], :date_max),
placeholder: t("shared.advanced_search.date_placeholder"),

14
app/views/shared/_order_links.html.erb
View File

@@ -1,9 +1,11 @@
<div class="submenu">
<div class="no-bullet submenu">
<% @valid_orders.each do |order| %>
<%= link_to current_path_with_query_params(order: order, page: 1), class: order == @current_order ? 'active' : '' do %>
<%= content_tag(order == @current_order ? :h2 : :span) do %>
<%= t("#{i18n_namespace}.orders.#{order}") %>
<li class="inline-block">
<%= link_to current_path_with_query_params(order: order, page: 1), class: order == @current_order ? 'active' : '' do %>
<%= content_tag(order == @current_order ? :h2 : :span) do %>
<%= t("#{i18n_namespace}.orders.#{order}") %>
<% end %>
<% end %>
<% end %>
</li>
<% end %>
</div>
</ul>

28
app/views/shared/_subnavigation.html.erb
View File

@@ -2,22 +2,36 @@
<ul>
<% if feature?(:debates) %>
<li>
<%= link_to t("layouts.header.debates"), debates_path, class: ("active" if controller_name == "debates"), accesskey: "d" %>
<%= layout_menu_link_to t("layouts.header.debates"),
debates_path,
controller_name == 'debates',
accesskey: "d" %>
</li>
<% end %>
<li>
<%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if controller_name == "proposals"), accesskey: "p" %>
<%= layout_menu_link_to t("layouts.header.proposals"),
proposals_path,
controller_name == 'proposals',
accesskey: "p" %>
</li>
<li>
<%= link_to t("layouts.header.proposal_ballot"), proposal_ballots_path, class: ("active" if controller_name == "proposal_ballots"), accesskey: "v" %>
<%= layout_menu_link_to t("layouts.header.proposal_ballot"),
proposal_ballots_path,
controller_name == 'proposal_ballots',
accesskey: "v" %>
</li>
<% if feature?(:spending_proposals) %>
<li>
<%= link_to t("layouts.header.budgets"), budgets_path, class: ("active" if controller_name == "budgets"), accesskey: "s" %>
<%= layout_menu_link_to t("layouts.header.spending_proposals"),
spending_proposals_path,
controller_name == 'spending_proposals',
accesskey: "s" %>
</li>
<% end %>
<% if feature?(:budgets) %>
<li>
<%= link_to t("layouts.header.budgets"), budgets_path, class: ("active" if controller_name == "budgets"), accesskey: "b" %>
</li>
<% end %>
<li>
<%= link_to t("layouts.header.more_information"), page_path('more_information'), class: ("active" if current_page?("/more_information")), accesskey: "i" %>
</li>
</ul>
</div>

2
app/views/shared/_tags.html.erb
View File

@@ -1,7 +1,7 @@
<%- limit ||= nil %>
<% if taggable.tags.any? %>
<ul id="tags" class="no-bullet tags">
<ul id="tags_<%= dom_id(taggable) %>" class="no-bullet tags">
<% taggable.tag_list_with_limit(limit).each do |tag| %>
<li class="inline-block"><%= link_to sanitize(tag.name), send("#{taggable.class.name.underscore.pluralize}_path", search: tag.name) %></li>
<% end %>

22
app/views/shared/_top_links.html.erb
View File

@@ -2,8 +2,26 @@
<div class="row">
<%= render "shared/locale_switcher" %>
<ul class="no-bullet external-links">
<li class="inline-block"><%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|</li>
<li class="inline-block"><%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %></li>
<li class="inline-block">
<%= link_to t("layouts.header.more_information"),
page_path('more_information'),
class: ("selected" if current_page?("/more_information")),
accesskey: "i" %>
&nbsp;|
</li>
<li class="inline-block">
<%= link_to t("layouts.header.external_link_transparency"),
t("layouts.header.external_link_transparency_url"),
target: "_blank",
title: t('shared.target_blank_html') %>
&nbsp;|
</li>
<li class="inline-block">
<%= link_to t("layouts.header.external_link_opendata"),
t("layouts.header.external_link_opendata_url"),
target: "_blank",
title: t('shared.target_blank_html') %>
</li>
<% if setting['blog_url'] %>
<li class="inline-block">|&nbsp;
<%= link_to setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %>