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

Merge branch 'master' into budget

Browse Source
This commit is contained in:
kikito
2016-11-28 11:41:49 +01:00
parent 9a2d45f25d e694b9c934
commit 2a2179d0f3
219 changed files with 3311 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,9 @@
<li>
<%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if 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" %>
</li>
<% if feature?(:spending_proposals) %>
<li>
<%= link_to t("layouts.header.budgets"), budgets_path, class: ("active" if controller_name == "budgets"), accesskey: "s" %>