From 8140b2a9475f32e131d2302b74d9864694c06ab5 Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Tue, 3 Feb 2015 22:44:07 -0500
Subject: [PATCH] NIFI-162: - Updating topbar. - Adding more content.

---
 nifi-site/src/includes/topbar.hbs             |   7 +-
 nifi-site/src/layouts/markdown.hbs            |   1 +
 nifi-site/src/pages/html/download.hbs         |  46 ++++
 nifi-site/src/pages/markdown/quickstart.md    |  14 +-
 nifi-site/src/pages/markdown/release-guide.md | 208 +++++++++---------
 nifi-site/src/scss/_settings.scss             |  11 +-
 nifi-site/src/scss/app.scss                   |   8 +
 7 files changed, 190 insertions(+), 105 deletions(-)
 create mode 100644 nifi-site/src/pages/html/download.hbs

diff --git a/nifi-site/src/includes/topbar.hbs b/nifi-site/src/includes/topbar.hbs
index bbf7821604..e368385db5 100644
--- a/nifi-site/src/includes/topbar.hbs
+++ b/nifi-site/src/includes/topbar.hbs
@@ -20,7 +20,6 @@
                     <ul class="dropdown">
                         <li><a href="index.html">Home</a></li>
                         <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
-                        <li><a href="#">Downloads</a></li>
                         <li><a href="roadmap.html">Roadmap</a></li>
                         <li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
                     </ul>
@@ -34,6 +33,12 @@
                         <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>
                     </ul>
                 </li>
+                <li class="has-dropdown">
+                    <a href="#">Download</a>
+                    <ul class="dropdown">
+                        <li><a href="download.html">Download NiFi</a></li>
+                    </ul>
+                </li>
                 <li class="has-dropdown">
                     <a href="#">Community</a>
                     <ul class="dropdown">
diff --git a/nifi-site/src/layouts/markdown.hbs b/nifi-site/src/layouts/markdown.hbs
index fdfda90eee..a68c5a80d4 100644
--- a/nifi-site/src/layouts/markdown.hbs
+++ b/nifi-site/src/layouts/markdown.hbs
@@ -2,6 +2,7 @@
 
 <div class="row">
     <div class="large-12 columns">
