Repository: incubator-nifi Updated Branches: refs/heads/NIFI-182 [created] 3d0766b9f
NIFI-182: - Updating to accommodate for new format in generated documentation. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3d0766b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3d0766b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3d0766b9 Branch: refs/heads/NIFI-182 Commit: 3d0766b9f5f131f456933f695c3db2c888fbca60 Parents: b87b753 Author: Matt Gilman <[email protected]> Authored: Thu Dec 18 14:10:02 2014 -0500 Committer: Matt Gilman <[email protected]> Committed: Thu Dec 18 14:10:02 2014 -0500 ---------------------------------------------------------------------- .../framework/web/nifi-web-api/pom.xml | 2 +- .../nifi-web-api/src/main/enunciate/default.css | 266 ------------------- .../src/main/enunciate/enunciate.xml | 4 +- .../src/main/enunciate/images/bg.png | Bin 0 -> 99 bytes .../src/main/enunciate/images/bgcode.gif | Bin 56 -> 0 bytes .../src/main/enunciate/images/bgcontainer.png | Bin 386 -> 0 bytes .../src/main/enunciate/images/bgul.gif | Bin 304 -> 0 bytes .../src/main/enunciate/images/header.png | Bin 51928 -> 0 bytes .../src/main/enunciate/images/home.png | Bin 0 -> 144 bytes .../src/main/enunciate/images/li.png | Bin 191 -> 0 bytes .../src/main/enunciate/images/quote.gif | Bin 228 -> 0 bytes .../src/main/enunciate/images/search.gif | Bin 680 -> 0 bytes .../src/main/enunciate/override.css | 150 +++++++++++ .../framework/web/nifi-web-ui/pom.xml | 2 +- 14 files changed, 155 insertions(+), 269 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml index e7cb0e7..d3fb248 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-web-api</artifactId> <packaging>war</packaging> - <name>NiFi Web Rest Api</name> + <name>NiFi Rest Api</name> <profiles> <profile> <id>docs</id> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css deleted file mode 100755 index ccfd321..0000000 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css +++ /dev/null @@ -1,266 +0,0 @@ -/*############################################################# -Name: Transparentia -Date: 2006-08-20 -Description: Simple, lightweight and slightly blue. -Author: Viktor Persson -URL: http://templates.arcsin.se - -Feel free to use and modify but please provide credits. -#############################################################*/ - -/* standard elements */ -* { - margin: 0; - padding: 0; -} - -a { - color: #496878; -} - -a:hover { - color: #6a90a4; -} - -body { - background-color: #DFE8EC; - color: #444; - font: normal 62.5% "Lucida Sans Unicode",sans-serif; - margin: 0; -} - -input { - color: #555; - font: normal 1.1em "Lucida Sans Unicode",sans-serif; -} - -p, cite, code, ul { - font-size: 12px; - padding-bottom: 1.2em; -} - -h1 { - font-size: 1.4em; - margin-bottom: 4px; -} - -h2 { - font-size: 1.2em; -} - -code { - background: url(img/bgcode.gif); - border: 1px solid #F0F0F0; - border-left: 6px solid #39F; - color: #555; - display: block; - font: normal 1.1em "Lucida Sans Unicode",serif; - margin-bottom: 12px; - padding: 8px 10px; - white-space: pre; -} - -cite { - background: url(img/quote.gif) no-repeat; - color: #666; - display: block; - font: normal 1.3em "Lucida Sans Unicode",serif; - padding-left: 28px; -} - -h1, h2, h3 { - color: #294c58; - padding-top: 6px; -} - -/* misc */ -.clearer { - clear: both; -} - -.deprecated { - color: red; -} - -.errortext { - color: red; - padding: 6px 12px; - font-variant:small-caps; -} - -/* structure */ -.container { - background: url(img/bgcontainer.png) repeat-y; - margin: 0 auto; - padding-bottom: 6px; - width: 767px; -} - -.header { - background: url(img/header.png) no-repeat; -} - -/* title */ -.title h1 { - font: normal 3em Verdana,sans-serif; - height: 150px; - line-height: 150px; - margin-bottom: 8px; - text-align: center; - position: relative; - left: -5000px; -} - -/* main */ -.main { - clear: both; - padding: 8px 18px; -} - -/* main left */ -.sidenav h1, .sidenav ul { - padding-left: 12px; -} - -.sidenav { - background: #EEE; - border: 1px solid #E5E5E5; - float: left; - width: 200px; -} - -.sidenav h1 { - color: #666; - font-size: 1.2em; - /*height: 20px;*/ - margin-top: 1.2em; -} - -.sidenav ul { - border-top: 1px solid #FAFAFA; - background: url(img/bgul.gif) repeat-x; - margin: 0; - padding: 0; -} - -.sidenav li { - border: 1px solid #FAFAFA; - border-top: none; - list-style: none; - margin: 0; -} - -.sidenav li a { - color: #777; - display: block; - font-size: 0.9em; - padding: 3px 6px 3px 14px; - text-decoration: none; -} - -.sidenav li a:hover { - color: #111; -} - -/* content */ -.content { - float: right; - width: 520px; -} - -.content .item { - padding: 6px 12px; - background: #FFF; - margin-bottom: 8px; -} - -.content .descr { - color: #333; -} - -.content li { - list-style: url(img/li.png); - margin-left: 18px; -} - -.content table { - background: url(img/bgcode.gif); - border: 1px solid #F0F0F0; - border-left: 6px solid #6a90a4; - color: #555; - display: block; - font: normal 1.1em "Lucida Sans Unicode",serif; - margin-bottom: 12px; - padding: 8px 10px; -} - -.content table tr td { - vertical-align:top; - text-align:left; - padding: 3px 3px 3px 3px; -} - -.content table tr th { - vertical-align:top; - text-align:left; - padding: 3px 3px 3px 3px; -} - -.content h1 { - /* text-decoration:underline;*/ -} - -.content h1 a { - color: #333; -} - -/* footer */ -.footer { - background: #FFF; - color: #999; - font-size: 1.1em; - margin: 0 auto; - text-align: center; - padding: 6px; - width: 720px; -} - -.footer a { - color: #666; - text-decoration: none; -} - -.footer a:hover { - color: #999; - text-decoration: underline; -} - -/* widecontent (content with no sidenav) */ -.widecontent { - background: #FFF; - border: 1px solid #EEE; - color: #666; - font-size: 1.1em; - margin: 0 auto; - padding: 6px; - width: 720px; -} - -.widecontent a { - color: #36C; - text-decoration: none; -} - -.widecontent a:hover { - color: #06F; - text-decoration: underline; -} - -.widecontent h1 { - padding: 6px 12px; - text-decoration:underline; -} - -.widecontent form { - padding: 6px 12px; -} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml index 781e6b1..daaa553 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml @@ -29,6 +29,8 @@ <xfire-client disabled="true"/> <rest disabled="true"/> <jersey useSubcontext="false" usePathBasedConneg="false"/> - <docs splashPackage="org.apache.nifi.web.api" includeDefaultDownloads="false" css="default.css"/> + <docs splashPackage="org.apache.nifi.web.api" includeDefaultDownloads="false"> + <additional-css file="override.css"/> + </docs> </modules> </enunciate> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png new file mode 100644 index 0000000..fda98e5 Binary files /dev/null and b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif deleted file mode 100755 index 6f99682..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png deleted file mode 100755 index 5b34fda..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif deleted file mode 100755 index ff689c8..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png deleted file mode 100755 index 3383d33..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png new file mode 100644 index 0000000..be12052 Binary files /dev/null and b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png deleted file mode 100755 index 3acc106..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif deleted file mode 100755 index fa145bb..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif deleted file mode 100755 index ed55341..0000000 Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/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 new file mode 100644 index 0000000..5e839c5 --- /dev/null +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css @@ -0,0 +1,150 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#site-name { + padding-left: 0; +} + +#site-name a { + /*font-variant: normal !important;*/ + letter-spacing: 1px; +} + +#primary { + padding-right: 0; +} + +#primary li:hover { + border-bottom: 6px solid #7098ad; +} + +.xbreadcrumbs { + background-color: #7098ad !important; + color: #fff !important; +} + +.xbreadcrumbs li { + /*padding: 10px 15px 10px 10px !important;*/ +} + +.xbreadcrumbs li a, .xbreadcrumbs li.current a { + font-size: 13px !important; + color: #fff !important; +} + +.xbreadcrumbs li a.home { + background: url(img/home.png) no-repeat left center; +} + +.xbreadcrumbs li ul { + top: 26px !important; + background-color: #e3ebee !important; +} + +.xbreadcrumbs li ul li a, .xbreadcrumbs li.current ul li a { + color: #444 !important; +} + +.home { + background-color: #dfe8ec; + color: #444; +} + +a { + color: #496878; +} + +a:hover { + color: #6a90a4; +} + +.container { + width: 940px !important; + border-left: 2px solid #efefef; + border-right: 2px solid #efefef; + padding: 0 10px; + background-color: #fff; +} + +#main h2, #main h3 { + border-width: 0; +} + +#main p.note { + background: url(img/bg.png); + border: 1px solid #eee; + border-left: 4px solid #eee; + color: #666; + display: block; + margin-bottom: 12px; + padding: 5px 8px; +} + +/* tables */ + +table { + background: url(img/bg.png); + border: 1px solid #eee; + border-left: 4px solid #eee; + color: #666; + display: block; + margin-bottom: 12px; + padding: 5px 8px; +} + +table tbody tr td { + font-size: 14px; + vertical-align:top; + text-align:left; + padding: 4px; + border-width: 0; +} + +table tbody tr th { + font-size: 16px; + vertical-align:top; + text-align:left; + padding: 4px; + border-width: 0; +} + +/* code */ + +code { + font-size: 14px; + background: url(img/bg.png); + border: 1px solid #eee; + border-left: 4px solid #eee; + color: #666; + margin-bottom: 10px; + padding: 5px 8px; + white-space: pre; +} + +/* footer */ + +#footer { + border-top: 3px solid #eee; +} + +/* width */ + +.span-18 { + width: 916px !important; +} + +.span-20 { + width: 935px !important; +} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml index c4471a1..69e306d 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-web</artifactId> <packaging>war</packaging> - <name>NiFi Web UI</name> + <name>NiFi UI</name> <properties> <staging.dir>${project.build.directory}/tmp</staging.dir> <canvas.filter>canvas.properties</canvas.filter>
