From f5fb31ec43e59765feb0b214895d3cee1039d02a Mon Sep 17 00:00:00 2001
From: Dillon <dillonzq@outlook.com>
Date: Wed, 22 Apr 2020 21:34:38 +0800
Subject: [PATCH] fix: wrong URL of JS and CSS files on baseURL (#249)

---
 layouts/404.html                    |  2 +-
 layouts/_default/summary.html       |  2 +-
 layouts/partials/comment.html       |  2 +-
 layouts/partials/footer.html        |  2 +-
 layouts/partials/header.html        | 20 ++++++++++++++++----
 layouts/partials/plugin/image.html  | 14 +++++++-------
 layouts/partials/plugin/link.html   |  2 +-
 layouts/partials/plugin/script.html |  2 +-
 layouts/partials/single/footer.html |  2 +-
 layouts/posts/single.html           |  4 ++--
 layouts/robots.txt                  |  2 +-
 11 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index 213fa92e..5624cbd4 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -7,7 +7,7 @@
         <h1 id="error-emoji"></h1>
         <p class="error-text">
             {{- T "pageNotFoundText" -}}&nbsp;
-            <a href="{{ `/` | relLangURL }}" title="{{ T `backToHome` }}">↩︎</a>
+            <a href="{{ .Site.Home.RelPermalink }}" title="{{ T `backToHome` }}">↩︎</a>
         </p>
     </div>
     <script type="text/javascript">
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index c8a33a67..df0445cb 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -16,7 +16,7 @@
     {{- /* Meta */ -}}
     <div class="post-meta">
         {{- $author := $params.author | default .Site.Author.name | default (T "author") -}}
-        {{- $authorLink := $params.authorlink | default .Site.Author.link | default (relLangURL "/") -}}
+        {{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}}
         <span class="post-author">
             {{- $options := dict "class" "author" "href" $authorLink "title" "Author" "rel" "author" "icon" (dict "class" "fas fa-user-circle fa-fw") "content" $author -}}
             {{- partial "plugin/link.html" $options -}}
diff --git a/layouts/partials/comment.html b/layouts/partials/comment.html
index ace116a6..499bd763 100644
--- a/layouts/partials/comment.html
+++ b/layouts/partials/comment.html
@@ -64,7 +64,7 @@
             <div id="fb-root" class="comment"></div>
             <div
                 class="fb-comments"
-                data-href="{{ .Permalink | absURL }}"
+                data-href="{{ .Permalink }}"
                 data-width="{{ $comment.facebook.width }}"
                 data-numposts="{{ $comment.facebook.numPosts }}"
             ></div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e66c7c1d..f7bb398f 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -31,7 +31,7 @@
 
                 {{- /* Author */ -}}
                 {{- if ne .Site.Params.footer.author false -}}
-                    <span class="author" itemprop="copyrightHolder">&nbsp;<a href="{{ $.Site.Author.link | default (relLangURL `/`) }}" target="_blank">{{ .Site.Author.name }}</a></span>
+                    <span class="author" itemprop="copyrightHolder">&nbsp;<a href="{{ $.Site.Author.link | default .Site.Home.RelPermalink }}" target="_blank">{{ .Site.Author.name }}</a></span>
                 {{- end -}}
 
                 {{- /* License */ -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index c4d59567..777191a4 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -2,14 +2,20 @@
 <header class="desktop" id="header-desktop">
     <div class="header-wrapper">
         <div class="header-title">
-            <a href="{{ `/` | relLangURL }}">
+            <a href="{{ .Site.Home.RelPermalink }}">
                 {{- .Site.Title -}}
             </a>
         </div>
         <div class="menu">
             <div class="menu-inner">
                 {{- range .Site.Menus.main -}}
-                    <a class="menu-item{{ if $.IsMenuCurrent "main" . | or ($.HasMenuCurrent "main" .) | or (.URL | relLangURL | string | eq $.RelPermalink ) }} active{{ end }}" href="{{ .URL | relLangURL }}"{{ with .Title }} title="{{ . }}"{{ end }} rel="noopener noreffer"{{ if strings.HasPrefix .URL "http" }} target="_blank"{{ end }}>
+                    {{- $url := "" -}}
+                    {{- with .Page -}}
+                        {{- $url = .RelPermalink -}}
+                    {{- else -}}
+                        {{- $url = .URL | relLangURL -}}
+                    {{- end -}}
+                    <a class="menu-item{{ if $.IsMenuCurrent `main` . | or ($.HasMenuCurrent `main` .) | or (eq $.RelPermalink $url) }} active{{ end }}" href="{{ $url }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
                         {{- .Pre | safeHTML }}{{ .Name -}}
                     </a>
                 {{- end -}}
@@ -61,7 +67,7 @@
     <div class="header-container">
         <div class="header-wrapper">
             <div class="header-title">
-                <a href="{{ `/` | relLangURL }}">
+                <a href="{{ .Site.Home.RelPermalink }}">
                     {{- .Site.Title -}}
                 </a>
             </div>
@@ -91,7 +97,13 @@
             {{- end -}}
             {{- $currentPage := . -}}
             {{- range .Site.Menus.main -}}
-                <a class="menu-item" href="{{ .URL | relLangURL }}" title="{{ .Title }}" rel="noopener noreffer"{{ if strings.HasPrefix .URL "http" }} target="_blank"{{ end }}>
+                {{- $url := "" -}}
+                {{- with .Page -}}
+                    {{- $url = .RelPermalink -}}
+                {{- else -}}
+                    {{- $url = .URL | relLangURL -}}
+                {{- end -}}
+                <a class="menu-item" href="{{ $url }}" title="{{ .Title }}"{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
                     {{- .Pre | safeHTML }}{{ .Name -}}
                 </a>
             {{- end -}}
diff --git a/layouts/partials/plugin/image.html b/layouts/partials/plugin/image.html
index f3979096..fd707c98 100644
--- a/layouts/partials/plugin/image.html
+++ b/layouts/partials/plugin/image.html
@@ -2,15 +2,15 @@
 {{- $loading := resources.Get "svg/loading/normal.svg" | minify -}}
 {{- $small := .src_s | default .src -}}
 {{- $large := .src_l | default .src -}}
-{{- $alt := .alt | default .src -}}
+{{- $alt := .alt | default (relURL .src) -}}
 {{- if .linked -}}
-    <a class="lightgallery" href="{{ $large | safeURL }}" title="{{ .title | default $alt }}" data-thumbnail="{{ $small | safeURL }}"{{ with .caption }} data-sub-html="<h2>{{ . }}</h2>{{ with $.alt }}<p>{{ . }}</p>{{ end }}"{{ end }}{{ with .rel }} rel="{{ . }}"{{ end }}>
+    <a class="lightgallery" href="{{ $large | relURL }}" title="{{ .title | default $alt }}" data-thumbnail="{{ $small | relURL }}"{{ with .caption }} data-sub-html="<h2>{{ . }}</h2>{{ with $.alt }}<p>{{ . }}</p>{{ end }}"{{ end }}{{ with .rel }} rel="{{ . }}"{{ end }}>
         <img
             class="lazyload"
-            src="{{ $loading.RelPermalink | safeURL }}"
+            src="{{ $loading.RelPermalink }}"
             data-sizes="auto"
-            data-srcset="{{ $small | safeURL }}, {{ .src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
-            data-src="{{ .src | safeURL }}"
+            data-srcset="{{ $small | relURL }}, {{ .src | relURL }} 1.5x, {{ $large | relURL }} 2x"
+            data-src="{{ .src | relURL }}"
             alt="{{ $alt }}"{{ with .height }} height="{{ . }}"{{ end }}{{ with .width }} width="{{ . }}"{{ end }} />
     </a>
 {{- else -}}
@@ -21,8 +21,8 @@
         class="lazyload"
         src="{{ $loading.RelPermalink | safeURL }}"
         data-sizes="auto"
-        data-srcset="{{ $small | safeURL }}, {{ .src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
-        data-src="{{ .src | safeURL }}"
+        data-srcset="{{ $small | relURL }}, {{ .src | relURL }} 1.5x, {{ $large | relURL }} 2x"
+        data-src="{{ .src | relURL }}"
         alt="{{ $alt }}"
         title="{{ .title | default $alt }}"{{ with .height }} height="{{ . }}"{{ end }}{{ with .width }} width="{{ . }}"{{ end }} />
 {{- end -}}
diff --git a/layouts/partials/plugin/link.html b/layouts/partials/plugin/link.html
index 13346a1e..ec9aa102 100644
--- a/layouts/partials/plugin/link.html
+++ b/layouts/partials/plugin/link.html
@@ -1,5 +1,5 @@
 {{- $rel := "" -}}
-<a href="{{ .href | safeURL }}"{{ with .title }} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .href "http" }}{{ $rel = "noopener noreffer" }} target="_blank"{{ end }} rel="{{ $rel }}{{ with .rel }} {{ . }}{{ end }}"{{ with .class }} class="{{ . }}"{{ end }}>
+<a href="{{ .href }}"{{ with .title }} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .href "http" }}{{ $rel = "noopener noreffer" }} target="_blank"{{ end }} rel="{{ $rel }}{{ with .rel }} {{ . }}{{ end }}"{{ with .class }} class="{{ . }}"{{ end }}>
     {{- with .icon -}}
         {{- partial "plugin/icon.html" . -}}
     {{- end -}}
