Repository: nifi-site Updated Branches: refs/heads/master fa98b19db -> 37a2e6151
NIFI-1819 MINIFI-31 Providing an initial incorporation of MiNiFi site content within the nifi site. Performed some refactoring to make use of the assembly assets functionality for relative links to asset resources. This closes #2. Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/37a2e615 Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/37a2e615 Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/37a2e615 Branch: refs/heads/master Commit: 37a2e6151401e68fe831ed926cacabc245ba4ca8 Parents: fa98b19 Author: Aldrin Piri <[email protected]> Authored: Fri Apr 29 09:20:35 2016 -0400 Committer: Aldrin Piri <[email protected]> Committed: Tue May 3 10:32:50 2016 -0400 ---------------------------------------------------------------------- Gruntfile.js | 22 ++++++++-- config.rb | 6 +-- src/includes/disclaimer.hbs | 2 +- src/includes/footer.hbs | 8 ++-- src/includes/header.hbs | 12 +++--- src/includes/minifi/minifi-header.hbs | 22 ++++++++++ src/includes/minifi/minifi-topbar.hbs | 68 ++++++++++++++++++++++++++++++ src/includes/topbar.hbs | 5 ++- src/layouts/minifi/minifi-html.hbs | 3 ++ src/pages/html/index.hbs | 3 +- src/pages/html/minifi/faq.hbs | 24 +++++++++++ src/pages/html/minifi/index.hbs | 53 +++++++++++++++++++++++ 12 files changed, 207 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/Gruntfile.js ---------------------------------------------------------------------- diff --git a/Gruntfile.js b/Gruntfile.js index cbf7b3e..32f853a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -21,6 +21,7 @@ module.exports = function (grunt) { }, assemble: { options: { + assets: 'dist/assets', partials: 'src/includes/*.hbs', layout: 'src/layouts/html.hbs', flatten: true @@ -37,6 +38,19 @@ module.exports = function (grunt) { files: { 'dist/': ['src/pages/markdown/*.md'] } + }, + minifi: { + options: { + partials: 'src/includes/minifi/*.hbs', + layout: 'src/layouts/minifi/minifi-html.hbs' + + }, + files: { + 'dist/minifi/': [ + 'src/pages/markdown/minifi/*.md', + 'src/pages/html/minifi/*.hbs' + ] + } } }, compass: { @@ -68,7 +82,7 @@ module.exports = function (grunt) { src: [ 'src/js/app.js' ], - dest: 'dist/js/app.js' + dest: 'dist/assets/js/app.js' } }, copy: { @@ -99,7 +113,7 @@ module.exports = function (grunt) { expand: true, cwd: 'src/images/', src: ['**/*.{png,jpg,gif,svg,ico}'], - dest: 'dist/images/' + dest: 'dist/assets/images/' }, { expand: true, cwd: 'bower_components/jquery/dist', @@ -285,7 +299,7 @@ module.exports = function (grunt) { tasks: ['img'] }, assemble: { - files: ['src/{includes,layouts}/*.hbs', 'src/pages/{html,markdown}/*.{hbs,md}'], + files: ['src/{includes,layouts}/*.hbs', 'src/pages/{html,markdown}/*.{hbs,md}', 'src/{pages,includes,layouts}/**/minifi/*.hbs'], tasks: ['assemble'] } } @@ -311,6 +325,6 @@ module.exports = function (grunt) { // grunt.registerTask('build', ['assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']); grunt.registerTask('deploy', ['clean:all', 'prompt:username', 'exec:checkout', 'build', 'exec:status', 'prompt:commit']); grunt.registerTask('dev', ['default', 'watch']); - + grunt.registerTask('default', ['clean:all', 'build']); }; http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/config.rb ---------------------------------------------------------------------- diff --git a/config.rb b/config.rb index 296860f..e3f444c 100644 --- a/config.rb +++ b/config.rb @@ -3,10 +3,10 @@ add_import_path "bower_components/foundation/scss" # Set this to the root of your project when deployed: http_path = "/" -css_dir = "dist/stylesheets" +css_dir = "dist/assets/stylesheets" sass_dir = "src/scss" -images_dir = "dist/images" -javascripts_dir = "dist/js" +images_dir = "dist/assets/images" +javascripts_dir = "dist/assets/js" # You can select your preferred output style here (can be overridden via the command line): # output_style = :expanded or :nested or :compact or :compressed http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/includes/disclaimer.hbs ---------------------------------------------------------------------- diff --git a/src/includes/disclaimer.hbs b/src/includes/disclaimer.hbs index 788b211..0e64218 100644 --- a/src/includes/disclaimer.hbs +++ b/src/includes/disclaimer.hbs @@ -1,7 +1,7 @@ <div class="row"> <div class="large-12 columns footer"> <a href="http://www.apache.org";> - <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"> + <img id="asf-logo" alt="Apache Software Foundation" src="{{assets}}/images/feather-small.gif"> </a> <div id="copyright"> <p>Copyright © 2015 The Apache Software Foundation, Licensed under the <a http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/includes/footer.hbs ---------------------------------------------------------------------- diff --git a/src/includes/footer.hbs b/src/includes/footer.hbs index cc9405a..aeb855e 100644 --- a/src/includes/footer.hbs +++ b/src/includes/footer.hbs @@ -1,6 +1,6 @@ {{> disclaimer }} - <script src="assets/js/jquery.min.js"></script> - <script src="assets/js/foundation.js"></script> - <script src="js/app.js"></script> + <script src="{{assets}}/js/jquery.min.js"></script> + <script src="{{assets}}/js/foundation.js"></script> + <script src="{{assets}}/js/app.js"></script> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/includes/header.hbs ---------------------------------------------------------------------- diff --git a/src/includes/header.hbs b/src/includes/header.hbs index 49f320d..aea38a5 100644 --- a/src/includes/header.hbs +++ b/src/includes/header.hbs @@ -4,11 +4,11 @@ <title>{{title}}</title> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <link rel="shortcut icon" href="images/nifi16.ico"/> - <link rel="stylesheet" href="stylesheets/app.css" /> - <link rel="stylesheet" href="assets/stylesheets/font-awesome.min.css"> - <script src="assets/js/modernizr.js"></script> - <script src="assets/js/webfontloader.js"></script> + <link rel="shortcut icon" href="{{assets}}/images/nifi16.ico"/> + <link rel="stylesheet" href="{{assets}}/stylesheets/app.css" /> + <link rel="stylesheet" href="{{assets}}/stylesheets/font-awesome.min.css"> + <script src="{{assets}}/js/modernizr.js"></script> + <script src="{{assets}}/js/webfontloader.js"></script> <script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), @@ -19,4 +19,4 @@ </script> </head> <body> - {{> topbar}} \ No newline at end of file + {{> topbar}} http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/includes/minifi/minifi-header.hbs ---------------------------------------------------------------------- diff --git a/src/includes/minifi/minifi-header.hbs b/src/includes/minifi/minifi-header.hbs new file mode 100644 index 0000000..f518ac7 --- /dev/null +++ b/src/includes/minifi/minifi-header.hbs @@ -0,0 +1,22 @@ +<!doctype html> +<html class="no-js" lang="en"> + <head> + <title>{{title}}</title> + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <link rel="shortcut icon" href="{{assets}}/images/nifi16.ico"/> + <link rel="stylesheet" href="{{assets}}/stylesheets/app.css" /> + <link rel="stylesheet" href="{{assets}}/stylesheets/font-awesome.min.css"> + <script src="{{assets}}/js/modernizr.js"></script> + <script src="{{assets}}/js/webfontloader.js"></script> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + ga('create', 'UA-57264262-1', 'auto'); + ga('send', 'pageview'); + </script> + </head> + <body> + {{> minifi-topbar}} http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/includes/minifi/minifi-topbar.hbs ---------------------------------------------------------------------- diff --git a/src/includes/minifi/minifi-topbar.hbs b/src/includes/minifi/minifi-topbar.hbs new file mode 100644 index 0000000..d20ea7a --- /dev/null +++ b/src/includes/minifi/minifi-topbar.hbs @@ -0,0 +1,68 @@ +<div class="sticky contain-to-grid"> + <nav class="top-bar" data-topbar role="navigation"> + <ul class="title-area"> + <li class="name"> + <h1> + <a href="index.html"> + <img id="logo-top-bar" src="{{assets}}/images/nifiDrop.svg" alt="Apache NiFi"/> + </a> + </h1> + </li> + <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> + <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li> + </ul> + + <section class="top-bar-section"> + <!-- Right Nav Section --> + <ul class="right"> + <li class="has-dropdown"> + <a href="#">Project</a> + <ul class="dropdown"> + <li><a href="index.html">Home</a></li> + <li><a href="https://blogs.apache.org/nifi/";><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li> + <li><a href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link external-link"></i>License</a></li> + </ul> + </li> + <li class="has-dropdown"> + <a href="#">Documentation</a> + <ul class="dropdown"> + <li><a href="faq.html"><i class="fa"></i>FAQ</a></li> + <li><a href="https://cwiki.apache.org/confluence/display/NIFI/MiNiFi";><i class="fa fa-external-link external-link"></i>Wiki</a></li> + </ul> + </li> + <li class="has-dropdown"> + <a href="#">Community</a> + <ul class="dropdown"> + <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide";>Contributor Guide</a></li> + <li><a href="../mailing_lists.html">Mailing Lists</a></li> + <li><a href="../people.html">People</a></li> + </ul> + </li> + <li class="has-dropdown"> + <a href="#">Development</a> + <ul class="dropdown"> + <li><a href="../release-guide.html">Release Guide</a></li> + <li><a href="../licensing-guide.html">Licensing Guide</a></li> + <li><a href="https://git-wip-us.apache.org/repos/asf/nifi-minifi.git";><i class="fa fa-external-link external-link"></i>Source - Java Agent</a></li> + <li><a href="https://github.com/apache/nifi-minifi";><i class="fa fa-external-link external-link"></i>Source - GitHub - Java Agent</a></li> + <li><a href="https://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp.git";><i class="fa fa-external-link external-link"></i>Source - C++ Agent</a></li> + <li><a href="https://github.com/apache/nifi-minifi-cpp";><i class="fa fa-external-link external-link"></i>Source - GitHub - C++ Agent</a></li> + <li><a href="https://issues.apache.org/jira/browse/MINIFI";><i class="fa fa-external-link external-link"></i>Issues</a></li> + </ul> + </li> + <li class="has-dropdown"> + <a href="#">ASF Links</a> + <ul class="dropdown"> + <li><a href="http://www.apache.org";><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";><i class="fa fa-external-link external-link"></i>Sponsorship</a></li> + <li><a href="http://www.apache.org/security/";><i class="fa fa-external-link external-link"></i>Security</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";><i class="fa fa-external-link external-link"></i>Thanks</a></li> + </ul> + </li> + <li> + <a href="../index.html">Apache NiFi</a> + </li> + </ul> + </section> + </nav> +</div> http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/includes/topbar.hbs ---------------------------------------------------------------------- diff --git a/src/includes/topbar.hbs b/src/includes/topbar.hbs index de58f38..db95de2 100644 --- a/src/includes/topbar.hbs +++ b/src/includes/topbar.hbs @@ -4,7 +4,7 @@ <li class="name"> <h1> <a href="index.html"> - <img id="logo-top-bar" src="images/nifiDrop.svg" alt="Apache NiFi"/> + <img id="logo-top-bar" src="{{assets}}/images/nifiDrop.svg" alt="Apache NiFi"/> </a> </h1> </li> @@ -67,6 +67,9 @@ <li><a href="http://www.apache.org/foundation/thanks.html";><i class="fa fa-external-link external-link"></i>Thanks</a></li> </ul> </li> + <li> + <a href="minifi/index.html">Subproject: MiNiFi</a> + </li> </ul> </section> </nav> http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/layouts/minifi/minifi-html.hbs ---------------------------------------------------------------------- diff --git a/src/layouts/minifi/minifi-html.hbs b/src/layouts/minifi/minifi-html.hbs new file mode 100644 index 0000000..f5259d0 --- /dev/null +++ b/src/layouts/minifi/minifi-html.hbs @@ -0,0 +1,3 @@ +{{> minifi-header }} +{{> body }} +{{> footer }} http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/pages/html/index.hbs ---------------------------------------------------------------------- diff --git a/src/pages/html/index.hbs b/src/pages/html/index.hbs index 966bfad..7c78d79 100644 --- a/src/pages/html/index.hbs +++ b/src/pages/html/index.hbs @@ -24,7 +24,7 @@ title: Apache NiFi </div> <div class="medium-6 large-7 columns"> <a class="th" href="images/flow.png"> - <img id="flow" src="images/flow-th.png" alt="NiFi flow"> + <img id="flow" src="{{assets}}/images/flow-th.png" alt="NiFi flow"> </a> </div> <div class="clear"></div> @@ -74,4 +74,3 @@ title: Apache NiFi </ul> </div> </div> - http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/pages/html/minifi/faq.hbs ---------------------------------------------------------------------- diff --git a/src/pages/html/minifi/faq.hbs b/src/pages/html/minifi/faq.hbs new file mode 100644 index 0000000..cc7f143 --- /dev/null +++ b/src/pages/html/minifi/faq.hbs @@ -0,0 +1,24 @@ +--- +title: Apache NiFi FAQs +--- + +<div class="large-space"></div> +<div class="row"> + <div class="large-12 columns"> + <h1 class="nifi-txt"> + <span> + Apache <span class="ni">ni</span><span class="fi">fi</span> <span class="ni">mini</span><span class="fi">fi</span> FAQs + </span> + </h1> + </div> +</div> +<div class="row"> + <div class="large-12 columns"> + <ul> + <li> + <p class="description"><b>How do you pronounce MiNiFi?</b></p> + <p class="description">"minify" (<em>min</em>-uh-fahy) is the preferred pronunciation.</p> + </li> + </ul> + </div> +</div> http://git-wip-us.apache.org/repos/asf/nifi-site/blob/37a2e615/src/pages/html/minifi/index.hbs ---------------------------------------------------------------------- diff --git a/src/pages/html/minifi/index.hbs b/src/pages/html/minifi/index.hbs new file mode 100644 index 0000000..63c05df --- /dev/null +++ b/src/pages/html/minifi/index.hbs @@ -0,0 +1,53 @@ +--- +title: Apache NiFi - MiNiFi +--- + +<div class="large-space"></div> +<div class="row"> + <div class="medium-6 large-5 columns"> + <div class="row"> + <div class="large-12 columns"> + <h1 id="nifi-landing" class="right-text nifi-txt"> + <span> + Apache <span class="ni">ni</span><span class="fi">fi</span> + <span class="ni">mini</span><span class="fi">fi</span> + </span> + </h1> + </div> + </div> + <div class="row"> + <div class="large-12 columns"> + <p class="right-text description"> + is a subproject of Apache <span class="ni">ni</span><span class="fi">fi</span> to collect data where it originates. + </p> + </div> + </div> + </div> +</div> +<div class="large-space"></div> +<div class="row"> + <div class="large-12 columns features"> + <h2>About</h2> + </div> +</div> +<div class="medium-space"></div> +<div class="row"> + <div class="large-12 columns"> + <p class="description"> + <span class="nifi-txt">Apache <span class="ni">ni</span><span class="fi">fi</span> <span class="ni">mini</span><span class="fi">fi</span></span></span> is a complementary data collection + approach that supplements the core tenets of NiFi in dataflow management, focusing on the collection of data + at the source of its creation. + </p> + <p class="description"> + Specific goals for the initial thrust of the MiNiFi effort comprise: + <ul> + <li>small and lightweight footprint,</li> + <li>central management of agents,</li> + <li>generation of data provenance, and</li> + <li>integration with NiFi for follow-on dataflow management and full chain of custody of information.</li> + </ul> + + Perspectives of the role of MiNiFi should be from the perspective of the agent acting immediately at, or directly adjacent to, source sensors, systems, or servers. + </p> + </div> +</div>
