NIFI-182: - Making the documentation in the help section for cohesive. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d3f082e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d3f082e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d3f082e2
Branch: refs/heads/develop Commit: d3f082e25c560c2384f0c948330507b744a3f846 Parents: fa80827 Author: Matt Gilman <[email protected]> Authored: Mon Dec 22 14:23:02 2014 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Dec 22 14:23:02 2014 -0500 ---------------------------------------------------------------------- .../nifi-web-api/src/main/enunciate/override.css | 19 ++++++++++++++++++- .../main/webapp/WEB-INF/jsp/documentation.jsp | 8 +++++--- .../WEB-INF/jsp/no-documentation-found.jsp | 10 +++++----- .../src/main/webapp/css/component-usage.css | 1 + .../src/main/webapp/js/application.js | 4 +++- 5 files changed, 32 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css index d2a95d7..32f1f44 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css @@ -101,6 +101,18 @@ a:hover { display: block; margin-bottom: 12px; padding: 5px 8px; + font-family: "Open Sans","DejaVu Sans",sans-serif; + font-size: 16px; +} + +ul.navigation li, ul.xbreadcrumbs li { + font-family: "Open Sans","DejaVu Sans",sans-serif; + font-size: 16px; +} + +ul li { + font-family: 'Noto Serif', 'DejaVu Serif', serif; + font-size: 16px; } /* tables */ @@ -144,6 +156,11 @@ code { white-space: pre; } +h1, h2 { + font-weight: normal; + color: #ba3925; +} + /* footer */ #footer { @@ -153,7 +170,7 @@ code { /* width */ .span-18 { - width: 916px !important; + width: 921px !important; } .span-20 { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/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 e31be6f..c148ab5 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 @@ -39,11 +39,12 @@ </div> <div id="component-listing" class="component-listing"> <div class="section"> - <div class="header">Documents</div> - <div class="component-links"> + <div class="header">Guides</div> + <div id="guide-links" 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> + <span class="no-matching no-components hidden">No matching user guides</span> </div> </div> <div class="section"> @@ -102,10 +103,11 @@ </div> <div class="section"> <div class="header">Developer</div> - <div class="component-links"> + <div id="developer-links" class="component-links"> <ul> <li class="component-item"><a class="component-link rest-api" href="rest-api/index.html" target="component-usage">Rest Api</a></li> </ul> + <span class="no-matching no-components hidden">No matching developer guides</span> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp index ba1cca8..567d0be 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp @@ -18,14 +18,14 @@ <!DOCTYPE html> <html> <head> - <title>Component documentation not found</title> + <title>NiFi</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7"/> <link rel="shortcut icon" href="../nifi/images/nifi16.ico"/> - <link href="css/main.css" rel="stylesheet" type="text/css" /> - <link href="css/component-usage.css" rel="stylesheet" type="text/css" /> + <link href="../../css/component-usage.css" rel="stylesheet" type="text/css" /> </head> - <body style="padding: 4px;"> - <div>No usage documentation found.</div> + <body> + <h2>Yikes!</h2> + <p>Unable to locate the documentation for the selected item.</p> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css index 1728733..f12758e 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css @@ -65,6 +65,7 @@ tr th { text-align:left; padding: 4px; border-width: 0; + white-space: nowrap; } /* links */ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/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 ab92aa2..b2940be 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 @@ -95,12 +95,14 @@ $(document).ready(function () { }; var applyFilter = function () { + var matchingGuides = applyComponentFilter($('#guide-links')); var matchingProcessors = applyComponentFilter($('#processor-links')); var matchingControllerServices = applyComponentFilter($('#controller-service-links')); var matchingReportingTasks = applyComponentFilter($('#reporting-task-links')); + var matchingDev = applyComponentFilter($('#developer-links')); // update the rule count - $('#displayed-components').text(matchingProcessors + matchingControllerServices + matchingReportingTasks); + $('#displayed-components').text(matchingGuides + matchingProcessors + matchingControllerServices + matchingReportingTasks + matchingDev); }; var selectComponent = function (componentName) {
