From c7c2432c34c4eaa619cb0877d27de954082cc6c9 Mon Sep 17 00:00:00 2001
From: Ricardo Marques <rimarques@suse.com>
Date: Thu, 28 Jun 2018 14:07:56 +0100
Subject: [PATCH] mgr/dashboard: Remove text from top-right actions

Fixes: https://tracker.ceph.com/issues/24624

Signed-off-by: Ricardo Marques <rimarques@suse.com>
---
 .../src/app/core/auth/logout/logout.component.html        | 3 +--
 .../dashboard-help/dashboard-help.component.html          | 7 ++++---
 .../frontend/src/app/core/navigation/navigation.module.ts | 3 ++-
 .../navigation/notifications/notifications.component.html | 7 ++++---
 .../navigation/task-manager/task-manager.component.html   | 7 ++++---
 .../mgr/dashboard/frontend/src/openattic-theme.scss       | 8 ++------
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html
index cd6282070998d..a12ff1777d4f0 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html
@@ -1,6 +1,5 @@
 <a i18n-title
    title="Sign Out"
    (click)="logout()">
-  <i class="fa fa-sign-out"></i>
-  <span i18n>Logout</span>
+  <i class="fa fa-sign-out fa-fw"></i>
 </a>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
index 0204c7184f5a4..629c62418a0f8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
@@ -1,13 +1,14 @@
 <div dropdown>
   <a dropdownToggle
      class="dropdown-toggle"
-     data-toggle="dropdown">
+     data-toggle="dropdown"
+     i18n-title
+     title="Help">
     <i class="fa fa-question-circle-o"></i>
-    <span i18n>Help</span>
     <span class="caret"></span>
   </a>
   <ul *dropdownMenu
-      class="dropdown-menu">
+      class="dropdown-menu dropdown-menu-right">
     <li>
       <a i18n
          class="dropdown-item"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts
index 40760e9d8f4d3..54bf549d2eeef 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { BsDropdownModule, CollapseModule, PopoverModule } from 'ngx-bootstrap';
+import { BsDropdownModule, CollapseModule, PopoverModule, TooltipModule } from 'ngx-bootstrap';
 
 import { AppRoutingModule } from '../../app-routing.module';
 import { SharedModule } from '../../shared/shared.module';
@@ -19,6 +19,7 @@ import { TaskManagerComponent } from './task-manager/task-manager.component';
     CollapseModule.forRoot(),
     BsDropdownModule.forRoot(),
     PopoverModule.forRoot(),
+    TooltipModule.forRoot(),
     AppRoutingModule,
     SharedModule,
     RouterModule
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
index 28640f8f7c4e4..2191b00b766fc 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
@@ -47,7 +47,8 @@
 <a [popover]="popTemplate"
    placement="bottom"
    container="body"
-   outsideClick="true">
-  <i class="fa fa-bell"></i>
-  <span i18n>Recent Notifications</span>
+   outsideClick="true"
+   i18n-title
+   title="Recent Notifications">
+  <i class="fa fa-bell fa-fw"></i>
 </a>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
index e83da3184c5b0..bb08c339e6773 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
@@ -80,9 +80,10 @@
 <a [popover]="popTemplate"
    placement="bottom"
    container="body"
-   outsideClick="true">
-  <i class="fa"
+   outsideClick="true"
+   i18n-title
+   title="Background Tasks">
+  <i class="fa fa-fw"
      [ngClass]="icon"></i>
-  <span i18n>Background-Tasks</span>
   <span *ngIf="executingTasks.length > 0"> ({{ executingTasks.length }})</span>
 </a>
diff --git a/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss
index 767eb5caff722..562a627cd1cf8 100755
--- a/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss
@@ -299,10 +299,6 @@ ul.task-queue-pagination {
   border-top: 4px solid $oa-color-blue;
   font-size: 1.2em;
 }
-.navbar-openattic i.fa {
-  /** Add space between icon and text */
-  margin-right: 5px;
-}
 .navbar-openattic .navbar-header {
   display: flex;
   float: none;
@@ -335,7 +331,7 @@ ul.task-queue-pagination {
 .navbar-openattic .navbar-nav>li>.oa-navbar>[dropdown]>a {
   color: #ececec;
   line-height: 1;
-  padding: 10px 20px;
+  padding: 10px 17px;
   position: relative;
   display: block;
   text-decoration: none;
@@ -382,7 +378,7 @@ ul.task-queue-pagination {
 }
 .navbar-openattic .navbar-utility a,
 .navbar-openattic .navbar-utility .fa{
-  font-size: 1.0em;
+  font-size: 1.1em;
 }
 .navbar-openattic .navbar-utility>.active>a {
   color: #ececec;
-- 
2.39.5