Refactor the navigation items of web site described in issue 84.

config.toml

@@ -9,28 +9,44 @@ publishDir = "public"
 
   [[menu.header]]
     weight = 1
-    name = "Use Cases"
-    url = "/overview/fdiousecases"
+    name = "What's FD.io?"
+    url = "/overview/whatsfdio"
 
   [[menu.header]]
     weight = 2
-    name = "Get Started With VPP"
+    name = "Technology"
     url = "/vppproject/vpptech"
 
   [[menu.header]]
     weight = 3
-    name = "Documentation"
-    url = "/documentation"
+    name = "Features"
+    url = "/vppproject/vppfeatures"
 
   [[menu.header]]
     weight = 4
-    name = "The Latest"
-    url = "/latest/news"
+    name = "Applications"
+    url = "/overview/fdiousecases"
 
   [[menu.header]]
     weight = 5
-    name = "Get Involved"
-    url = "/community/join"
+    name = "Solutions"
+    url = "/overview/solutions"
+
+  [[menu.header]]
+    weight = 6
+    name = "Resources"
+    url = "/resources/whitepapers"
+
+  [[menu.header]]
+    weight = 7
+    name = "News"
+    url = "/latest/news"
+
+  [[menu.header]]
+    weight = 8
+    name = "About"
+    url = "/community/tsc"
+
 
 [markup]
   defaultMarkdownHandler = "goldmark"

content/community/tscdocs/_index.md

@@ -1,7 +1,7 @@
 +++
-title = "The TSC Documents"
+title = "Key Documents"
 type = "community"
 subtitle = """
-<h2 style="text-indent: 1em;">The TSC Documents</h2>
+<h3 style="text-indent: 1em;">The TSC Documents:</h3>
 """
 +++

content/overview/whatsfdio/_index.md

@@ -0,0 +1,5 @@
++++
+title = "What's FD.io?"
+type = "overview"
+subtitle = ""
++++

content/community/join/join.md → content/overview/whatsfdio/whatsdfio.md

@@ -1,5 +1,5 @@
 +++
-id = "community"
+id = "overview"
 +++
 
 <br>
