From 44bf31833023497483e9eda43cd5f1b8818db669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=A1=E6=A2=A6=E6=98=9F=E5=B0=98?= <elkan1788@139.com>
Date: Fri, 24 Jun 2022 19:12:08 +0800
Subject: [PATCH] :bug: Fixed menu active action.

---
 exampleSite/config.yaml                | 12 ++++++------
 layouts/partials/header/menus.html     |  7 +++----
 layouts/partials/sidebar/overview.html |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 683701d..4f331b5 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -48,17 +48,17 @@ languages:
       main:
         - identifier: home
           name: Home
-          url: /
+          pageref: /
           pre: home
           weight: 1
         - identifier: about
           name: About
-          url: /about.html
+          pageref: /about.html
           pre: user
           weight: 2
         - identifier: archives
           name: Archives
-          url: /posts
+          pageref: /posts
           pre: archive
           weight: 3
         - identifier: commonweal
@@ -86,17 +86,17 @@ menus:
   main:
     - identifier: home
       name: 首页
-      url: /
+      pageref: /
       pre: home
       weight: 1
     - identifier: about
       name: 关于
-      url: /about.html
+      pageref: /about.html
       pre: user
       weight: 2
     - identifier: archives
       name: 归档
-      url: /posts
+      pageref: /posts
       pre: archive
       weight: 3
     - identifier: commonweal
diff --git a/layouts/partials/header/menus.html b/layouts/partials/header/menus.html
index d4ba243..6951b00 100644
--- a/layouts/partials/header/menus.html
+++ b/layouts/partials/header/menus.html
@@ -2,13 +2,12 @@
 {{- $curP := .Page }}
 <nav class="site-nav">
   <ul class="main-menu menu">
-  {{- range $curP.Site.Menus.main }}
-    {{- $active := or ($curP.IsMenuCurrent "main" .) ($curP.HasMenuCurrent "main" .) }}
-    {{- $active = or $active (eq .URL "/")}}
+  {{- range .Site.Menus.main }}
+    {{- $active := $curP.IsMenuCurrent "main" . }}
     <li class="menu-item menu-item-{{ .Identifier }}">
       <a href="{{ .URL | relLangURL }}" class="hvr-icon-pulse {{if $active }} menu-item-active{{ end }}" rel="section">
         {{- if $ms.icons }}<i class="fa fa-{{ .Pre }} hvr-icon"></i>{{ end }}{{- .Name }}
-        {{- if and $ms.badges (eq .Identifier "archives" ) }}
+        {{- if and $ms.badges (eq .Identifier "archives") }}
         <span class="badge">{{ $.Scratch.Get "postsCount" }}</span>
         {{- end }}
       </a>
diff --git a/layouts/partials/sidebar/overview.html b/layouts/partials/sidebar/overview.html
index d1eafa7..ec8b889 100644
--- a/layouts/partials/sidebar/overview.html
+++ b/layouts/partials/sidebar/overview.html
@@ -60,7 +60,6 @@
 {{- end }}
 </div>
 
-{{- $lang := .Scratch.Get "lang" }}
 {{- with .Site.Params.creativeCommons }}
 {{- if .sidebar }}
 <div class="cc-license animated" itemprop="license">