From 130d6f8e1c177a062f5a0cc568cd85e348a2d3b4 Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Fri, 26 Jan 2018 15:11:09 -0500
Subject: [PATCH] Update _sidebar.html.erb for tab display (#2134)

* Update _sidebar.html.erb

* Update I18n_test.rb
---
 app/views/dashboard/_sidebar.html.erb | 27 ++++-----------------------
 test/integration/I18n_test.rb         | 14 --------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/app/views/dashboard/_sidebar.html.erb b/app/views/dashboard/_sidebar.html.erb
index 60ef0b87ee..bb21322f52 100644
--- a/app/views/dashboard/_sidebar.html.erb
+++ b/app/views/dashboard/_sidebar.html.erb
@@ -1,24 +1,5 @@
-  <br />
+<br />
 
-  <ul class="nav nav-tabs">
-    <li class="active">
-      <a class="wikis-tab" href="#wiki" data-toggle="tab">
-        <span class="visible-xs"><i class="fa fa-book"></i></span>
-        <span class="hidden-xs"><%= t('dashboard._sidebar.wiki') %></span>
-      </a>
-    </li>
-    <li>
-      <a class="lists-tab" href="#lists" data-toggle="tab">
-        <span class="visible-xs"><i class="fa fa-comment"></i></span>
-        <span class="hidden-xs"><%= t('dashboard._sidebar.discussion_list') %></span>
-      </a>
-    </li>
-  </ul>
-
-  <div class="tab-content">
-
-    <div class="tab-pane active" id="wiki">
-      <%= render partial: "dashboard/wiki", locals: { wikis: @wikis } %>
-    </div>
-
-  </div>
+<div id="wiki">
+  <%= render partial: "dashboard/wiki", locals: { wikis: @wikis } %>
+</div>
diff --git a/test/integration/I18n_test.rb b/test/integration/I18n_test.rb
index 5c61032129..90d8c547ec 100644
--- a/test/integration/I18n_test.rb
+++ b/test/integration/I18n_test.rb
@@ -147,20 +147,6 @@ class I18nTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'should choose i18n for dashboard/_sidebar' do
-    available_testing_locales.each do |lang|
-      get '/change_locale/' + lang.to_s
-      follow_redirect!
-      post '/user_sessions', user_session: {
-        username: users(:jeff).username,
-        password: 'secretive'
-      }
-      follow_redirect!
-      get '/dashboard'
-      assert_select 'span', I18n.t('dashboard._sidebar.wiki')
-    end
-  end
-
   test 'should choose i18n for dashboard/_wiki' do
     available_testing_locales.each do |lang|
       get '/change_locale/' + lang.to_s