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 2015/02/10 02:43:01 UTC
[05/21] incubator-nifi git commit: NIFI-162: - Better integrating
overview and admin/developer guides.
NIFI-162:
- Better integrating overview and admin/developer guides.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d36a71c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d36a71c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d36a71c2
Branch: refs/heads/nifi-site-to-site-client
Commit: d36a71c25c0c9a6f25ce800ba495f04bcb6cb8cd
Parents: 4a49ba7
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 5 23:33:19 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 5 23:33:19 2015 -0500
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 5 +++--
nifi-site/src/includes/topbar.hbs | 6 +++---
nifi-site/src/js/app.js | 2 ++
nifi-site/src/pages/html/developer-guide.hbs | 7 +++++++
nifi-site/src/pages/html/download.hbs | 2 +-
nifi-site/src/pages/html/overview.hbs | 7 +++++++
nifi-site/src/pages/html/screencasts.hbs | 15 +++++++++++++++
nifi-site/src/pages/html/user-guide.hbs | 7 +++++++
nifi-site/src/scss/app.scss | 22 ++++++++++++++++++++++
9 files changed, 67 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/Gruntfile.js
----------------------------------------------------------------------
diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js
index 9139200..c9e9bb8 100644
--- a/nifi-site/Gruntfile.js
+++ b/nifi-site/Gruntfile.js
@@ -48,7 +48,8 @@ module.exports = function (grunt) {
foundation: {
src: [
'bower_components/foundation/js/foundation/foundation.js',
- 'bower_components/foundation/js/foundation/foundation.topbar.js'
+ 'bower_components/foundation/js/foundation/foundation.topbar.js',
+ 'bower_components/foundation/js/foundation/foundation.reveal.js'
],
dest: 'dist/assets/js/foundation.js'
},
@@ -132,6 +133,6 @@ module.exports = function (grunt) {
grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']);
grunt.registerTask('js', ['clean:js', 'concat']);
- grunt.registerTask('dev', ['clean', 'assemble', 'css', 'js', 'img', 'copy', 'watch']);
grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'copy']);
+ grunt.registerTask('dev', ['default', 'watch']);
};
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/includes/topbar.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/includes/topbar.hbs b/nifi-site/src/includes/topbar.hbs
index e368385..dd8e805 100644
--- a/nifi-site/src/includes/topbar.hbs
+++ b/nifi-site/src/includes/topbar.hbs
@@ -28,9 +28,9 @@
<a href="#">Documentation</a>
<ul class="dropdown">
<li><a href="faq.html">FAQ</a></li>
- <li><a href="https://nifi.incubator.apache.org/docs/nifi-docs/overview.html"><i class="fa fa-external-link external-link"></i>NiFi Overview</a></li>
- <li><a href="https://nifi.incubator.apache.org/docs/nifi-docs/user-guide.html"><i class="fa fa-external-link external-link"></i>User Guide</a></li>
- <li><a href="https://nifi.incubator.apache.org/docs/nifi-docs/developer-guide.html"><i class="fa fa-external-link external-link"></i>Developer Guide</a></li>
+ <li><a href="overview.html">NiFi Overview</a></li>
+ <li><a href="user-guide.html">User Guide</a></li>
+ <li><a href="developer-guide.html">Developer Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/js/app.js
----------------------------------------------------------------------
diff --git a/nifi-site/src/js/app.js b/nifi-site/src/js/app.js
index 9518bc0..6ec8c4e 100644
--- a/nifi-site/src/js/app.js
+++ b/nifi-site/src/js/app.js
@@ -3,6 +3,8 @@
$(document).foundation('topbar', {
mobile_show_parent_link: false,
is_hover: false
+}).foundation('reveal', {
+ animation: 'none'
});
// load fonts
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/pages/html/developer-guide.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/developer-guide.hbs b/nifi-site/src/pages/html/developer-guide.hbs
new file mode 100644
index 0000000..7d8a250
--- /dev/null
+++ b/nifi-site/src/pages/html/developer-guide.hbs
@@ -0,0 +1,7 @@
+---
+title: Apache NiFi Developer Guide
+---
+
+<div class="external-guide">
+ <iframe src="https://nifi.incubator.apache.org/docs/nifi-docs/developer-guide.html"></iframe>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/pages/html/download.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/download.hbs b/nifi-site/src/pages/html/download.hbs
index 379d0e8..6e03b28 100644
--- a/nifi-site/src/pages/html/download.hbs
+++ b/nifi-site/src/pages/html/download.hbs
@@ -1,5 +1,5 @@
---
-title: Apache NiFi FAQs
+title: Apache NiFi Downloads
---
<div class="large-space"></div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/pages/html/overview.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/overview.hbs b/nifi-site/src/pages/html/overview.hbs
new file mode 100644
index 0000000..eaaee22
--- /dev/null
+++ b/nifi-site/src/pages/html/overview.hbs
@@ -0,0 +1,7 @@
+---
+title: Apache NiFi Overview
+---
+
+<div class="external-guide">
+ <iframe src="https://nifi.incubator.apache.org/docs/nifi-docs/overview.html"></iframe>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/pages/html/screencasts.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/screencasts.hbs b/nifi-site/src/pages/html/screencasts.hbs
new file mode 100644
index 0000000..497cf25
--- /dev/null
+++ b/nifi-site/src/pages/html/screencasts.hbs
@@ -0,0 +1,15 @@
+---
+title: Apache NiFi Screencasts
+---
+
+<div class="large-space"></div>
+<div class="row">
+ <div class="large-12 columns features">
+ <h2>Screencasts</h2>
+ </div>
+</div>
+<div class="medium-space"></div>
+<div class="row">
+ <div class="large-12 columns">
+ </div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/pages/html/user-guide.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/user-guide.hbs b/nifi-site/src/pages/html/user-guide.hbs
new file mode 100644
index 0000000..19537d8
--- /dev/null
+++ b/nifi-site/src/pages/html/user-guide.hbs
@@ -0,0 +1,7 @@
+---
+title: Apache NiFi User Guide
+---
+
+<div class="external-guide">
+ <iframe src="https://nifi.incubator.apache.org/docs/nifi-docs/user-guide.html"></iframe>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d36a71c2/nifi-site/src/scss/app.scss
----------------------------------------------------------------------
diff --git a/nifi-site/src/scss/app.scss b/nifi-site/src/scss/app.scss
index 869a7fb..ddd0c87 100644
--- a/nifi-site/src/scss/app.scss
+++ b/nifi-site/src/scss/app.scss
@@ -3,6 +3,9 @@
@import "foundation/components/grid";
@import "foundation/components/top-bar";
@import "foundation/components/tables";
+@import "foundation/components/global";
+@import "foundation/components/flex-video";
+@import "foundation/components/reveal";
// @import "foundation";
// Or selectively include components
@@ -168,6 +171,25 @@ table tr:nth-of-type(even) {
}
/*
+ Iframe
+*/
+
+div.external-guide {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ top: rem-calc(45);
+ z-index: 1;
+ background-color: #fff;
+}
+
+div.external-guide iframe {
+ width: 100%;
+ height: 100%;
+}
+
+/*
Footer
*/