From b8df477f0bbba865eef7f2476cc43fcbcdd21f5b Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam@sotk.co.uk>
Date: Thu, 1 Mar 2018 23:00:26 +0000
Subject: [PATCH] Reduce the number of items in the sidebar

This commit moves the "Profile" section underneath the logged-in user's
name in the top right, to have all user-related actions in the same
place. It also moves the license link onto the About page.

Change-Id: I20d0307e0fd8b1dc18295745031f229bb4a75aa5
---
 src/app/pages/template/about.html.tpl         | 15 ++++++++---
 src/app/profile/module.js                     |  3 ---
 src/app/profile/template/profile_submenu.html | 25 ------------------
 src/app/storyboard/template/header_menu.html  | 26 +++++++++++++++++++
 src/app/storyboard/template/side_menu.html    | 12 +--------
 src/theme/base/bootstrap/_navbar.scss         |  1 -
 6 files changed, 39 insertions(+), 43 deletions(-)
 delete mode 100644 src/app/profile/template/profile_submenu.html

diff --git a/src/app/pages/template/about.html.tpl b/src/app/pages/template/about.html.tpl
index 9d34ea82..ea6f2f08 100644
--- a/src/app/pages/template/about.html.tpl
+++ b/src/app/pages/template/about.html.tpl
@@ -68,12 +68,14 @@
             <hr class="visible-xs"/>
             <h4>Contributing</h4>
 
-            <p>StoryBoard is open source! If you would like to contribute to
+            <p>
+                StoryBoard is open source! If you would like to contribute to
                 the development of StoryBoard, you must follow the steps in the
                 <a href=" http://docs.openstack.org/infra/manual/developers.html"
                   target="_blank">
-                Developer's Guide
-            </a></p>
+                    Developer's Guide
+                </a>
+            </p>
 
             <p>Note that all bugs with StoryBoard's API should be filed in 
                 <a href="https://storyboard.openstack.org/#!/project/456"
@@ -88,6 +90,13 @@
                   Project README
             </a></p>
 
+            <p>
+                <a href="http://www.apache.org/licenses/LICENSE-2.0"
+                   target="_blank">
+                    Project license
+                </a>
+            </p>
+
 
             <hr/>
             <h4>Attribution</h4>
diff --git a/src/app/profile/module.js b/src/app/profile/module.js
index 3a2a05ca..0f019396 100644
--- a/src/app/profile/module.js
+++ b/src/app/profile/module.js
@@ -41,9 +41,6 @@ angular.module('sb.profile',
                     currentUser: SessionResolver.requireCurrentUser
                 },
                 views: {
-                    'submenu@': {
-                        templateUrl: 'app/profile/template/profile_submenu.html'
-                    },
                     '@': {
                         template: '<div ui-view></div>'
                     }
diff --git a/src/app/profile/template/profile_submenu.html b/src/app/profile/template/profile_submenu.html
deleted file mode 100644
index e3b900dd..00000000
--- a/src/app/profile/template/profile_submenu.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may
-  ~ not use this file except in compliance with the License. You may obtain
-  ~ a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<a href="#!/profile/preferences"
-   active-path="^\/profile/preferences.*"
-   title="Preferences">
-    <i class="fa fa-sb-profile-preferences fa-lg"></i>
-</a>
-<a href="#!/profile/tokens"
-   active-path="^\/profile/tokens.*"
-   title="Authentication Tokens">
-    <i class="fa fa-sb-profile-tokens fa-lg"></i>
-</a>
diff --git a/src/app/storyboard/template/header_menu.html b/src/app/storyboard/template/header_menu.html
index 6efc8784..f320e567 100644
--- a/src/app/storyboard/template/header_menu.html
+++ b/src/app/storyboard/template/header_menu.html
@@ -105,6 +105,19 @@
                     <i class="fa fa-caret-down"></i>
                 </a>
                 <ul class="dropdown-menu">
+                    <li>
+                        <a href="#!/profile/preferences">
+                            <i class="fa fa-cog"></i>
+                            Preferences
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#!/profile/tokens">
+                            <i class="fa fa-key"></i>
+                            Authentication Tokens
+                        </a>
+                    </li>
+                    <li class="divider"></li>
                     <li>
                         <a href="#!/auth/deauthorize">
                             <i class="fa fa-sign-out-alt"></i>
@@ -220,6 +233,19 @@
                     </a>
                 </li>
                 <li class="divider"></li>
+                <li>
+                    <a href="#!/profile/preferences">
+                        <i class="fa fa-cog"></i>
+                        Preferences
+                    </a>
+                </li>
+                <li>
+                    <a href="#!/profile/tokens">
+                        <i class="fa fa-key"></i>
+                        Authentication Tokens
+                    </a>
+                </li>
+                <li class="divider"></li>
                 <li><a href="#!/auth/deauthorize"
                        ng-click="showMobileMenu = false">
                     <i class="fa fa-sign-out-alt"></i>
diff --git a/src/app/storyboard/template/side_menu.html b/src/app/storyboard/template/side_menu.html
index 4b193210..582ac375 100644
--- a/src/app/storyboard/template/side_menu.html
+++ b/src/app/storyboard/template/side_menu.html
@@ -55,13 +55,8 @@
     <p class="visible-lg visible-md">Stories</p>
   </a>
 
-  <hr>
+  <hr ng-if="isLoggedIn">
 
-  <a href="#!/profile" active-path="^\/profile.*" ng-if="isLoggedIn">
-    <i class="fa fa-sb-profile fa-2x visible-lg visible-md"></i>
-    <i class="fa fa-sb-profile fa-lg visible-sm visible-xs"></i>
-    <p class="visible-lg visible-md">Profile</p>
-  </a>
   <a href="#!/admin" active-path="^\/admin.*" permission="is_superuser">
     <i class="fa fa-sb-admin fa-2x visible-lg visible-md"></i>
     <i class="fa fa-sb-admin fa-lg visible-sm visible-xs"></i>
@@ -71,10 +66,5 @@
     <i class="fa fa-question-circle visible-xs"></i>
     <p class="hidden-xs">About</p>
   </a>
-  <a href="http://www.apache.org/licenses/LICENSE-2.0"
-     target="_blank">
-    <i class="fa fa-exclamation-circle visible-xs"></i>
-    <p class="hidden-xs">License</p>
-  </a>
   <nav ui-view="submenu" class="submenu text-center"></nav>
 </nav>
\ No newline at end of file
diff --git a/src/theme/base/bootstrap/_navbar.scss b/src/theme/base/bootstrap/_navbar.scss
index af1be2da..c1c831b1 100644
--- a/src/theme/base/bootstrap/_navbar.scss
+++ b/src/theme/base/bootstrap/_navbar.scss
@@ -12,7 +12,6 @@ nav.sidebar {
   left: $sidebar-left-lg;
   padding: $sidebar-padding-lg;
   font-size: $sidebar-font-size;
-  overflow-y: scroll;
 
   p {
     margin-bottom: 0px;