Unified main nav: only one "nav" partial exists for all the pages.

vvvv · Jan 22, 2025 · dd29573 · dd29573
1 parent 2e2e6cc
commit dd29573
Show file tree

Hide file tree

Showing 26 changed files with 66 additions and 369 deletions.
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
@@ -99,20 +99,7 @@
          url('../fonts/opensans/open-sans-v34-latin-300.svg#OpenSans') format('svg'); /* Legacy iOS */
   }
 
-  /* open-sans-regular - latin */
-  @font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url('../fonts/opensans/open-sans-v34-latin-regular.eot'); /* IE9 Compat Modes */
-    src: local(''),
-         url('../fonts/opensans/open-sans-v34-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-         url('../fonts/opensans/open-sans-v34-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-         url('../fonts/opensans/open-sans-v34-latin-regular.woff') format('woff'), /* Modern Browsers */
-         url('../fonts/opensans/open-sans-v34-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-         url('../fonts/opensans/open-sans-v34-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
-  }
-
+
   /* open-sans-600 - latin */
   @font-face {
     font-family: 'Open Sans';
@@ -126,21 +113,7 @@
          url('../fonts/opensans/open-sans-v34-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
          url('../fonts/opensans/open-sans-v34-latin-600.svg#OpenSans') format('svg'); /* Legacy iOS */
   }
-
-  /* open-sans-700 - latin */
-  @font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: url('../fonts/opensans/open-sans-v34-latin-700.eot'); /* IE9 Compat Modes */
-    src: local(''),
-         url('../fonts/opensans/open-sans-v34-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-         url('../fonts/opensans/open-sans-v34-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-         url('../fonts/opensans/open-sans-v34-latin-700.woff') format('woff'), /* Modern Browsers */
-         url('../fonts/opensans/open-sans-v34-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-         url('../fonts/opensans/open-sans-v34-latin-700.svg#OpenSans') format('svg'); /* Legacy iOS */
-  }
-
+
   /* open-sans-800 - latin */
   @font-face {
     font-family: 'Open Sans';

diff --git a/assets/scss/_header.scss b/assets/scss/_header.scss
@@ -111,6 +111,7 @@
           {    
             color: #ffa800 !important;
             background-color: transparent;
+            pointer-events: none;
           }
         }
 

diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -1,7 +1,6 @@
 @import '../css/fonts-header';
 @import '../css/fonts';
 @import '_default.scss';
-@import '_default.scss';
 @import '_hero.scss';
 @import '_features.scss';
 @import '_newsletterForm.scss';

diff --git a/config.toml b/config.toml
@@ -1,7 +1,7 @@
 baseURL = "https://vvvv.org/"
 languageCode = "en-us"
-paginate = 20
-paginatePath = "page"
+pagination.pagerSize = 20
+pagination.path = "page"
 summaryLength = 20
 title = "vvvv - visual live-programming for .NET"
 relativeURLs = "true"
@@ -63,18 +63,28 @@ blog = '/blog/:sections[1]/:slug'
 
 		# Navigation
 		[params.navigation]
-		brand 		= "vvvv.org"
-
-		[params.navigation.links]
-		features  = "features"
-		blog = "blog"
-		download  = "download"
-		showcase = "showcase"
-		Learn = "learn"
-		community = "community"
-		licensing = "licensing"
-		support = "support"
-		contact   = "contact"
+		home = "vvvv.org"
+
+		[params.menu]
+			[[params.menu.main]]
+				name = 'features'
+			[[params.menu.main]]
+				name = 'blog'
+			[[params.menu.main]]
+				name = 'showcase'
+			[[params.menu.main]]
+				name = 'learn'
+			[[params.menu.main]]
+				name = 'community'
+				url = 'https://forum.vvvv.org'
+			[[params.menu.main]]
+				name = 'licensing'
+			[[params.menu.main]]
+				name = 'support'
+			[[params.menu.main]]
+				name = 'download'
+				style = 'download'
+
 
 		# Hero section
 		[params.Hero]

diff --git a/content/ForumHeader/_index.md b/content/ForumHeader/_index.md
@@ -1,5 +1,5 @@
 ---
-title: forumHeader
+title: community
 type: forumHeader
 layout: "forumHeader"
 description: Header

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -11,7 +11,7 @@
    </head>
 <body>
     <div class="main">
-        {{ partial "nav-blog" . }}
+        {{ partial "nav" . }}
 
         {{ block "main" . }}{{ end }}
 

diff --git a/layouts/community/list.html b/layouts/community/list.html
@@ -5,7 +5,7 @@
    </head>
 <body>
     <div class="main">
-        {{ partial "nav-community" . }}
+        {{ partial "nav" . }}
 
         {{ partial "community" .}}
 

diff --git a/layouts/download/list.html b/layouts/download/list.html
@@ -5,9 +5,10 @@
    </head>
 <body>
     <div class="main">
-        {{ partial "nav-download" . }}
+        {{ partial "nav" . }}
 
         {{ partial "download" .}}
+
         {{ partial "PreviewDownloads" . }}
 
         {{ partial "videoBlocker" . }}

diff --git a/layouts/features/list.html b/layouts/features/list.html
@@ -5,7 +5,7 @@
    </head>
 <body data-spy="scroll" data-target="#feature-page-pills" data-offset="450">
     <div class="main">
-        {{ partial "nav-features" . }}
+        {{ partial "nav" . }}
 
         {{ partial "features-page" .}}
 

diff --git a/layouts/forumHeader/list.html b/layouts/forumHeader/list.html
@@ -14,8 +14,5 @@
             {{ partial "socialBanner" $sections }}
         </div>
     {{ "<!-- END COPY -->" | safeHTML }}
-    <div class="content">
-        test
-    </div>
 </body>
 </html>
diff --git a/layouts/learn/list.html b/layouts/learn/list.html
@@ -5,7 +5,7 @@
    </head>
 <body>
     <div class="main">
-        {{ partial "nav-learn" . }}
+        {{ partial "nav" . }}
 
         {{ partial "learn" .}}
 

diff --git a/layouts/legal/list.html b/layouts/legal/list.html
@@ -5,7 +5,7 @@
    </head>
 <body>
     <div class="main">
-        {{ partial "nav-legal" . }}
+        {{ partial "nav" . }}
 
         {{ partial "legal" .}}
 

diff --git a/layouts/licensing/list.html b/layouts/licensing/list.html
@@ -5,7 +5,7 @@
    </head>
 <body>
     <div class="main">
-        {{ partial "nav-licensing" . }}
+        {{ partial "nav" . }}
 
         {{ partial "licensing" .}}
 

diff --git a/layouts/partials/nav-blog.html b/layouts/partials/nav-blog.html
diff --git a/layouts/partials/nav-community.html b/layouts/partials/nav-community.html
diff --git a/layouts/partials/nav-download.html b/layouts/partials/nav-download.html
diff --git a/layouts/partials/nav-features.html b/layouts/partials/nav-features.html
diff --git a/layouts/partials/nav-item.html b/layouts/partials/nav-item.html
@@ -0,0 +1,23 @@
+{{ $ctx := .ctx }}
+{{ $selected := .selected}}
+{{ $name := index $ctx "name" }}
+{{ $url := index $ctx "name" | absLangURL }}
+{{ $selectedStyle := "" }}
+{{ $style := "" }}
+
+{{ with index $ctx "style"}}
+    {{ $style = . }}
+{{ end }}
+
+{{ if eq (lower $selected) (lower $name)}}
+    {{ $selectedStyle = "selected"}}
+{{ end }}
+
+
+{{ with index $ctx "url"}}
+    {{ $url = . }}
+{{ end }}
+
+<li class="{{ $style }}">
+    <a href="{{ $url }}" {{ if $selectedStyle }} class="selected" {{ end }}>{{ $name }}</a>
+</li>
diff --git a/layouts/partials/nav-learn.html b/layouts/partials/nav-learn.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,6 +111,7 @@ @@
               {
                 color: #ffa800 !important;
                 background-color: transparent;
+                pointer-events: none;
               }
             }
@@ Expand Down @@