You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2026/03/24 08:19:41 UTC

(skywalking-website) branch master updated: Bump Hugo to v0.159.0 and improve UI (#818)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-website.git


The following commit(s) were added to refs/heads/master by this push:
     new aa7d9a21b8c Bump Hugo to v0.159.0 and improve UI (#818)
aa7d9a21b8c is described below

commit aa7d9a21b8ce8984c4020663321172d97cc7ecfa
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Mar 24 16:19:36 2026 +0800

    Bump Hugo to v0.159.0 and improve UI (#818)
    
    Hugo Upgrade (v0.80.0 → v0.159.0)
    - CI: Updated Hugo download URL in .github/workflows/deploy.yaml
    - Netlify: Added netlify.toml to pin Hugo version for PR previews
    - Deprecated APIs fixed:
      - .Site.IsServer → hugo.IsServer (3 template files)
      - .Site.DisqusShortname → .Site.Config.Services.Disqus.Shortname (8 template files)
      - .Site.Author removed from RSS (unused, no author configured)
      - .Scratch → .Store in RSS template
    - Layout compatibility: Hugo 0.159.0 normalizes type to lowercase and
      no longer allows layout: baseof. Fixed by creating project-level
      layouts/projectdoc/ (lowercase) with proper single.html, using
      index function for .Site.Data access, and hasPrefix for path matching
    - Content fix: Merged duplicate description key in skywalkingday-2021 event
    
    docs.js Improvements
    - Derive doc localPath from link field instead of version, allowing
      version display names with special characters like parentheses
    - Quote shell arguments in execSync calls
    - Fix skywalking-python v1.2.0 link pointing to /next/ instead of /v1.2.0/
    
    UI Improvements
    - Download page: Highlight main downloads (src/tar), dim auxiliary links (asc/sha512)
    - Docs listing dropdown: Added hover effect on dropdown items
    - Scrollbar: Improved styling with track background and better visibility
    - Version selector: Simplified inline layout
---
 .github/workflows/deploy.yaml                     |  4 +-
 assets/scss/_custom_docs.scss                     | 46 +++++++++++++++-
 content/events/skywalkingday-2021/index.md        |  3 +-
 docs.js                                           | 17 +++---
 layouts/projectdoc/baseof.html                    | 67 +++++++++++++++++++++++
 layouts/projectdoc/content.html                   |  3 +
 layouts/projectdoc/list.html                      | 37 +++++++++++++
 layouts/projectdoc/single.html                    |  5 ++
 layouts/shortcodes/downloads-block.html           | 26 ++++++---
 netlify.toml                                      |  6 ++
 themes/docsy/assets/scss/_custom_project_doc.scss |  6 +-
 themes/docsy/assets/scss/_styles_project.scss     | 12 +++-
 themes/docsy/layouts/_default/content.html        |  2 +-
 themes/docsy/layouts/_default/list.rss.xml        | 13 ++---
 themes/docsy/layouts/blog/content.html            |  2 +-
 themes/docsy/layouts/docs/list.html               |  2 +-
 themes/docsy/layouts/downloads/content.html       |  2 +-
 themes/docsy/layouts/events/content.html          |  2 +-
 themes/docsy/layouts/partials/active-scripts.html |  2 +-
 themes/docsy/layouts/partials/disqus-comment.html |  2 +-
 themes/docsy/layouts/partials/head-css.html       |  2 +-
 themes/docsy/layouts/partials/scripts.html        |  2 +-
 themes/docsy/layouts/projectDoc/single.html       |  4 --
 themes/docsy/layouts/swagger/list.html            |  2 +-
 themes/docsy/layouts/zh/content.html              |  2 +-
 25 files changed, 223 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index b5269ffb9bb..75f561ea570 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -35,8 +35,8 @@ jobs:
 
       - name: Install
         run: |
-          wget https://github.com/gohugoio/hugo/releases/download/v0.80.0/hugo_extended_0.80.0_Linux-64bit.tar.gz
-          tar xvf hugo_extended_0.80.0_Linux-64bit.tar.gz
+          wget https://github.com/gohugoio/hugo/releases/download/v0.159.0/hugo_extended_0.159.0_linux-amd64.tar.gz
+          tar xvf hugo_extended_0.159.0_linux-amd64.tar.gz
           sudo mv hugo /usr/bin/
 
       - name: Build
diff --git a/assets/scss/_custom_docs.scss b/assets/scss/_custom_docs.scss
index 06808cdf50b..5ca8fe9c7f8 100644
--- a/assets/scss/_custom_docs.scss
+++ b/assets/scss/_custom_docs.scss
@@ -242,9 +242,53 @@
 
     .dropdown-menu {
       min-width: 6rem;
-      width: 100%;
       max-height: 208px;
       overflow-y: auto;
+
+      .dropdown-item {
+        white-space: nowrap;
+        &:hover {
+          background-color: #f0f0f0;
+        }
+      }
+    }
+  }
+
+  .download-links {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    flex-wrap: wrap;
+
+    .dl-break {
+      flex-basis: 100%;
+      height: 0;
+    }
+
+    .dl-main {
+      background-color: #2B74B8;
+      color: #fff;
+      padding: 2px 10px;
+      border-radius: 3px;
+      font-size: 13px;
+      text-decoration: none;
+      &:hover {
+        background-color: #1e5a94;
+        color: #fff;
+      }
+    }
+
+    .dl-aux {
+      color: #888;
+      font-size: 12px;
+      text-decoration: none;
+      border: 1px solid #ddd;
+      padding: 1px 6px;
+      border-radius: 3px;
+      &:hover {
+        color: #555;
+        border-color: #bbb;
+      }
     }
   }
 
diff --git a/content/events/skywalkingday-2021/index.md b/content/events/skywalkingday-2021/index.md
index 64769ce3268..602c70aab9d 100644
--- a/content/events/skywalkingday-2021/index.md
+++ b/content/events/skywalkingday-2021/index.md
@@ -2,8 +2,7 @@
 title: "SkyWalkingDay Conference 2021, relocating at Beijing"
 date: 2021-06-07
 author: SkyWalking Team
-description: Considering recent COVID19 status of Shenzhen, we have cancelled the Shenzhen event, and NOW we hold it at Beijing.
-description: Apache SkyWalking hosts SkyWalkingDay Conference 2021 in June 26th, jointly with Tencent and Tetrate.
+description: Apache SkyWalking hosts SkyWalkingDay Conference 2021 in June 26th, jointly with Tencent and Tetrate. Considering recent COVID19 status of Shenzhen, we have cancelled the Shenzhen event, and NOW we hold it at Beijing.
 endTime: 2021-06-20T10:00:00Z
 poster: /events/skywalkingday-2021/skywalkingday.png
 ---
diff --git a/docs.js b/docs.js
index 137befb1435..bd4329034c8 100644
--- a/docs.js
+++ b/docs.js
@@ -6,7 +6,7 @@ const {execSync} = require('child_process');
 
 const {promises} = fs;
 const docConfig = './data/docs.yml';
-const layoutTemplateFile = '/themes/docsy/layouts/projectDoc/baseof.html';
+const layoutTemplateFile = '/layouts/projectdoc/baseof.html';
 const NEXT = 'next';
 
 init();
@@ -82,8 +82,8 @@ function replaceMarkdownText(codeTxt, docInfo, filePath) {
     codeTxt =
         `---
 title: ${title}
-type: projectDoc
-layout: baseof
+type: projectdoc
+layout: single
 ---\n` + codeTxt;
     codeTxt = codeTxt
         .replace(/(\[[\s\S]*?\])\(([\s\S]*?)\)/g, function (match, p1, p2) {
@@ -154,8 +154,9 @@ async function traverseDocsList(result) {
         const versionSlug = localPath.split('/').pop();
         commitId = commitId || versionSlug;
         const menuFileName = `${docName.replace(/\-|\./g, '_')}${versionSlug.replace(/\-|v|\./g, '_')}`;
+        const relPath = link.replace(/\/readme\/$/, '/');
 
-        tpl += `{{ if in .File.Path "${localPath.split('/content/')[1]}" }}
+        tpl += `{{ if hasPrefix .RelPermalink "${relPath}" }}
                   <div class="description-wrapper">
                     <h5>
                     <img width="26" height="26" src="/images/project/${icon}.svg">
@@ -163,10 +164,10 @@ async function traverseDocsList(result) {
                     </h5>
                     <p>${description}</p>
                   </div>
-                  {{ $currentVersion := lower .Site.Data.docSidebar.${menuFileName}.version }}
+                  {{ $currentVersion := lower (index .Site.Data.docSidebar "${menuFileName}").version }}
                   <div class="version-wrapper">Version: 
                   <select class="version-select">
-                  {{range .Site.Data.docSidebar.${menuFileName}.repoDocs}}
+                  {{range (index .Site.Data.docSidebar "${menuFileName}").repoDocs}}
                     {{$version := lower .version}}
                     {{$versionName := .versionName}}
                     <option {{ cond (eq $currentVersion $version) "selected" "" }} value="{{$version}}">
@@ -180,8 +181,8 @@ async function traverseDocsList(result) {
                   </select>
                   </div>
                   
-                  {{ partial "sidebar-menu.html" .Site.Data.docSidebar.${menuFileName} }}
-                  <div class="commit-id">Commit Id: {{.Site.Data.docSidebar.${menuFileName}.commitId}}</div>
+                  {{ partial "sidebar-menu.html" (index .Site.Data.docSidebar "${menuFileName}") }}
+                  <div class="commit-id">Commit Id: {{(index .Site.Data.docSidebar "${menuFileName}").commitId}}</div>
                 {{ end }}\n`;
 
         execSync(`"./doc.sh" "${repo}" "${repoUrl}" "${commitId}" "${localPath}" "${menuFileName}"`);
diff --git a/layouts/projectdoc/baseof.html b/layouts/projectdoc/baseof.html
new file mode 100644
index 00000000000..0844fc5e8eb
--- /dev/null
+++ b/layouts/projectdoc/baseof.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<html lang="{{ .Site.Language.Lang }}" class="no-js">
+  <head>
+    {{ partial "head.html" . }}
+    <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
+  </head>
+  <body class="td-{{ .Kind }}  project-doc">
+    <header>
+      {{ partial "navbar.html" . }}
+    </header>
+    <div class="container-fluid td-outer">
+
+      <div class="td-main">
+        <div class="row flex-xl-nowrap">
+          <div class="col-12 col-md-3 col-xl-2 d-print-none scroll-bar td-sidebar">
+
+          </div>
+            <main class="col-12 col-md-9 col-xl-8 pl-md-5 pr-md-4" role="main">
+              <i class="iconfont icon-menu-doc doc-menu-button"></i>
+              {{ block "main" . }}{{ end }}
+            </main>
+          <div id="toc" class="d-none d-xl-block col-xl-2 td-toc d-print-none">
+            {{ partial "toc.html" . }}
+          </div>
+
+        </div>
+      </div>
+
+      {{ partial "footer.html" . }}
+    </div>
+    {{ partial "event-popup.html" . }}
+    {{ partial "lightbox.html" . }}
+    {{ partial "sidebar-skywalking.html" . }}
+    {{ partial "scripts.html" . }}
+  </body>
+  <script>
+    $(function (){
+      $('.doc-menu-button').on('click',function (){
+        $('.td-sidebar').toggleClass('active')
+      })
+      $('.version-select').on('change', function (){
+        var selectVersion = $(this).val().toLowerCase();
+        var prefix = '';
+        var url = location.href.replace(/(\/docs\/[a-zA-Z\-]+\/)([\w|\.]+)(\/.*)/, function (match, p1, p2, p3){
+          prefix = p1 + selectVersion;
+          return p1 + selectVersion + p3
+        })
+        go2SelectVersion(url, prefix)
+
+      })
+      function go2SelectVersion(url, prefix){
+        $.ajax({
+          url: url,
+          type: "get",
+          success:function(){
+            location.href = url;
+          },
+          statusCode: {
+            404:function(){
+              location.href = prefix + '/readme/';
+            }
+          }
+        });
+      }
+    })
+  </script>
+</html>
diff --git a/layouts/projectdoc/content.html b/layouts/projectdoc/content.html
new file mode 100644
index 00000000000..14fdc3559ca
--- /dev/null
+++ b/layouts/projectdoc/content.html
@@ -0,0 +1,3 @@
+<div class="td-content">
+	{{ .Content }}
+</div>
\ No newline at end of file
diff --git a/layouts/projectdoc/list.html b/layouts/projectdoc/list.html
new file mode 100644
index 00000000000..4b32394c57f
--- /dev/null
+++ b/layouts/projectdoc/list.html
@@ -0,0 +1,37 @@
+{{ define "main" }}
+{{ if .Parent.IsHome }}
+{{ $.Scratch.Set "blog-pages" (where .Site.RegularPages "Section" .Section) }}
+{{ else }}
+{{$.Scratch.Set "blog-pages" .Pages }}
+{{ end }}
+{{ $pag := .Paginate (( $.Scratch.Get "blog-pages").GroupByDate (i18n "year" ))}}
+{{ $pageGroups := $pag.PageGroups}}
+{{ if eq $pag.PageNumber 1 }}
+{{ end }}
+<div class="row">
+	<div class="col-12">
+		{{ range $pageGroups }}
+		<h2>{{ T "post_posts_in" }} {{ .Key }}</h2>
+		<ul class="list-unstyled mt-4">
+			{{ range .Pages }}
+			<li class="media mb-4">
+				<div class="media-body">
+					<h5 class="mt-0 mb-1"><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h5>
+					<p class="mb-2 mb-md-3"><small class="text-muted">{{ .Date.Format ($.Param "time_format_blog") }} {{ T "ui_in"}} {{ .CurrentSection.LinkTitle }}</small></p>
+					{{ partial "featured-image.html" (dict "p" . "w" 250 "h" 125 "class" "float-left mr-3 pt-1 d-none d-md-block") }}
+					<p class="pt-0 mt-0">{{ .Plain | safeHTML | truncate 250 }}</p>
+					<p class="pt-0 mt-0">{{ .Description }}</p>
+					<p class="pt-0"><a href="{{ .RelPermalink }}">{{ T "ui_read_more"}}</a></p>
+				</div>
+			</li>
+			{{ end }}
+		</ul>
+		{{ end }}
+	</div>
+</div>
+<div class="row pl-2 pt-2">
+	<div class="col">
+		{{ template "_internal/pagination.html" . }}
+	</div>
+</div>
+{{ end }}
diff --git a/layouts/projectdoc/single.html b/layouts/projectdoc/single.html
new file mode 100644
index 00000000000..dcfadaf748e
--- /dev/null
+++ b/layouts/projectdoc/single.html
@@ -0,0 +1,5 @@
+{{ define "main" }}
+<div class="td-content">
+	{{ .Content }}
+</div>
+{{ end }}
diff --git a/layouts/shortcodes/downloads-block.html b/layouts/shortcodes/downloads-block.html
index a422c507584..96fed6d427d 100755
--- a/layouts/shortcodes/downloads-block.html
+++ b/layouts/shortcodes/downloads-block.html
@@ -66,11 +66,16 @@
                     {{ range .source }}
                     <h6 class="dropdown-header">{{.version}}<span> | {{.date}}</span></h6>
                     {{ $version := .version }}
-                    <div class="dropdown-item">
+                    <div class="dropdown-item download-links">
                       {{range .downloadLink}}
-                      {{ if eq .name "|" }}<br>{{ else }}
-                      [<a href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]"
-                          rel="noopener noreferrer" target="_blank">{{.name}}</a>]
+                      {{ if eq .name "|" }}<div class="dl-break"></div>{{ else }}
+                      {{ if or (eq .name "asc") (eq .name "sha512") }}
+                      <a class="dl-aux" href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]"
+                          rel="noopener noreferrer" target="_blank" title="{{.name}}">{{.name}}</a>
+                      {{ else }}
+                      <a class="dl-main" href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]"
+                          rel="noopener noreferrer" target="_blank">{{.name}}</a>
+                      {{ end }}
                       {{ end }}
                       {{end}}
                     </div>
@@ -92,11 +97,16 @@
                   {{ range .distribution }}
                   <h6 class="dropdown-header">{{.version}}<span> | {{.date}}</span></h6>
                   {{ $version := .version }}
-                  <div class="dropdown-item">
+                  <div class="dropdown-item download-links">
                     {{range .downloadLink}}
-                    {{ if eq .name "|" }}<br>{{ else }}
-                    [<a href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]"
-                        rel="noopener noreferrer" target="_blank">{{.name}}</a>]
+                    {{ if eq .name "|" }}<div class="dl-break"></div>{{ else }}
+                    {{ if or (eq .name "asc") (eq .name "sha512") }}
+                    <a class="dl-aux" href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]"
+                        rel="noopener noreferrer" target="_blank" title="{{.name}}">{{.name}}</a>
+                    {{ else }}
+                    <a class="dl-main" href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]"
+                        rel="noopener noreferrer" target="_blank">{{.name}}</a>
+                    {{ end }}
                     {{ end }}
                     {{end}}
                   </div>
diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 00000000000..8080af9a708
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,6 @@
+[build]
+  command = "npm run build-preview"
+  publish = "public"
+
+[build.environment]
+  HUGO_VERSION = "0.159.0"
diff --git a/themes/docsy/assets/scss/_custom_project_doc.scss b/themes/docsy/assets/scss/_custom_project_doc.scss
index 5ad9482055e..8ca014738f7 100644
--- a/themes/docsy/assets/scss/_custom_project_doc.scss
+++ b/themes/docsy/assets/scss/_custom_project_doc.scss
@@ -23,12 +23,12 @@
     }
   }
   .version-select{
-    vertical-align: middle;
     margin-left: 5px;
     color: #2c3e50;
     border: 1px solid #dee2e6;
     border-radius: 2px;
     outline: none;
+    text-align: left;
   }
 
   .td-sidebar {
@@ -39,6 +39,7 @@
     height: 100vh;
     overflow-y: scroll;
     overflow-y: overlay;
+    overflow-x: hidden;
     position: sticky;
     position: -webkit-sticky;
     top: 0px;
@@ -53,10 +54,9 @@
     }
 
     .version-wrapper {
-      padding-top: 10px;
+      padding: 10px 11px 0 8px;
       font-weight: 400;
       font-size: 16px;
-      text-indent: 8px;
       line-height: 1.5;
       margin-top: 0;
       margin-bottom: 0.5rem;
diff --git a/themes/docsy/assets/scss/_styles_project.scss b/themes/docsy/assets/scss/_styles_project.scss
index 9fd338ed88a..e8b9b5a6202 100644
--- a/themes/docsy/assets/scss/_styles_project.scss
+++ b/themes/docsy/assets/scss/_styles_project.scss
@@ -173,11 +173,21 @@ table {
 }
 
 .scroll-bar {
+  scrollbar-width: thin;
+  scrollbar-color: #999 #f0f0f0;
   &::-webkit-scrollbar {
     width: 5px;
+    height: 5px;
+    -webkit-appearance: none;
+  }
+  &::-webkit-scrollbar-track {
+    background-color: #f0f0f0;
   }
   &::-webkit-scrollbar-thumb {
-    background-color: #bebebe !important;
+    background-color: #999 !important;
     border-radius: 2px;
+    &:hover {
+      background-color: #666 !important;
+    }
   }
 }
diff --git a/themes/docsy/layouts/_default/content.html b/themes/docsy/layouts/_default/content.html
index b574ad29c32..84ae93399ed 100644
--- a/themes/docsy/layouts/_default/content.html
+++ b/themes/docsy/layouts/_default/content.html
@@ -6,7 +6,7 @@
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 	{{ end }}
diff --git a/themes/docsy/layouts/_default/list.rss.xml b/themes/docsy/layouts/_default/list.rss.xml
index b74bc357941..86be665947c 100644
--- a/themes/docsy/layouts/_default/list.rss.xml
+++ b/themes/docsy/layouts/_default/list.rss.xml
@@ -4,9 +4,7 @@
     <link>{{ .Permalink }}</link>
     <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
     <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
-    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
-    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+    <language>{{.}}</language>{{end}}{{ with .Site.Copyright }}
     <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
     <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
     {{ with .OutputFormats.Get "RSS" }}
@@ -14,20 +12,19 @@
     {{ end }}
     {{ if not $.Section }}
       {{ $sections := .Site.Params.rss_sections | default (slice "blog") }}
-      {{ .Scratch.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
+      {{ .Store.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
     {{ else }}
       {{ if $.Parent.IsHome }}
-        {{ .Scratch.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
+        {{ .Store.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
       {{ else }}
-        {{ .Scratch.Set "rss_pages" (first 50 $.Pages) }}
+        {{ .Store.Set "rss_pages" (first 50 $.Pages) }}
       {{ end }}
     {{ end }}
-    {{ range (.Scratch.Get "rss_pages")  }}
+    {{ range (.Store.Get "rss_pages")  }}
     <item>
       <title>{{ .Section | title }}: {{ .Title }}</title>
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}</guid>
       <description>
         {{ $img := (.Resources.ByType "image").GetMatch "*featured*" }}
diff --git a/themes/docsy/layouts/blog/content.html b/themes/docsy/layouts/blog/content.html
index 85903579ab6..7c40a1869e6 100644
--- a/themes/docsy/layouts/blog/content.html
+++ b/themes/docsy/layouts/blog/content.html
@@ -18,7 +18,7 @@
 
 	</div>
 	{{ .Content }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 		<br />
diff --git a/themes/docsy/layouts/docs/list.html b/themes/docsy/layouts/docs/list.html
index 712247801a0..908403af9f9 100644
--- a/themes/docsy/layouts/docs/list.html
+++ b/themes/docsy/layouts/docs/list.html
@@ -8,7 +8,7 @@
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 	{{ end }}
diff --git a/themes/docsy/layouts/downloads/content.html b/themes/docsy/layouts/downloads/content.html
index b574ad29c32..84ae93399ed 100644
--- a/themes/docsy/layouts/downloads/content.html
+++ b/themes/docsy/layouts/downloads/content.html
@@ -6,7 +6,7 @@
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 	{{ end }}
diff --git a/themes/docsy/layouts/events/content.html b/themes/docsy/layouts/events/content.html
index 7193b191d7b..dae7acc98c6 100644
--- a/themes/docsy/layouts/events/content.html
+++ b/themes/docsy/layouts/events/content.html
@@ -6,7 +6,7 @@
 		<time datetime="{{  $.Date.Format "2006-01-02" }}" class="text-muted">{{ $.Date.Format $.Site.Params.time_format_blog  }}</time>
 	</div>
 	{{ .Content }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 		<br />
diff --git a/themes/docsy/layouts/partials/active-scripts.html b/themes/docsy/layouts/partials/active-scripts.html
index a1b16f05a3b..ba7c3b1a31e 100644
--- a/themes/docsy/layouts/partials/active-scripts.html
+++ b/themes/docsy/layouts/partials/active-scripts.html
@@ -1,6 +1,6 @@
 {{ $jsActive := resources.Get "js/active.js" }}
 {{ $js := (slice $jsActive) | resources.Concat "js/active.js" }}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
 <script src="{{ $js.RelPermalink }}"></script>
 {{ else }}
 {{ $js := $js | minify | fingerprint }}
diff --git a/themes/docsy/layouts/partials/disqus-comment.html b/themes/docsy/layouts/partials/disqus-comment.html
index c3ae3f91b3b..f7406c48482 100644
--- a/themes/docsy/layouts/partials/disqus-comment.html
+++ b/themes/docsy/layouts/partials/disqus-comment.html
@@ -14,7 +14,7 @@ this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your pag
 */
 (function() { // DON'T EDIT BELOW THIS LINE
 var d = document, s = d.createElement('script');
-s.src = 'https://' + {{ .Site.DisqusShortname }} + '.disqus.com/embed.js';
+s.src = 'https://' + {{ .Site.Config.Services.Disqus.Shortname }} + '.disqus.com/embed.js';
 s.setAttribute('data-timestamp', +new Date());
 (d.head || d.body).appendChild(s);
 })();
diff --git a/themes/docsy/layouts/partials/head-css.html b/themes/docsy/layouts/partials/head-css.html
index 86952b18395..0d2cae5ae76 100644
--- a/themes/docsy/layouts/partials/head-css.html
+++ b/themes/docsy/layouts/partials/head-css.html
@@ -1,5 +1,5 @@
 {{ $scssMain := "scss/main.scss"}}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
 {{/* Note the missing postCSS. This makes it snappier to develop in Chrome, but makes it look sub-optimal in other browsers. */}}
 {{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" true) }}
 <link href="{{ $css.RelPermalink }}" rel="stylesheet">
diff --git a/themes/docsy/layouts/partials/scripts.html b/themes/docsy/layouts/partials/scripts.html
index 77a58c48c82..c043dee4988 100644
--- a/themes/docsy/layouts/partials/scripts.html
+++ b/themes/docsy/layouts/partials/scripts.html
@@ -8,7 +8,7 @@
 {{ $algolia := resources.Get "js/algolia-search.js" }}
 {{ $event := resources.Get "js/event-popup.js" }}
 {{ $js := (slice $jsAnchor $jsLightbox $jsSlider $algolia $event) | resources.Concat "js/main.js" }}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
 <script src="{{ $js.RelPermalink }}"></script>
 {{ else }}
 {{ $js := $js | minify | fingerprint }}
diff --git a/themes/docsy/layouts/projectDoc/single.html b/themes/docsy/layouts/projectDoc/single.html
deleted file mode 100644
index b3f6f16ef9b..00000000000
--- a/themes/docsy/layouts/projectDoc/single.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ define "main" }}
-{{ .Render "content" }}
-{{ partial "edit-this-page.html" . }}
-{{ end }}
\ No newline at end of file
diff --git a/themes/docsy/layouts/swagger/list.html b/themes/docsy/layouts/swagger/list.html
index 712247801a0..908403af9f9 100644
--- a/themes/docsy/layouts/swagger/list.html
+++ b/themes/docsy/layouts/swagger/list.html
@@ -8,7 +8,7 @@
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 	{{ end }}
diff --git a/themes/docsy/layouts/zh/content.html b/themes/docsy/layouts/zh/content.html
index 674afa1c06d..82f747bc0f0 100644
--- a/themes/docsy/layouts/zh/content.html
+++ b/themes/docsy/layouts/zh/content.html
@@ -16,7 +16,7 @@
 
 	</div>
 	{{ .Content }}
-	{{ if (.Site.DisqusShortname) }}
+	{{ if (.Site.Config.Services.Disqus.Shortname) }}
 		<br />
 		{{ partial "disqus-comment.html" . }}
 		<br />