NIFI-182:

- Updating to accommodate for new format in generated documentation.

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>

nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css

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

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>

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;
+}

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>