From f39f44c141c455d339c6bbf7270618e9a2fd962d Mon Sep 17 00:00:00 2001
From: wangpeiheng <805075854@qq.com>
Date: Tue, 2 Jun 2020 15:17:21 +0800
Subject: [PATCH 1/3] Each article adds a specific URL

---
 themes/hugo-blog-jeffprod/layouts/404.html             | 2 +-
 themes/hugo-blog-jeffprod/layouts/partials/footer.html | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/themes/hugo-blog-jeffprod/layouts/404.html b/themes/hugo-blog-jeffprod/layouts/404.html
index d5484002..a767772a 100644
--- a/themes/hugo-blog-jeffprod/layouts/404.html
+++ b/themes/hugo-blog-jeffprod/layouts/404.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-<div class="box">
+<div class="box" id="notFound">
     <div class="content">
         Page not found...
     </div>
diff --git a/themes/hugo-blog-jeffprod/layouts/partials/footer.html b/themes/hugo-blog-jeffprod/layouts/partials/footer.html
index 0765911d..1c407190 100644
--- a/themes/hugo-blog-jeffprod/layouts/partials/footer.html
+++ b/themes/hugo-blog-jeffprod/layouts/partials/footer.html
@@ -6,6 +6,10 @@
 <script defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js"></script>
 <script src="{{ .Site.BaseURL }}js/flexible.js"></script>
 <script>
