Merge branch 'master' into redux-polling

2016-12-27 18:22:06 +01:00
parent 3ad648dd63 48fa7ab919
commit 5ec12e4b5b
235 changed files with 3445 additions and 1099 deletions
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -118,5 +118,13 @@
        </li>
      </ul>
    </li>
+
+    <% if feature?(:signature_sheets) %>
+      <li <%= "class=active" if controller_name == "signature_sheets" %>>
+        <%= link_to admin_signature_sheets_path do %>
+          <span class="icon-budget"></span><%= t("admin.menu.signature_sheets") %>
+        <% end %>
+      </li>
+    <% end %>
  </ul>
 </div>