You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/22 21:23:54 UTC
[06/10] incubator-nifi git commit: NIFI-182: - Making the
documentation in the help section for cohesive.
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/fa80827d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fa80827d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fa80827d
Branch: refs/heads/develop
Commit: fa80827de9e59026c8cefe640528ee68d3b7ccbc
Parents: b375f01
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 11:09:51 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 11:09:51 2014 -0500
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsp/documentation.jsp | 3 +-
.../src/main/webapp/css/component-usage.css | 91 ++++++++++++++++----
.../nifi-web-docs/src/main/webapp/css/main.css | 29 +++++--
.../src/main/webapp/js/application.js | 7 +-
4 files changed, 95 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/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 b350e6b..e31be6f 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
@@ -27,7 +27,7 @@
<link href="css/main.css" rel="stylesheet" type="text/css" />
<link href="css/component-usage.css" rel="stylesheet" type="text/css" />
</head>
- <body>
+ <body id="documentation-body">
<div id="banner-header" class="main-banner-header"></div>
<div id="banner-footer" class="main-banner-footer"></div>
<span id="initial-selection" style="display: none;">${param.select}</span>
@@ -105,7 +105,6 @@
<div 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>
- <li class="component-item"><a class="component-link" href="javascript:void(0);" target="component-usage">Developer Guide</a></li>
</ul>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/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 b0f2e46..1728733 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
@@ -14,15 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";
+
+html, html a {
+ -webkit-font-smoothing: antialiased;
+ text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+}
+
body {
+ width: 62.5em;
+ margin: 0 auto;
display: block;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
}
.title {
font-weight: bold;
- color: #294c58;
+ color: #7a2518;
font-size: 18px;
}
@@ -33,39 +42,85 @@ body {
/* tables */
table {
- border-collapse: collapse;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #666;
+ display: block;
+ margin-bottom: 12px;
+ padding: 5px 8px;
}
-table th {
- background-image: url(../images/bgTableHeader.png);
- background-repeat: repeat-x;
- border-bottom: 1px solid #365C6A;
- border-right: 1px solid #172B31;
- height: 26px;
- padding: 0 2px;
- color: #fff;
- white-space: nowrap;
+tr td {
+ font-size: 14px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
}
-table td {
- padding: 2px;
+tr th {
+ font-size: 16px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
}
/* links */
a, a:link, a:visited {
cursor: pointer;
- color: #1e373f;
+ color: #2156a5;
text-decoration: none;
border: none;
}
a:hover, a:active {
- color: #264c58;
- text-decoration: underline;
+ color: #2156a5;
+ text-decoration: none;
border: none;
}
.clear {
clear: both;
+}
+
+/* p */
+
+p {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+p strong {
+ font-weight: bold;
+}
+
+/* ul li */
+
+ul li {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+ul li strong {
+ font-weight: bold;
+}
+
+h2 {
+ font-weight: normal;
+ color: #ba3925;
+}
+
+/* pre */
+
+pre {
+ font-size: 14px;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #666;
+ margin-bottom: 10px;
+ padding: 5px 8px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
index b4daa6b..918eb7a 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
@@ -19,7 +19,8 @@
padding: 0;
}
-body {
+#documentation-body {
+ width: 100%;
position: absolute;
top: 0;
right: 0;
@@ -111,7 +112,7 @@ div.component-listing {
left: 0;
bottom: 40px;
overflow: auto;
- font-size: 12px;
+ font-size: 16px;
padding: 4px;
}
@@ -124,22 +125,32 @@ div.component-listing div.header {
color: #264c58;
}
-div.component-listing div.component-links {
- margin-left: 10px;
- color: #1e373f;
-}
-
div.component-links ul {
list-style: none;
}
li.component-item {
padding: 2px;
+ padding-left: 4px;
+ border-left: 8px solid transparent;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
+ font-size: 15px;
+}
+
+li.component-item a {
+ color: #1e373f;
+}
+
+li.component-item:hover {
+ border-left: 8px solid #d1dee5;
+}
+
+li.component-item:hover a {
+ color: #264c58;
}
li.component-item.selected {
- background-color: #d1dee5;
- text-decoration: underline;
+ border-left: 8px solid #7098ad;
}
div.component-links span.no-components {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/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 748fc62..ab92aa2 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
@@ -257,15 +257,10 @@ $(document).ready(function () {
});
// listen for on the rest api and user guide
- $('a.rest-api a.user-guide').on('click', function() {
+ $('a.rest-api, a.user-guide').on('click', function() {
selectComponent($(this).text());
});
- // 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();