From f79a49beac96ee91691a2c44945f33cdadb318c1 Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Wed, 6 Apr 2016 09:38:54 +0200
Subject: [PATCH] Moved plugins renderer to the status footer

---
 client/app/scripts/components/app.js     |  2 --
 client/app/scripts/components/footer.js  |  7 ++++++-
 client/app/scripts/components/plugins.js | 14 ++++++++------
 client/app/styles/main.less              | 17 +++++++++++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js
index 198d76441..987fb250f 100644
--- a/client/app/scripts/components/app.js
+++ b/client/app/scripts/components/app.js
@@ -11,7 +11,6 @@ import HelpPanel from './help-panel';
 import Status from './status.js';
 import Topologies from './topologies.js';
 import TopologyOptions from './topology-options.js';
-import Plugins from './plugins.js';
 import { getApiDetails, getTopologies } from '../utils/web-api-utils';
 import { pinNextMetric, hitEsc, unpinMetric,
   selectMetric, toggleHelp } from '../actions/app-actions';
@@ -180,7 +179,6 @@ export default class App extends React.Component {
           <TopologyOptions options={this.state.currentTopologyOptions}
             topologyId={this.state.currentTopologyId}
             activeOptions={this.state.activeTopologyOptions} />
-          <Plugins plugins={this.state.plugins} />
         </Sidebar>
 
         <Footer {...this.state} />
diff --git a/client/app/scripts/components/footer.js b/client/app/scripts/components/footer.js
index 904b22018..249fb3052 100644
--- a/client/app/scripts/components/footer.js
+++ b/client/app/scripts/components/footer.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import moment from 'moment';
 
+import Plugins from './plugins.js';
 import { getUpdateBufferSize } from '../utils/update-buffer-utils';
 import { contrastModeUrl, isContrastMode } from '../utils/contrast-utils';
 import { clickDownloadGraph, clickForceRelayout, clickPauseUpdate,
@@ -8,7 +9,7 @@ import { clickDownloadGraph, clickForceRelayout, clickPauseUpdate,
 import { basePathSlash } from '../utils/web-api-utils';
 
 export default function Footer(props) {
-  const { hostname, updatePaused, updatePausedAt, version } = props;
+  const { hostname, plugins, updatePaused, updatePausedAt, version } = props;
   const contrastMode = isContrastMode();
 
   // link url to switch contrast with current UI state
@@ -47,6 +48,10 @@ export default function Footer(props) {
         {hostname}
       </div>
 
+      <div className="footer-plugins">
+        <Plugins plugins={plugins} />
+      </div>
+
       <div className="footer-tools">
         <a className={pauseClassName} onClick={pauseAction} title={pauseTitle}>
           {pauseLabel !== '' && <span className="footer-label">{pauseLabel}</span>}
diff --git a/client/app/scripts/components/plugins.js b/client/app/scripts/components/plugins.js
index c2438a3f1..572886739 100644
--- a/client/app/scripts/components/plugins.js
+++ b/client/app/scripts/components/plugins.js
@@ -3,19 +3,21 @@ import React from 'react';
 export default class Plugins extends React.Component {
   renderPlugin(plugin) {
     return (
-      <div className="plugin" key={plugin.id} title={plugin.description}>
+      <span className="plugins-plugin" key={plugin.id} title={plugin.description}>
         {plugin.label || plugin.id}
-      </div>
+      </span>
     );
   }
 
   render() {
-    if (!this.props.plugins || this.props.plugins.length === 0) {
-      return <div className="plugins">No plugins loaded</div>;
-    }
+    const hasPlugins = this.props.plugins && this.props.plugins.length > 0;
     return (
       <div className="plugins">
-        Plugins: {this.props.plugins.map(plugin => this.renderPlugin(plugin))}
+        <span className="plugins-label">
+          Plugins:
+        </span>
+        {hasPlugins && this.props.plugins.map((plugin, index) => this.renderPlugin(plugin, index))}
+        {!hasPlugins && <span className="plugins-empty">n/a</span>}
       </div>
     );
   }
diff --git a/client/app/styles/main.less b/client/app/styles/main.less
index 7363c7433..45afb9a05 100644
--- a/client/app/styles/main.less
+++ b/client/app/styles/main.less
@@ -995,6 +995,23 @@ h2 {
   }
 }
 
+.plugins {
+  margin-right: 0.5em;
+
+  &-label {
+    text-transform: uppercase;
+    margin-right: 0.25em;
+  }
+
+  &-plugin + &-plugin:before {
+    content: ', ';
+  }
+
+  &-empty {
+    opacity: @text-secondary-color;
+  }
+}
+
 .status {
   text-transform: uppercase;
   padding: 2px 12px;