+  const hash = window.location.search,
+        pageurl = window.location.href;
+  hash ? window.location.href = pageurl.split('?').join("") : null;
+
   if(!document.getElementById("vcomments")) {
     new Valine({
         appId: '{{ .Site.Params.valine.appId }}',
@@ -38,6 +42,8 @@
     parent.postMessage(height,url);
     })
 
+    if(document.querySelector("#notFound")) parent.postMessage("我404了",url);
+
 </script>
 </body>
 </html>
-- 
Gitee


From b9aa70ac8319a3923ed87a8ddc7f8c876d68ddb5 Mon Sep 17 00:00:00 2001
From: wangpeiheng <805075854@qq.com>
Date: Wed, 3 Jun 2020 09:27:35 +0800
Subject: [PATCH 2/3] Each blog adds its own address

---
 themes/hugo-blog-jeffprod/layouts/partials/footer.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/themes/hugo-blog-jeffprod/layouts/partials/footer.html b/themes/hugo-blog-jeffprod/layouts/partials/footer.html
index 1c407190..4dabc43b 100644
--- a/themes/hugo-blog-jeffprod/layouts/partials/footer.html
+++ b/themes/hugo-blog-jeffprod/layouts/partials/footer.html
@@ -8,7 +8,8 @@
 <script>
   const hash = window.location.search,
         pageurl = window.location.href;
-  hash ? window.location.href = pageurl.split('?').join("") : null;
+  var langss = document.querySelector("html").lang === "zh-cn" ? "zh" : "en";
+  console.log("hash:",hash,"pageurl:",pageurl,"ttr",pageurl.split(langss + "/")[1])
 
   if(!document.getElementById("vcomments")) {
     new Valine({
@@ -41,6 +42,8 @@
     const height = document.body.scrollHeight;
     parent.postMessage(height,url);
     })
+    if(pageurl.split(langss + "/")[1]) parent.postMessage(pageurl.split(langss + "/")[1],url);
+    
 
     if(document.querySelector("#notFound")) parent.postMessage("我404了",url);
 
-- 
Gitee


From d2191759b6f31d6e0ffe43209b1aff9736c1120d Mon Sep 17 00:00:00 2001
From: wangpeiheng <805075854@qq.com>
Date: Wed, 3 Jun 2020 10:55:57 +0800
Subject: [PATCH 3/3] modify 404 page style

---
 i18n/en.toml                                  | 11 +++-
 i18n/zh.toml                                  | 11 +++-
 themes/hugo-blog-jeffprod/layouts/404.html    | 25 +++++++--
 .../layouts/_default/baseof.html              |  2 +
 .../layouts/partials/header.html              |  5 +-
 themes/hugo-blog-jeffprod/static/css/blog.css | 55 +++++++++++++++++++
 6 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/i18n/en.toml b/i18n/en.toml
index f9cdda70..8534a848 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -44,4 +44,13 @@ other = "Pre-blog preparation"
 other = "Post a Blog"
 
 [comment_placeholder]
-other = "Please leave a message..."
\ No newline at end of file
+other = "Please leave a message..."
+
+[404_title]
+other = "The page is not found."
+
+[404_homepage]
+other = "Back to Home"
+
+[404_homepage_url]
+other = "https://test.opengauss.org/en/"
\ No newline at end of file
diff --git a/i18n/zh.toml b/i18n/zh.toml
index 75fdbbd8..83e4b645 100644
--- a/i18n/zh.toml
+++ b/i18n/zh.toml
@@ -44,4 +44,13 @@ other = "博客前准备"
 other = "写博客"
 
 [comment_placeholder]
-other = "说点什么吧..."
\ No newline at end of file
+other = "说点什么吧..."
+
+[404_title]
+other = "没有找到页面"
+
+[404_homepage]
+other = "返回首页"
+
+[404_homepage_url]
+other = "https://test.opengauss.org/zh/"
\ No newline at end of file
diff --git a/themes/hugo-blog-jeffprod/layouts/404.html b/themes/hugo-blog-jeffprod/layouts/404.html
index a767772a..655906d5 100644
--- a/themes/hugo-blog-jeffprod/layouts/404.html
+++ b/themes/hugo-blog-jeffprod/layouts/404.html
@@ -1,9 +1,24 @@
-{{ define "main" }}
+{{ partial "header.html" . }}
 
-<div class="box" id="notFound">
-    <div class="content">
-        Page not found...
+<div id="content">
+    <div class="container">
+
+        <div class="col-sm-6 col-sm-offset-3" id="error-page">
+            <div class="boxs">
+                <h1>404</h1>
+                <h2 class="text-muted">{{ i18n "404_title" }}</h2>
+                <p class="buttons">
+                    <a href="{{ i18n "404_homepage_url" }}" class="btn btn-template-main">
+                        <i class="fa fa-home"></i>{{ i18n "404_homepage" }}
+                    </a>
+                </p>
+            </div>
+
+
+        </div>
+        <!-- /.col-sm-6 -->
     </div>
+    <!-- /.container -->
 </div>
 
-{{ end }}
+{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/themes/hugo-blog-jeffprod/layouts/_default/baseof.html b/themes/hugo-blog-jeffprod/layouts/_default/baseof.html
index 7b5593f8..05f98150 100644
--- a/themes/hugo-blog-jeffprod/layouts/_default/baseof.html
+++ b/themes/hugo-blog-jeffprod/layouts/_default/baseof.html
@@ -1,5 +1,7 @@
 {{ partial "header.html" . }}
 
+{{ partial "detail-banner.html" . }}
+
 
 {{ block "main" . }}{{ end }}
 
diff --git a/themes/hugo-blog-jeffprod/layouts/partials/header.html b/themes/hugo-blog-jeffprod/layouts/partials/header.html
index 2ab52fbf..2bd3e32e 100644
--- a/themes/hugo-blog-jeffprod/layouts/partials/header.html
+++ b/themes/hugo-blog-jeffprod/layouts/partials/header.html
@@ -6,6 +6,8 @@
     <title>{{ .Site.Title }} {{ with .Title }} | {{ . }}{{ end }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
     <!--<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">-->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
     <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css" /> -->
@@ -28,5 +30,4 @@
 </head>
 <body>
   <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
-  <script src='//unpkg.com/valine/dist/Valine.min.js'></script>
-  {{ partial "detail-banner.html" . }}
\ No newline at end of file
+  <script src='//unpkg.com/valine/dist/Valine.min.js'></script>
\ No newline at end of file
diff --git a/themes/hugo-blog-jeffprod/static/css/blog.css b/themes/hugo-blog-jeffprod/static/css/blog.css
index eb13fd09..56c55c30 100644
--- a/themes/hugo-blog-jeffprod/static/css/blog.css
+++ b/themes/hugo-blog-jeffprod/static/css/blog.css
@@ -105,6 +105,7 @@ html,body {
     font-size: 0.44rem;
     margin: 0;
     max-height: 1.6rem;
+    font-weight: bold;
 }
 .article_right h3,
 .article_right>a>p {
@@ -288,4 +289,58 @@ html,body {
 .guidance p,.guidance ol {
     line-height: 0.32rem;
     margin-bottom: 0.2rem;
+}
+
+/* ---------------------------404--------------------------- */
+#error-page {
+    text-align: center;
+    margin-top: 20%;
+    margin-bottom: 100px;
+}
+.boxs {
+    background: #fff;
+    margin: 0 0 30px;
+    border: solid 1px #ccc;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    padding: 20px 0;
+    border-left: none;
+    border-right: none;
+}
+.boxs h1,
+.boxs h2 {
+    font-family: "Roboto", Helvetica, Arial, sans-serif;
+    font-weight: 900;
+    line-height: 1.1;
+}
+.boxs h1 {
+    color: #333333;
+}
+.boxs h2 {
+    color: #777;
+}
+#error-page p.buttons {
+    margin-top: 40px;
+}
+.btn {
+    font-weight: 700;
+    font-family: "Roboto", Helvetica, Arial, sans-serif;
+    text-transform: uppercase;
+    letter-spacing: 0.08em;
+    padding: 6px 12px;
+    font-size: 13px;
+    line-height: 1.42857143;
+    border-radius: 0;
+    border: 1px solid transparent;
+}
+.btn-template-main {
+    color: #467fbf;
+    background-color: #ffffff;
+    border-color: #467fbf;
+}
+.btn-template-main:hover, .btn-template-main:focus, .btn-template-main:active, .btn-template-main.active {
+    background: #467fbf;
+    color: #ffffff;
+    border-color: #467fbf;
 }
\ No newline at end of file
-- 
Gitee