Debug, logging, about added to ADMIN dropdown
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
diff --git a/skyquake/framework/core/modules/navigation_manager.js b/skyquake/framework/core/modules/navigation_manager.js
index f690359..7d22394 100644
--- a/skyquake/framework/core/modules/navigation_manager.js
+++ b/skyquake/framework/core/modules/navigation_manager.js
@@ -75,6 +75,13 @@
NAVIGATION[plugin_name].allow = allow || '*';
}
+function addAdminFlag(plugin_name, admin_link) {
+ if (!NAVIGATION[plugin_name]) {
+ NAVIGATION[plugin_name] = {};
+ }
+ NAVIGATION[plugin_name].admin_link = admin_link || false;
+}
+
function getNavigation() {
return NAVIGATION;
}
@@ -89,6 +96,7 @@
addPriority(plugin_name, plugin.priority);
addLabel(plugin_name, plugin.name);
addAllow(plugin_name, plugin.allow);
+ addAdminFlag(plugin_name, plugin.admin_link);
}
function init() {
diff --git a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
index a752bf6..1aaaf4d 100644
--- a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
+++ b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx
@@ -113,7 +113,7 @@
return (
<div className="app">
<h2>
- {userProfileLink}
+ USER: {userProfileLink}
<span className="oi" data-glyph="caret-bottom"></span>
</h2>
<ul className="menu">
@@ -257,11 +257,24 @@
let navList = [];
let navListHTML = [];
let secondaryNav = [];
+ let adminNav = [];
let self = this;
self.hasSubNav = {};
let secondaryNavHTML = (
<div className="secondaryNav" key="secondaryNav">
{secondaryNav}
+ <div className="app admin">
+ <h2>
+ <a>
+ ADMIN <span className="oi" data-glyph="caret-bottom"></span>
+ </a>
+ </h2>
+ <ul className="menu">
+ {
+ adminNav
+ }
+ </ul>
+ </div>
<SelectProject
onSelectProject={props.store.selectActiveProject}
projects={props.projects}
@@ -298,7 +311,14 @@
NavList = nav[k].routes.map(buildNavListItem.bind(self, k));
navItem.priority = nav[k].priority;
navItem.order = nav[k].order;
- navItem.html = (
+ if(nav[k].admin_link) {
+ adminNav.push((
+ <li key={nav[k].name}>
+ {dashboardLink}
+ </li>
+ ))
+ } else {
+ navItem.html = (
<SkyquakeRBAC allow={nav[k].allow || ['*']} key={k} className={navClass}>
<h2>{dashboardLink} {self.hasSubNav[k] ? <span className="oi" data-glyph="caret-bottom"></span> : ''}</h2>
<ul className="menu">
@@ -309,6 +329,8 @@
</SkyquakeRBAC>
);
navList.push(navItem)
+ }
+
}
}
//Sorts nav items by order and returns only the markup
diff --git a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.scss b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.scss
index 5269be9..c31dd7a 100644
--- a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.scss
+++ b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.scss
@@ -23,7 +23,7 @@
}
.app {
position:relative;
- margin:auto;
+ margin: auto 0.5rem;
h2 {
font-size:0.75rem;
border-right: 1px solid black;
diff --git a/skyquake/plugins/about/config.json b/skyquake/plugins/about/config.json
index 1100c71..1885a9c 100644
--- a/skyquake/plugins/about/config.json
+++ b/skyquake/plugins/about/config.json
@@ -4,6 +4,7 @@
"dashboard": "./about.jsx",
"order": 99,
"priority":2,
+ "admin_link": true,
"routes" : [{
"label": "Dashboard",
"route": "/",
diff --git a/skyquake/plugins/debug/config.json b/skyquake/plugins/debug/config.json
index 6643aca..b27dd6b 100644
--- a/skyquake/plugins/debug/config.json
+++ b/skyquake/plugins/debug/config.json
@@ -4,6 +4,7 @@
"dashboard": "./crash.jsx",
"order": 100,
"priority":2,
+ "admin_link": true,
"routes" : [{
"label": "Debug",
"route": "/",
diff --git a/skyquake/plugins/logging/config.json b/skyquake/plugins/logging/config.json
index f68358d..7c43dc0 100644
--- a/skyquake/plugins/logging/config.json
+++ b/skyquake/plugins/logging/config.json
@@ -4,6 +4,7 @@
"dashboard": "./loggingGeneral.jsx",
"order": 101,
"priority":2,
+ "admin_link": true,
"routes": [
{
"label": "Logging",