You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2014/12/19 20:13:39 UTC
incubator-nifi git commit: NIFI-150: Addressed issues not pulling in
the user guide appropriately
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-USER-GUIDE 9c38f358b -> d57b34c45
NIFI-150: Addressed issues not pulling in the user guide appropriately
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d57b34c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d57b34c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d57b34c4
Branch: refs/heads/NIFI-USER-GUIDE
Commit: d57b34c452c28c9523850539a3edc5787d76414d
Parents: 9c38f35
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 19 14:13:34 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 19 14:13:34 2014 -0500
----------------------------------------------------------------------
.../nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp | 3 ++-
.../web/nifi-web-docs/src/main/webapp/js/application.js | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57b34c4/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index f82cc6d..a899603 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>NiFi Documentation</title>
- <script type="text/javascript" src="../nifi/js/jquery/jquery-1.7.min.js"></script>
+ <script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/application.js"></script>
<link href="css/main.css" rel="stylesheet" type="text/css" />
<link href="css/component-usage.css" rel="stylesheet" type="text/css" />
@@ -41,6 +41,7 @@
<div class="header">Documents</div>
<div class="component-links">
<ul>
+ <li class="component-item"><a class="component-link user-guide" href="user-guide/nifi-user-guide.html" target="component-usage">User Guide</a></li>
</ul>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57b34c4/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index 1a60de6..e9b0499 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@ -256,6 +256,11 @@ $(document).ready(function () {
}
});
+ // listen for on the rest api and user guide
+ $('a.rest-api a.user-guide').on('click', function() {
+ selectComponent($(this).text());
+ });
+
// get the initial selection
var initialComponentLink = $('a.component-link:first');
var initialSelection = $('#initial-selection').text();