+        <div class="large-space"></div>
         {{#markdown}}
             {{> body }}
         {{/markdown}}
diff --git a/nifi-site/src/pages/html/download.hbs b/nifi-site/src/pages/html/download.hbs
new file mode 100644
index 0000000000..379d0e8e2e
--- /dev/null
+++ b/nifi-site/src/pages/html/download.hbs
@@ -0,0 +1,46 @@
+---
+title: Apache NiFi FAQs
+---
+
+<div class="large-space"></div>
+<div class="row">
+    <div class="large-12 columns">
+        <h1 class="nifi-txt">
+            <span>
+                Apache <span class="ni">ni</span><span class="fi">fi</span> Downloads
+            </span>
+        </h1>
+    </div>
+</div>
+<div class="row">
+    <div class="large-12 columns">
+        <p>To verify the downloads please follow these <a href="http://www.apache.org/info/verification.html">procedures</a>
+            using these <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS">KEYS</a></p>
+        <p>If a download is not found please allow up to 24 hours for the mirrors to sync.</p>
+    </div>
+</div>
+<div class="row">
+    <div class="large-12 columns">
+        <h2>Releases</h2>
+        <ul>
+            <li>0.0.1-incubating
+                <ul>
+                    <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&amp;version=12329078">Release Notes</a></li>
+                    <li>
+                        Sources:
+                        <ul>
+                            <li><a href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip">nifi-0.0.1-incubating-source-release.zip</a> ( <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc">asc</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1">sha1</a> )</li>
+                        </ul>
+                    </li>
+                    <li>
+                        Binaries
+                        <ul>
+                            <li><a href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz">nifi-0.0.1-incubating-bin.tar.gz</a> ( <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc">asc</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1">sha1</a> )</li>
+                            <li><a href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip">nifi-0.0.1-incubating-bin.zip</a> ( <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc">asc</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1">sha1</a> )</li>
+                        </ul>
+                    </li>
+                </ul>
+            </li>
+        </ul>
+    </div>
+</div>
diff --git a/nifi-site/src/pages/markdown/quickstart.md b/nifi-site/src/pages/markdown/quickstart.md
index 14801aa919..c0148d76c7 100644
--- a/nifi-site/src/pages/markdown/quickstart.md
+++ b/nifi-site/src/pages/markdown/quickstart.md
@@ -2,6 +2,8 @@
 title:     Apache NiFi Development Quickstart
 ---
 
+# Apache NiFi Development Quickstart
+
 This documentation is in progress, but should get many started at building Apache NiFi.
 
 ## Source Code
@@ -26,12 +28,16 @@ Track issues on the "NIFI" Project on the Apache Jira ([browse][jira]).
 
 To check out the code:
 
-    git clone http://git-wip-us.apache.org/repos/asf/incubator-nifi.git
-
+```
+git clone http://git-wip-us.apache.org/repos/asf/incubator-nifi.git
+```
+<br/>
 Then checkout the 'develop' branch
 
-    git checkout develop
-
+```
+git checkout develop
+```
+<br/>
 ### Build steps
 
 1. You need a recent Java 7 (or newer) JDK.
diff --git a/nifi-site/src/pages/markdown/release-guide.md b/nifi-site/src/pages/markdown/release-guide.md
index e7750c1a86..7387692bd6 100644
--- a/nifi-site/src/pages/markdown/release-guide.md
+++ b/nifi-site/src/pages/markdown/release-guide.md
@@ -2,6 +2,8 @@
 title: Apache NiFi Release Guidelines
 ---
 
+# Apache NiFi Release Guidelines
+
 The purpose of this document is to capture and describe the steps involved in producing 
 an official release of Apache NiFi.  It is written specifically to someone acting in the
 capacity of a [Release Manager][release-manager] (RM).  
@@ -82,9 +84,11 @@ There are two lists here: one of specific incubator requirements, and another of
 ### Prepare your environment
   
 Follow the steps outlined in the [Quickstart Guide][quickstart-guide]
-        
-    At this point you're on the latest 'develop' branch and are able to build the entire application
 
+```        
+At this point you're on the latest 'develop' branch and are able to build the entire application
+```
+<br/>
 Create a JIRA ticket for the release tasks and use that ticket number for the commit messages.  For example we'll consider NIFI-270 as our ticket.  Also
 have in mind the release version you are planning for.  For example we'll consider '0.0.1-incubating'.
 
@@ -101,24 +105,26 @@ work `MAVEN_OPTS="-Xms1024m -Xmx3076m -XX:MaxPermSize=256m"`
 
 Ensure your settings.xml has been updated as shown below.  There are other ways to ensure your PGP key is available for signing as well
   
->          ...
->          <profile>
->             <id>signed_release</id>
->             <properties>
->                 <mavenExecutorId>forked-path</mavenExecutorId>
->                 <gpg.keyname>YOUR GPG KEY ID HERE</gpg.keyname>
->                 <gpg.passphrase>YOUR GPG PASSPHRASE HERE</gpg.passphrase>
->             </properties>
->         </profile>
->         ...
->         <servers>
->            <server>
->                <id>repository.apache.org</id>
->                <username>YOUR USER NAME HERE</username>
->                <password>YOUR MAVEN ENCRYPTED PASSWORD HERE</password>
->            </server>
->         </servers>
->         ...
+```
+        ...
+        <profile>
+           <id>signed_release</id>
+           <properties>
+               <mavenExecutorId>forked-path</mavenExecutorId>
+               <gpg.keyname>YOUR GPG KEY ID HERE</gpg.keyname>
+               <gpg.passphrase>YOUR GPG PASSPHRASE HERE</gpg.passphrase>
+           </properties>
+       </profile>
+       ...
+       <servers>
+          <server>
+              <id>repository.apache.org</id>
+              <username>YOUR USER NAME HERE</username>
+              <password>YOUR MAVEN ENCRYPTED PASSWORD HERE</password>
+          </server>
+       </servers>
+       ...
+```
 
 Ensure the the full application build and tests all work by executing
 `mvn -T 2.5C clean install` for a parallel build.  Once that completes you can
@@ -177,94 +183,100 @@ commands can come in handy to help do this so you can set versions to something
 Now it's time to initiate a vote within the PPMC.  Send the vote request to `dev@nifi.incubator.apache.org`
 with a subject of `[VOTE] Release Apache NiFi nifi-nar-maven-plugin-0.0.1-incubating`. The following template can be used:
  
->     Hello
->     I am pleased to be calling this vote for the source release of Apache NiFi
->     nifi-nar-maven-plugin-0.0.1-incubating.
->     
->     The source zip, including signatures, digests, etc. can be found at:
->     https://repository.apache.org/content/repositories/orgapachenifi-1011
->     
->     The Git tag is nifi-nar-maven-plugin-0.0.1-incubating-RC1
->     The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
->     https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
->     
->     Checksums of nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip:
->     MD5: 5a580756a17b0573efa3070c70585698
->     SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
->     
->     Release artifacts are signed with the following key:
->     https://people.apache.org/keys/committer/joewitt.asc
->     
->     KEYS file available here:
->     https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS
->     
->     8 issues were closed/resolved for this release:
->     https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329307
->     
->     The vote will be open for 72 hours. 
->     Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test.  The please vote:
->     
->     [ ] +1 Release this package as nifi-nar-maven-plugin-0.0.1-incubating
->     [ ] +0 no opinion
->     [ ] -1 Do not release this package because because...
+```
+Hello
+I am pleased to be calling this vote for the source release of Apache NiFi
+nifi-nar-maven-plugin-0.0.1-incubating.
 
+The source zip, including signatures, digests, etc. can be found at:
+https://repository.apache.org/content/repositories/orgapachenifi-1011
+
+The Git tag is nifi-nar-maven-plugin-0.0.1-incubating-RC1
+The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
+https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
+
+Checksums of nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip:
+MD5: 5a580756a17b0573efa3070c70585698
+SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
+
+Release artifacts are signed with the following key:
+https://people.apache.org/keys/committer/joewitt.asc
+
+KEYS file available here:
+https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS
+
+8 issues were closed/resolved for this release:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329307
+
+The vote will be open for 72 hours. 
+Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test.  The please vote:
+
+[ ] +1 Release this package as nifi-nar-maven-plugin-0.0.1-incubating
+[ ] +0 no opinion
+[ ] -1 Do not release this package because because...
+```
+<br/>
 A release vote is majority rule.  So wait 72 hours and see if there are at least 3 binding +1 votes and no more negative votes than positive.
 If so forward the vote to the IPMC.  Send the vote request to `general@incubator.apache.org` with a subject of
 `[VOTE] Release Apache NiFi nifi-nar-maven-plugin-0.0.1-incubating`.  The following template can be used:
 
->     Hello
->     
->     The Apache NiFi PPMC has voted to release Apache NiFi nar-maven-plugin-0.0.1-incubating.
->     The vote was based on the release candidate and thread described below.
->     We now request the IPMC to vote on this release.
->     
->     Here is the PPMC voting result:
->     X +1 (binding)
->     Y -1 (binding)
->     
->     Here is the PPMC vote thread: [URL TO PPMC Vote Thread]
->     
->     The source zip, including signatures, digests, etc. can be found at:
->     https://repository.apache.org/content/repositories/orgapachenifi-1011
->     
->     The Git tag is nar-maven-plugin-0.0.1-incubating-RC1
->     The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
->     https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
->     
->     Checksums of nar-maven-plugin-0.0.1-incubating-source-release.zip:
->     MD5: 5a580756a17b0573efa3070c70585698
->     SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
->     
->     Release artifacts are signed with the following key:
->     https://people.apache.org/keys/committer/joewitt.asc
->     
->     KEYS file available here:
->     https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS
->     
->     8 issues were closed/resolved for this release:
->     https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329307
->     
->     The vote will be open for 72 hours. 
->     Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test.  The please vote:
->     
->     [ ] +1 Release this package as nar-maven-plugin-0.0.1-incubating
->     [ ] +0 no opinion
->     [ ] -1 Do not release this package because because...
+```
+Hello
 
+The Apache NiFi PPMC has voted to release Apache NiFi nar-maven-plugin-0.0.1-incubating.
+The vote was based on the release candidate and thread described below.
+We now request the IPMC to vote on this release.
+
+Here is the PPMC voting result:
+X +1 (binding)
+Y -1 (binding)
+
+Here is the PPMC vote thread: [URL TO PPMC Vote Thread]
+
+The source zip, including signatures, digests, etc. can be found at:
+https://repository.apache.org/content/repositories/orgapachenifi-1011
+
+The Git tag is nar-maven-plugin-0.0.1-incubating-RC1
+The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
+https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
+
+Checksums of nar-maven-plugin-0.0.1-incubating-source-release.zip:
+MD5: 5a580756a17b0573efa3070c70585698
+SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
+
+Release artifacts are signed with the following key:
+https://people.apache.org/keys/committer/joewitt.asc
+
+KEYS file available here:
+https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS
+
+8 issues were closed/resolved for this release:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329307
+
+The vote will be open for 72 hours. 
+Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test.  The please vote:
+
+[ ] +1 Release this package as nar-maven-plugin-0.0.1-incubating
+[ ] +0 no opinion
+[ ] -1 Do not release this package because because...
+```
+<br/>
 Wait 72 hours.  If the vote passes then send a vote result email.  Send the email to `general@incubator.apache.org, dev@nifi.incubator.apache.org`
 with a subject of `[RESULT][VOTE] Release Apache NiFi nar-maven-plugin-0.0.1-incubating`.  Use a template such as:
 
->     Hello
->     
->     The release passes with
->     
->     X +1 (binding) votes
->     Y -1 (binding) votes
->     
->     Thanks to all who helped make this release possible.
->     
->     Here is the IPMC vote thread: [INSERT URL OF IPMC Vote Thread]
+```
+Hello
 
+The release passes with
+
+X +1 (binding) votes
+Y -1 (binding) votes
+
+Thanks to all who helped make this release possible.
+
+Here is the IPMC vote thread: [INSERT URL OF IPMC Vote Thread]
+```
+<br/>
 Now all the voting is done and the release is good to go.  In repository.apache.org go to the staging repository
 and select `release`.  Then publish the source, hashes, and signatures to `https://dist.apache.org/repos/dist/release/incubator/nifi/`
 Then merge the release git tag to develop and to master.
diff --git a/nifi-site/src/scss/_settings.scss b/nifi-site/src/scss/_settings.scss
index ff2d4649ea..e66a214fc9 100644
--- a/nifi-site/src/scss/_settings.scss
+++ b/nifi-site/src/scss/_settings.scss
@@ -196,6 +196,7 @@ $font-weight-bold: bold !default;
 
 // We use these to control header font styles
 // $header-font-family: $body-font-family;
+$header-font-family: 'Oswald', sans-serif;
 // $header-font-weight: $font-weight-normal;
 // $header-font-style: normal;
 // $header-font-color: $jet;
@@ -251,14 +252,20 @@ $font-weight-bold: bold !default;
 // $code-border-style: solid;
 // $code-border-color: scale-color($code-background-color, $lightness: -10%);
 // $code-padding: rem-calc(2) rem-calc(5) rem-calc(1);
+/*$code-color: scale-color($alert-color, $lightness: -27%);*/
+$code-color: #333;
+$code-font-family: Consolas, Liberation Mono, Courier, monospace;
+$code-font-weight: bold;
+$code-border-size: 0px;
+$code-font-weight: normal;
 
 // We use these to style anchors
 // $anchor-text-decoration: none;
 // $anchor-text-decoration-hover: none;
 // $anchor-font-color: $primary-color;
-$anchor-font-color: #1e373f;
+$anchor-font-color: #396877;
 // $anchor-font-color-hover: scale-color($primary-color, $lightness: -14%);
-$anchor-font-color: #264c58;
+$anchor-font-color-hover: #264c58;
 
 // We use these to style the <hr> element
 // $hr-border-width: 1px;
diff --git a/nifi-site/src/scss/app.scss b/nifi-site/src/scss/app.scss
index 935ef74a3d..869a7fbe36 100644
--- a/nifi-site/src/scss/app.scss
+++ b/nifi-site/src/scss/app.scss
@@ -52,6 +52,14 @@ html, html a {
     visibility:hidden;
 }
 
+pre code {
+    display: block;
+    overflow: auto;
+    padding: 10px;
+    font-weight: normal;
+    border-width: 1px;
+}
+
 div.large-space {
     height: 3em;
 }