merged master into disable_rfcs

app/views/application/_navigation.html.slim

@@ -7,9 +7,11 @@
       ul.dropdown-menu role='menu'
         - if current_user.admin?
           li = link_to(t('breadcrumbs.dashboard.show'), admin_dashboard_path)
+          li = link_to(t('breadcrumbs.statistics.show'), statistics_path)
           li.divider
-        - models = [ExecutionEnvironment, Exercise, ExerciseCollection, ProxyExercise, Tag, Consumer, CodeHarborLink, UserExerciseFeedback,
-                ErrorTemplate, ErrorTemplateAttribute, ExternalUser, FileType, FileTemplate, InternalUser].sort_by {|model| model.model_name.human(count: 2) }
-        - models.each do |model|
-          - if policy(model).index?
-            li = link_to(model.model_name.human(count: 2), send(:"#{model.model_name.collection}_path"))
+        = render('navigation_submenu', title: t('activerecord.models.exercise.other'), models: [Exercise, ExerciseCollection, ProxyExercise, Tag], link: exercises_path)
+        = render('navigation_submenu', title: t('navigation.sections.users'), models: [InternalUser, ExternalUser])
+        = render('navigation_collection_link', model: ExecutionEnvironment)
+        = render('navigation_submenu', title: t('navigation.sections.errors'), models: [ErrorTemplate, ErrorTemplateAttribute])
+        = render('navigation_submenu', title: t('navigation.sections.files'), models: [FileType, FileTemplate])
+        = render('navigation_submenu', title: t('navigation.sections.integrations'), models: [Consumer, CodeHarborLink])

app/views/application/_navigation_collection_link.html.slim

@@ -0,0 +1,2 @@
+- if policy(model).index?
+  li = link_to(model.model_name.human(count: 2), send(:"#{model.model_name.collection}_path"))

app/views/application/_navigation_submenu.html.slim

@@ -0,0 +1,6 @@
+li.dropdown.dropdown-submenu
+  - link = link.nil? ? "#" : link
+  a href=link class="dropdown-toggle" data-toggle="dropdown" = title
+  ul class="dropdown-menu"
+    - models.each do |model|
+      = render('navigation_collection_link', model: model)