diff --git a/layouts/partials/plugin/script.html b/layouts/partials/plugin/script.html
index 64ed3013..f5ba9cb0 100644
--- a/layouts/partials/plugin/script.html
+++ b/layouts/partials/plugin/script.html
@@ -3,7 +3,7 @@
 {{- else -}}
     {{- $src := .source -}}
     {{- $integrity := .integrity -}}
-    {{- if strings.HasPrefix $src "http" | or (strings.HasPrefix $src "||") | not -}}
+    {{- if strings.HasPrefix $src "http" | or (strings.HasPrefix $src "//") | not -}}
         {{- $res := resources.Get $src -}}
         {{- with .template -}}
             {{- $res = $res | resources.ExecuteAsTemplate . $.context -}}
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index ab03cada..f76e5a60 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -53,7 +53,7 @@
             {{- end -}}
         </section>
         <section>
-            <span><a href="javascript:window.history.back();">{{ T "back" }}</a></span>&nbsp;|&nbsp;<span><a href="{{  `/` | relLangURL  }}">{{ T "home" }}</a></span>
+            <span><a href="javascript:window.history.back();">{{ T "back" }}</a></span>&nbsp;|&nbsp;<span><a href="{{ .Site.Home.RelPermalink }}">{{ T "home" }}</a></span>
         </section>
     </div>
 
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 7df7a618..2e3abc2c 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -24,7 +24,7 @@
         <div class="post-meta">
             <div class="post-meta-line">
                 {{- $author := $params.author | default .Site.Author.name | default (T "author") -}}
