Merge branch 'master' into legislation-module-stable

2017-01-11 22:54:41 +01:00
parent f7aca52706 6952e7eac6
commit a2a61341fe
235 changed files with 9717 additions and 656 deletions
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -35,6 +35,14 @@
      </li>
    <% end %>

+    <% if feature?(:budgets) %>
+      <li <%= "class=active" if controller_name == "budgets" %>>
+        <%= link_to admin_budgets_path do %>
+          <span class="icon-budget"></span><%= t("admin.menu.budgets") %>
+        <% end %>
+      </li>
+    <% end %>
+
    <% if feature?(:signature_sheets) %>
      <li <%= "class=active" if controller_name == "signature_sheets" %>>
        <%= link_to admin_signature_sheets_path do %>