🔀 Merge branch 'hotfix_v4.7.1'

VERSION

@@ -1 +1 @@
-4.7.0
+4.7.1

data/config.yaml

@@ -1,5 +1,5 @@
 # Hugo NexT theme's custom config
 
-version: 4.7.0
+version: 4.7.1
 
 domain: hugo-next.eu.org

exampleSite/hugo.yaml

@@ -57,20 +57,20 @@ languages:
           name: Example
           pre: angles-down
           weight: 4
-        - identifier: flow-charts
+        - identifier: syntax
-          name: Flow Charts
+          name: Syntax Highlighting
-          pageRef: /demo/mermaid-charts.html
+          pageRef: /post/09-syntax-highlighting
           weight: 1   
           parent: example
         - identifier: math
           name: Math Formula
-          pageRef: /demo/math-formula.html
+          pageRef: /post/10-math-formula
           weight: 2   
           parent: example
           parent: example
-        - identifier: syntax
+        - identifier: flow-charts
-          name: Syntax Highlighting
+          name: Flow Charts
-          pageRef: /demo/syntax-highlighting.html
+          pageRef: /post/11-mermaid-charts
           weight: 3
           parent: example
         - identifier: archives
@@ -184,7 +184,8 @@ minify:
 # 菜单配置说明
 # identifier ： 唯一标识不可重复
 # name       ： 菜单显示名称
-# pageref    ： 本站点链接地址，与 URL 选其一
+# pageRef    ： 文章在content目录下的相对路径, 更多信息请
+#               参考：https://gohugo.io/content-management/menus/#properties-site-configuration
 # url        ： 站点外部链接地址，以 http 或者 https 开头
 # pre        ： 菜单小图标
 # weight     ： 显示顺序，字数越小越靠前
@@ -192,7 +193,8 @@ minify:
 # Menus Settings
 # identifier : Unique ID cannot be repeated
 # name       : Menu name
-# pageref    : Link of webiste and not appeare same time with url
+# pageRef    : This article in content to director,more information
+#              ref:https://gohugo.io/content-management/menus/#properties-site-configuration
 # url        : Exteneral link out of website and start with http or https
 # pre        : Icon of menu
 # weight     : Order number and smaller is top
@@ -206,32 +208,32 @@ menus:
       weight: 1
     - identifier: about
       name: 关于
-      pageRef: /about.html
+      pageRef: /about
       pre: user
       weight: 2
     - identifier: flinks
       name: 友情链接
-      pageRef: /flinks.html
+      pageRef: /flinks
       pre: thumbs-up
       weight: 3
     - identifier: example
       name: 语法示例
       pre: angles-down
       weight: 4
-    - identifier: flow-charts
-      name: 流程图
-      pageRef: /demo/mermaid-charts.html
-      weight: 1
-      parent: example
-    - identifier: math
-      name: 数学公式
-      pageRef: /demo/math-formula.html
-      weight: 2   
-      parent: example
-      parent: example
     - identifier: syntax
       name: 语法高亮
-      pageRef: /demo/syntax-highlighting.html
+      pageRef: /post/09-syntax-highlighting
+      weight: 1
+      parent: example
+    
+    - identifier: math
+      name: 数学公式
+      pageRef: /post/10-math-formula
+      weight: 2 
+      parent: example
+    - identifier: flow-charts
+      name: 流程图
+      url: /post/11-mermaid-charts
       weight: 3
       parent: example
     - identifier: archives

layouts/partials/header/menus.html

@@ -15,9 +15,9 @@
       {{ if .HasChildren }}
       <ul class="menu-children">
       {{ range .Children }}
-      {{ $active = or ($curP.IsMenuCurrent .Menu .) ($curP.HasMenuCurrent .Menu .) }}
+      {{ $active = $curP.IsMenuCurrent .Menu . }}
         <li class="menu-child-item">
-          <a href="{{ .PageRef | relLangURL }}" class="hvr-icon-pulse {{if $active }}menu-item-active{{ end }}" rel="section">
+          <a href="{{ .URL | relLangURL }}" class="hvr-icon-pulse {{if $active }}menu-item-active{{ end }}" rel="section">
             <i class="fa hvr-icon"></i>{{ .Name }}
           </a>
         </li>