NIFI-162:

- Better integrating overview and admin/developer guides.
This commit is contained in:
Matt Gilman 2015-02-05 23:33:19 -05:00
parent 4a49ba7f70
commit d36a71c25c
9 changed files with 67 additions and 6 deletions

View File

@ -48,7 +48,8 @@ module.exports = function (grunt) {
foundation: { foundation: {
src: [ src: [
'bower_components/foundation/js/foundation/foundation.js', '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' dest: 'dist/assets/js/foundation.js'
}, },
@ -132,6 +133,6 @@ module.exports = function (grunt) {
grunt.registerTask('img', ['newer:copy']); grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']); grunt.registerTask('css', ['clean:css', 'compass']);
grunt.registerTask('js', ['clean:js', 'concat']); 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('default', ['clean', 'assemble', 'css', 'js', 'img', 'copy']);
grunt.registerTask('dev', ['default', 'watch']);
}; };

View File

@ -28,9 +28,9 @@
<a href="#">Documentation</a> <a href="#">Documentation</a>
<ul class="dropdown"> <ul class="dropdown">
<li><a href="faq.html">FAQ</a></li> <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="overview.html">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="user-guide.html">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="developer-guide.html">Developer Guide</a></li>
</ul> </ul>
</li> </li>
<li class="has-dropdown"> <li class="has-dropdown">

View File

@ -3,6 +3,8 @@
$(document).foundation('topbar', { $(document).foundation('topbar', {
mobile_show_parent_link: false, mobile_show_parent_link: false,
is_hover: false is_hover: false
}).foundation('reveal', {
animation: 'none'
}); });
// load fonts // load fonts

View File

@ -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>

View File

@ -1,5 +1,5 @@
--- ---
title: Apache NiFi FAQs title: Apache NiFi Downloads
--- ---
<div class="large-space"></div> <div class="large-space"></div>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -3,6 +3,9 @@
@import "foundation/components/grid"; @import "foundation/components/grid";
@import "foundation/components/top-bar"; @import "foundation/components/top-bar";
@import "foundation/components/tables"; @import "foundation/components/tables";
@import "foundation/components/global";
@import "foundation/components/flex-video";
@import "foundation/components/reveal";
// @import "foundation"; // @import "foundation";
// Or selectively include components // Or selectively include components
@ -167,6 +170,25 @@ table tr:nth-of-type(even) {
background-color: transparent !important; background-color: transparent !important;
} }
/*
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 Footer
*/ */