Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation

2017-05-22 18:43:49 +02:00
parent bf8651febc 6e71774504
commit 5e0d5fc8c3
177 changed files with 10710 additions and 125 deletions
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -22,6 +22,14 @@
                                  accesskey: "3" %>
      </li>
    <% end %>
+    <% if feature?(:legislation) %>
+      <li>
+        <%= layout_menu_link_to t("layouts.header.collaborative_legislation"),
+                                legislation_processes_path,
+                                controller.class.parent == Legislation,
+                                accesskey: "l" %>
+      </li>
+    <% end %>
    <% if feature?(:spending_proposals) %>
      <li>
        <%= layout_menu_link_to t("layouts.header.spending_proposals"),