Create instance_statistics namespace and move convdev index and cohorts to it

3 files changed, 41 insertions, 2 deletions

diff --git a/app/views/layouts/instance_statistics.html.haml b/app/views/layouts/instance_statistics.html.haml
new file mode 100644
index 00000000000..af39318b2ab
--- /dev/null
+++ b/app/views/layouts/instance_statistics.html.haml
@@ -0,0 +1,6 @@
+- page_title    "Instance Statistics"
+- header_title  "Instance Statistics", instance_statistics_root_path
+- nav "instance_statistics"
+- @left_sidebar = true
+
+= render template: "layouts/application"
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index 0047efa363d..302de31a6d4 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -48,11 +48,11 @@
               %span
                 = _('Gitaly Servers')
           = nav_link path: 'cohorts#index' do
-            = link_to admin_cohorts_path, title: _('Cohorts') do
+            = link_to instance_statistics_cohorts_path, title: _('Cohorts') do
               %span
                 = _('Cohorts')
           = nav_link(controller: :conversational_development_index) do
-            = link_to admin_conversational_development_index_path, title: _('ConvDev Index') do
+            = link_to instance_statistics_conversational_development_index_index_path, title: _('ConvDev Index') do
               %span
                 = _('ConvDev Index')
 
diff --git a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml b/app/views/layouts/nav/sidebar/_instance_statistics.html.haml
new file mode 100644
index 00000000000..cb64c97f7b4
--- /dev/null
+++ b/app/views/layouts/nav/sidebar/_instance_statistics.html.haml
@@ -0,0 +1,33 @@
+.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
+  .nav-sidebar-inner-scroll
+    .context-header
+      = link_to instance_statistics_root_path, title: 'Instance Statistics' do
+        .avatar-container.s40.settings-avatar
+          = sprite_icon('chart', size: 24)
+        .sidebar-context-title Instance Statistics
+    %ul.sidebar-top-level-items
+      = nav_link(controller: :conversational_development_index) do
+        = link_to instance_statistics_conversational_development_index_index_path do
+          .nav-icon-container
+            = sprite_icon('comment')
+          %span.nav-item-name
+            = _('ConvDev Index')
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :conversational_development_index, html_options: { class: "fly-out-top-item" } ) do
+            = link_to instance_statistics_conversational_development_index_index_path do
+              %strong.fly-out-top-item-name
+                = _('ConvDev Index')
+
+      = nav_link(controller: :cohorts) do
+        = link_to instance_statistics_cohorts_path do
+          .nav-icon-container
+            = sprite_icon('users')
+          %span.nav-item-name
+            = _('Cohorts')
+        %ul.sidebar-sub-level-items.is-fly-out-only
+          = nav_link(controller: :cohorts, html_options: { class: "fly-out-top-item" } ) do
+            = link_to instance_statistics_cohorts_path do
+              %strong.fly-out-top-item-name
+                = _('Cohorts')
+
+    = render 'shared/sidebar_toggle_button'