You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by le...@apache.org on 2017/06/20 17:16:57 UTC
[4/6] incubator-spot git commit: DNS dynamic menu,
now SPOT menu has an object who's reflected on all menus without
editing every .html page
DNS dynamic menu, now SPOT menu has an object who's reflected on all menus without editing every .html page
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/c2466e49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/c2466e49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/c2466e49
Branch: refs/heads/SPOT-35_graphql_api
Commit: c2466e4998599e4ca3e7138c49d62e7ea092b918
Parents: 97fcb3d
Author: Montes Velazquez <jo...@intel.com>
Authored: Wed May 3 09:35:07 2017 -0500
Committer: LedaLima <ga...@intel.com>
Committed: Tue Jun 20 12:15:45 2017 -0500
----------------------------------------------------------------------
spot-oa/ui/dns/js/storyboard.js | 6 +++
spot-oa/ui/dns/js/suspicious.js | 6 +++
spot-oa/ui/dns/js/threat-investigation.js | 6 +++
spot-oa/ui/dns/storyboard.html | 58 +-------------------------
spot-oa/ui/dns/suspicious.html | 57 +------------------------
spot-oa/ui/dns/threat-investigation.html | 58 +-------------------------
6 files changed, 23 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/c2466e49/spot-oa/ui/dns/js/storyboard.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/js/storyboard.js b/spot-oa/ui/dns/js/storyboard.js
index 7374828..d09ddf8 100755
--- a/spot-oa/ui/dns/js/storyboard.js
+++ b/spot-oa/ui/dns/js/storyboard.js
@@ -8,6 +8,12 @@ const SpotConstants = require('../../js/constants/SpotConstants');
const SpotUtils = require('../../js/utils/SpotUtils');
const DateInput = require('../../js/components/DateInput.react');
const StoryboardActions = require('../../js/actions/StoryboardActions');
+const MainMenu = require('../../js/menu/components/MainMenu.react');
+
+ReactDOM.render(
+ <MainMenu />,
+ document.getElementById('main-menu')
+);
ReactDOM.render(
(
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/c2466e49/spot-oa/ui/dns/js/suspicious.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/js/suspicious.js b/spot-oa/ui/dns/js/suspicious.js
index 57f8968..fe45118 100755
--- a/spot-oa/ui/dns/js/suspicious.js
+++ b/spot-oa/ui/dns/js/suspicious.js
@@ -11,6 +11,7 @@ const SpotUtils = require('../../js/utils/SpotUtils');
// Build and Render Toolbar
const FilterInput = require('./components/FilterInput.react');
const DateInput = require('../../js/components/DateInput.react');
+const MainMenu = require('../../js/menu/components/MainMenu.react');
function resetFilterAndReload()
{
@@ -23,6 +24,11 @@ function switchComponents () {
};
ReactDOM.render(
+ <MainMenu />,
+ document.getElementById('main-menu')
+);
+
+ReactDOM.render(
(
<form className="form-inline">
<div className="form-group">
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/c2466e49/spot-oa/ui/dns/js/threat-investigation.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/js/threat-investigation.js b/spot-oa/ui/dns/js/threat-investigation.js
index efd5c1c..adf60f9 100755
--- a/spot-oa/ui/dns/js/threat-investigation.js
+++ b/spot-oa/ui/dns/js/threat-investigation.js
@@ -7,6 +7,12 @@ const SpotActions = require('../../js/actions/SpotActions');
const SpotUtils = require('../../js/utils/SpotUtils');
const DateInput = require('../../js/components/DateInput.react');
+const MainMenu = require('../../js/menu/components/MainMenu.react');
+
+ReactDOM.render(
+ <MainMenu />,
+ document.getElementById('main-menu')
+);
ReactDOM.render(
(
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/c2466e49/spot-oa/ui/dns/storyboard.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/storyboard.html b/spot-oa/ui/dns/storyboard.html
index 251a289..e478081 100755
--- a/spot-oa/ui/dns/storyboard.html
+++ b/spot-oa/ui/dns/storyboard.html
@@ -21,6 +21,7 @@
<title>DNS :: Storyboard</title>
<meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<!--Bootstrap styles-->
<link rel="stylesheet" type="text/css" href="../css/bootstrap-spot.min.css" />
@@ -70,62 +71,7 @@
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="main-menu">
- <ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- Flows
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="flowsMenu">
- <li>
- <a data-href="../flow/suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="../flow/threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="../flow/storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- DNS
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="dnsMenu">
- <li>
- <a data-href="suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- Proxy
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="proxyMenu">
- <li>
- <a data-href="../proxy/suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="../proxy/threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="../proxy/storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li>
- <a data-href="../ingest-summary.html#end-date=${date}|pipeline=dns">Ingest Summary</a>
- </li>
- </ul>
+ <!-- Main Menu -->
</div>
<div id="search-box" class="row text-right">
<!--Tools Buttons-->
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/c2466e49/spot-oa/ui/dns/suspicious.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/suspicious.html b/spot-oa/ui/dns/suspicious.html
index b809026..e0ef0b5 100755
--- a/spot-oa/ui/dns/suspicious.html
+++ b/spot-oa/ui/dns/suspicious.html
@@ -83,62 +83,7 @@
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="main-menu">
- <ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- Flows
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="flowsMenu">
- <li>
- <a data-href="../flow/suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="../flow/threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="../flow/storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- DNS
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="dnsMenu">
- <li>
- <a data-href="suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- Proxy
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="proxyMenu">
- <li>
- <a data-href="../proxy/suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="../proxy/threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="../proxy/storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li>
- <a data-href="../ingest-summary.html#end-date=${date}|pipeline=dns">Ingest Summary</a>
- </li>
- </ul>
+ <!-- Main Menu -->
</div>
<div id="search-box" class="row text-right">
<!--Tools Buttons-->
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/c2466e49/spot-oa/ui/dns/threat-investigation.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/threat-investigation.html b/spot-oa/ui/dns/threat-investigation.html
index 804a988..1c504bf 100755
--- a/spot-oa/ui/dns/threat-investigation.html
+++ b/spot-oa/ui/dns/threat-investigation.html
@@ -21,6 +21,7 @@
<title>DNS :: Threat Investigation</title>
<meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<!--Bootstrap styles-->
<link rel="stylesheet" type="text/css" href="../css/bootstrap-spot.min.css" />
@@ -68,62 +69,7 @@
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="main-menu">
- <ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- Flows
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="flowsMenu">
- <li>
- <a data-href="../flow/suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="../flow/threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="../flow/storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- DNS
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="dnsMenu">
- <li>
- <a data-href="suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
- Proxy
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" aria-labelledby="proxyMenu">
- <li>
- <a data-href="../proxy/suspicious.html#date=${date}">Suspicious</a>
- </li>
- <li>
- <a data-href="../proxy/threat-investigation.html#date=${date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="../proxy/storyboard.html#date=${date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li>
- <a data-href="../ingest-summary.html#end-date=${date}|pipeline=dns">Ingest Summary</a>
- </li>
- </ul>
+ <!-- Main Menu -->
</div>
<div id="search-box" class="row text-right">
<!--Tools Buttons-->