-                {{- $authorLink := $params.authorlink | default .Site.Author.link | default (relLangURL "/") -}}
+                {{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}}
                 <span class="post-author">
                     {{- $options := dict "class" "author" "href" $authorLink "title" "Author" "rel" "author" "icon" (dict "class" "fas fa-user-circle fa-fw") "content" $author -}}
                     {{- partial "plugin/link.html" $options -}}
@@ -50,7 +50,7 @@
                 <i class="far fa-clock fa-fw"></i>{{ T "readingTime" .ReadingTime }}&nbsp;
                 {{- $comment := .Scratch.Get "comment" | default dict -}}
                 {{- if $comment.enable | and $comment.valine.enable | and $comment.valine.visitor -}}
-                    <span id="{{ .RelPermalink | relURL }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
+                    <span id="{{ .RelPermalink }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
                         <i class="far fa-eye fa-fw"></i><span class=leancloud-visitors-count></span>&nbsp;{{ T "views" }}
                     </span>&nbsp;
                 {{- end -}}
diff --git a/layouts/robots.txt b/layouts/robots.txt
index 37bdad61..cefec37d 100644
--- a/layouts/robots.txt
+++ b/layouts/robots.txt
@@ -61,4 +61,4 @@ Disallow: /
 User-agent: ZoominfoBot
 Disallow: /
 
-Sitemap: {{ "sitemap.xml" | absLangURL }}
+Sitemap: {{ "/sitemap.xml" | absLangURL }}