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:55 UTC
[2/6] incubator-spot git commit: INGEST-SUMMARY dynamic menu,
now SPOT menu has an object who's reflected on all menus without
editing every .html page
INGEST-SUMMARY 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/3fa17d39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/3fa17d39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/3fa17d39
Branch: refs/heads/SPOT-35_graphql_api
Commit: 3fa17d39e1f92027ed8b72a573fcba0778180a2b
Parents: 39ba681
Author: Montes Velazquez <jo...@intel.com>
Authored: Wed May 3 09:52:22 2017 -0500
Committer: LedaLima <ga...@intel.com>
Committed: Tue Jun 20 12:15:45 2017 -0500
----------------------------------------------------------------------
spot-oa/ui/ingest-summary.html | 58 ++----------------------------------
spot-oa/ui/js/ingest-summary.js | 6 ++++
2 files changed, 8 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/3fa17d39/spot-oa/ui/ingest-summary.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/ingest-summary.html b/spot-oa/ui/ingest-summary.html
index bc910a9..68289e3 100755
--- a/spot-oa/ui/ingest-summary.html
+++ b/spot-oa/ui/ingest-summary.html
@@ -21,6 +21,7 @@
<title>Ingest Summary</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" />
@@ -105,62 +106,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=${end-date}">Suspicious</a>
- </li>
- <li>
- <a data-href="flow/threat-investigation.html#date=${end-date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="flow/storyboard.html#date=${end-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="dns/suspicious.html#date=${end-date}">Suspicious</a>
- </li>
- <li>
- <a data-href="dns/threat-investigation.html#date=${end-date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="dns/storyboard.html#date=${end-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=${end-date}">Suspicious</a>
- </li>
- <li>
- <a data-href="proxy/threat-investigation.html#date=${end-date}">Threat Investigation</a>
- </li>
- <li>
- <a data-href="proxy/storyboard.html#date=${end-date}">Storyboard</a>
- </li>
- </ul>
- </li>
- <li>
- <a>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/3fa17d39/spot-oa/ui/js/ingest-summary.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/js/ingest-summary.js b/spot-oa/ui/js/ingest-summary.js
index f374860..31d0b50 100755
--- a/spot-oa/ui/js/ingest-summary.js
+++ b/spot-oa/ui/js/ingest-summary.js
@@ -13,6 +13,7 @@ const DateUtils = require('./utils/DateUtils');
// Build and Render Toolbar
const DateInput = require('./components/DateInput.react');
const OptionPicker = require('./components/OptionPicker.react');
+const MainMenu = require('../../js/menu/components/MainMenu.react');
// Find out period
var startDate, endDate, today;
@@ -54,6 +55,11 @@ const loadPipeline = function loadPipeline(pipeline) {
}
ReactDOM.render(
+ <MainMenu />,
+ document.getElementById('main-menu')
+);
+
+ReactDOM.render(
<form className="form-inline">
<div className="form-group">
<label htmlFor="pipeline-picker">Source: </label>