Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00
parent 0e9cec2ca6 c918c9e081
commit 113f9b32d7
254 changed files with 10658 additions and 871 deletions
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -53,6 +53,7 @@
      </li>
    <% end %>

+
    <% if feature?(:polls) %>
      <li class="section-title">
        <a href="#">
@@ -79,6 +80,15 @@
      </li>
    <% end %>

+    <% if feature?(:budgets) %>
+      <li class="section-title" <%= "class=active" if controller_name == "budgets" %>>
+        <%= link_to admin_budgets_path do %>
+          <span class="icon-budget"></span>
+          <strong><%= t("admin.menu.budgets") %></strong>
+        <% end %>
+      </li>
+    <% end %>
+
    <li class="section-title">
      <a href="#">
        <span class="icon-organizations"></span>