@@ -40,7 +40,6 @@ Learn more about [LFN](https://www.lfnetworking.org) and [Join as a member](http
 #### Mailing Lists
 [![Mailing List](https://img.shields.io/badge/Mailing%20List-vpp-blue.svg?style=plastic)](https://lists.fd.io/g/vpp-dev)
 
-#### FDio Communication Channels
+#### FD.io Communication Channels
 [![IRC](https://www.irccloud.com/invite-svg?channel=%23fdio&amp;hostname=irc.freenode.net&amp;port=6697&amp;ssl=1)](http://webchat.freenode.net/?channels=fdio)
 [![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/FDioProject)
-

content/documentation/_index.md → content/resources/documentation/_index.md

@@ -1,7 +1,7 @@
 +++
 title = "Project Documentation"
 subtitle = """
-FD.io is a collection of several projects.<br>
+FD.io is a collection of several projects.
 Documentation for some of the projects can be found here.
 """
 bgImage = "img/fdio_bg_tech2.jpg"

content/documentation/csit.md → content/resources/documentation/csit.md

@@ -3,7 +3,7 @@ weight="2"
 title = "Continuous System Integration and Testing (CSIT)"
 +++
 
-The FD.io software is being continuosly be tested with the tools and
+The FD.io software is being continuously be tested with the tools and
 framework provided by the CSIT project.
 <br>
 The project description can be found here [CSIT Project](https://docs.fd.io/csit/master/doc/).

content/documentation/vpp.md → content/resources/documentation/vpp.md

@@ -5,7 +5,7 @@ title = "Vector Packet Processor (VPP)"
 
 The Vector Packet Packet Processor (VPP) is the core technology for FD.io.
 <br>
-To get started with VPP check out [Installing VPP](/vppproject/vppinstalling).
+To get started with VPP check out [Installing VPP](/resources/vppinstalling).
 <br>
 To read the VPP User documents please visit the [VPP Latest Release](/docs/vpp/master),
  [Versions 21.01](/docs/vpp/v2101) or [Versions 20.09LTS](/docs/vpp/v2009).

content/vppProject/vppbuilding/_index.md → content/resources/vppbuilding/_index.md

@@ -1,5 +1,5 @@
 +++
 title = "Building VPP"
 subtitle = "Downloading and Building VPP"
-type = "vpp"
+type = "resources"
 +++

content/vppProject/vppinstalling/_index.md → content/resources/vppinstalling/_index.md

@@ -1,5 +1,5 @@
 +++
 title = "Installing VPP"
 subtitle = "Installing"
-type = "vpp"
+type = "resources"
 +++

content/overview/whitepapers/_index.md → content/resources/whitepapers/_index.md

@@ -1,6 +1,6 @@
 +++
-title="News"
-subtitle="The Latest About FD.io"
+title="Whitepapers"
+subtitle="Whitepapers"
 bgImage = "img/fdio_bg_tech2.jpg"
 type = "whitepapers"
-+++
++++

content/vppProject/vppfeatures/_index.md

@@ -1,5 +1,5 @@
 +++
 title = "VPP Features"
 subtitle = "The Features"
-type = "vpp"
+type = "vppmin"
 +++

content/vppProject/vpptech/_index.md

@@ -1,5 +1,5 @@
 +++
 title = "VPP Technology"
 subtitle = "How VPP Works"
-type = "vpp"
+type = "vppmin"
 +++

layouts/latestnews/list.html

@@ -5,7 +5,14 @@
     </head>
     <body>
 	{{ partial "header.html" . }}
-	{{ partial "latest-header.html" . }}
+  <section id="docs-header">
+      <div class="container">
+          <div class="row">
+            <br>
+          </div>
+      </div>
+  </section>
+	<!--{{ partial "latest-header.html" . }}-->
 
 	<div class="container">
 	    {{ range (.Paginator 6).Pages.ByDate.Reverse }}
@@ -32,7 +39,7 @@ <h4>
 	<div class="col-12 text-center">
 	    {{ template "_internal/pagination.html" . }}
 	</div>
-	
+
 	{{ partial "footer.html" . }}
 
 </body>

layouts/overview/list.html

@@ -5,7 +5,14 @@
     </head>
     <body>
 	{{ partial "header.html" . }}
-	{{ partial "overview-header.html" . }}
+	<!--{{ partial "overview-header.html" . }}-->
+  <section id="docs-header">
+      <div class="container">
+          <div class="row">
+            <br>
+          </div>
+      </div>
+  </section>
 	<h1 align="center">{{ .Title }}</h1>
 	<br>
 	<div class="container">

layouts/partials/community-header.html

@@ -1,9 +1,9 @@
 <section id="docs-header">
     <div class="container">
         <div class="row">
-            <div class="col-md-4"><a href="/community/join/">GET INVOLVED</a></div>
             <div class="col-md-4"><a href="/community/tsc/">TECHNICAL STEERING COMMITTEE (TSC)</a></div>
-            <div class="col-md-4"><a href="/community/tscdocs/">TSC DOCUMENTS</a></div>
+            <div class="col-md-4"><a href="/community/tscdocs/">KEY DOCUMENTS</a></div>
+            <div class="col-md-4"><a href="/community/join/">GET INVOLVED</a></div>
         </div>
     </div>
 </section>

layouts/partials/overview-header.html

@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-md-3"><a href="/overview/fdiousecases">USE CASES</a></div>
             <div class="col-md-3"><a href="/overview/solutions/">CUSTOMER SOLUTIONS</a></div>
-            <div class="col-md-3"><a href="/overview/saying/">CUSTOMER FEEDBACK</a></div>
+            <div class="col-md-3"><a href="/overview/saying/">CUSTOMER QUOTES</a></div>
             <div class="col-md-3"><a href="/overview/whitepapers/">WHITE PAPERS</a></div>
         </div>
     </div>

layouts/partials/resources-header.html

@@ -0,0 +1,11 @@
+<section id="docs-header">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-3"><a href="/resources/whitepapers">WHITE PAPERS</a></div>
+            <div class="col-md-3"><a href="/resources/documentation">PROJECT DOCUMENTATION</a></div>
+            <div class="col-md-3"><a href="/resources/vppinstalling">INSTALLING</a></div>
+            <div class="col-md-3"><a href="/resources/vppbuilding">BUILDING</a></div>
+        </div>
+    </div>
+</section>
+<br></br>

layouts/partials/vppproject-header-empty.html

@@ -0,0 +1,8 @@
+<section id="docs-header">
+    <div class="container">
+        <div class="row">
+          <br>
+        </div>
+    </div>
+</section>
+<h1 align="center">The Vector Packet Processor (VPP)</h1>

layouts/resources/list.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+	{{ partial "head.html" . }}
+    </head>
+    <body>
+	{{ partial "header.html" . }}
+	{{ partial "resources-header.html" . }}
+	<h2 align="center">{{ .Params.subtitle }}</h2>
+	<div class="container">
+	    {{ range (.Paginator 1).Pages.ByDate }}
+	    {{ .Content | markdownify }}
+	    <br></br>
+	    {{ if .Params.versions }}
+	    {{ partial "btn-dropdown" . }}
+	    {{ end }}
+	    {{ if.Params.btnurl }}
+	    <a href="{{ .Params.btnurl }}" class="btn btn-main">{{ .Params.btntxt }}</a>
+	    {{ end }}
+	    <br></br>
+	    {{ end }}
+	    <div class="col-10 text-center">
+		{{ template "_internal/pagination.html" . }}
+	    </div>
+	</div>
+	<br>
+	{{ partial "footer.html" . }}
+    </body>
+</html>

layouts/resources/single.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <head>
+	{{ partial "head.html" . }}
+	{{ partial "header.html" . }}
+	{{ partial "latest-header.html" . }}
+    </head>
+    <body>
+	<div class="container">
+	    <div class="row">
+		<div class="col-md-12">
+		    <div class="block">
+			<p>{{ .Content | markdownify }}</p>
+		    </div>
+		</div>
+	    </div>
+	</div>
+	<br><br>
+
+	{{ partial "footer.html" . }}
+    </body>
+</html>

layouts/videos/list.html

@@ -4,10 +4,10 @@
 	{{ partial "head.html" . }}
     </head>
     <body>
-	
+
 	{{ partial "header.html" . }}
-	{{ partial "vppproject-header.html" . }}
-	
+	{{ partial "resources-header.html" . }}
+
 	<section class="blog section">
 	    <div class="container">
 		<div class="row">
@@ -22,7 +22,7 @@
 		</div>
 	    </div>
 	</section>
-	
+
 	{{ partial "footer.html" . }}
 
 </body>

layouts/vppmin/list.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+	{{ partial "head.html" . }}
+    </head>
+    <body>
+	{{ partial "header.html" . }}
+	{{ partial "vppproject-header-empty.html" . }}
+	<h2 align="center">{{ .Params.subtitle }}</h2>
+	<div class="container">
+	    {{ range (.Paginator 1).Pages.ByDate }}
+	    {{ .Content | markdownify }}
+	    <br></br>
+	    {{ if .Params.versions }}
+	    {{ partial "btn-dropdown" . }}
+	    {{ end }}
+	    {{ if.Params.btnurl }}
+	    <a href="{{ .Params.btnurl }}" class="btn btn-main">{{ .Params.btntxt }}</a>
+	    {{ end }}
+	    <br></br>
+	    {{ end }}
+	    <div class="col-10 text-center">
+		{{ template "_internal/pagination.html" . }}
+	    </div>
+	</div>
+	<br>
+	{{ partial "footer.html" . }}
+    </body>
+</html>

layouts/whitepapers/list.html

@@ -5,7 +5,7 @@
     </head>
     <body>
 	{{ partial "header.html" . }}
-	{{ partial "overview-header.html" . }}
+	{{ partial "resources-header.html" . }}
 
 	<div class="container">
 	    {{ range (.Paginator 6).Pages.ByDate.Reverse }}
@@ -26,7 +26,7 @@ <h4>By {{ .Params.author }} | {{ .Date.Format "Jan 2 2006" }}, {{ .Params.locati
 	<div class="col-12 text-center">
 	    {{ template "_internal/pagination.html" . }}
 	</div>
-	
+
 	{{ partial "footer.html" . }}
 
 </body>