Merge branch 'master' into polls

This commit is contained in:
Alberto
2017-04-06 14:16:49 +02:00
committed by GitHub
118 changed files with 1294 additions and 748 deletions

View File

@@ -3,23 +3,23 @@
<% if feature?(:debates) %>
<li>
<%= layout_menu_link_to t("layouts.header.debates"),
debates_path,
controller_name == 'debates',
accesskey: "d" %>
debates_path,
controller_name == 'debates',
accesskey: "1" %>
</li>
<% end %>
<li>
<%= layout_menu_link_to t("layouts.header.proposals"),
proposals_path,
controller_name == 'proposals',
accesskey: "p" %>
accesskey: "2" %>
</li>
<% if feature?(:polls) %>
<li>
<%= layout_menu_link_to t("layouts.header.poll_questions"),
polls_path,
controller_name == "polls",
accesskey: "v" %>
accesskey: "3" %>
</li>
<% end %>
<% if feature?(:spending_proposals) %>
@@ -35,8 +35,14 @@
<%= layout_menu_link_to t("layouts.header.budgets"),
budgets_path,
controller_name == "budgets" || controller_name == "investments",
accesskey: "b" %>
accesskey: "4" %>
</li>
<% end %>
<li>
<%= link_to t("layouts.header.more_info"),
more_info_path,
accesskey: "5",
class: ("active" if current_page?(more_info_path)) %>
</li>
</ul>
</div>