update theme and csci-1100 hw8
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
{{- define "title" -}}
|
||||
{{- .Title -}}
|
||||
{{- title .Title -}}
|
||||
{{- if .Site.Params.withSiteTitle }} {{ .Site.Params.titleDelimiter }} {{ .Site.Title }}{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "content" -}}
|
||||
{{- $title := title .Title -}}
|
||||
{{- $params := partial "function/params.html" -}}
|
||||
{{- $toc := .Scratch.Get "toc" -}}
|
||||
{{- $tocEmpty := eq .TableOfContents `<nav id="TableOfContents"></nav>` -}}
|
||||
@@ -11,8 +12,12 @@
|
||||
<aside class="aside-collection animate__animated animate__fadeIn animate__faster" aria-label="{{ T "collections" }}">
|
||||
{{- /* Collection List */ -}}
|
||||
{{- partial "single/collection-list.html" . -}}
|
||||
{{- /* Custom part for aside */ -}}
|
||||
{{- partial (.Scratch.Get "customFilePath").aside . -}}
|
||||
|
||||
{{- /* TODO Related Content */ -}}
|
||||
{{/* {{- partial "single/related.html" . -}} */}}
|
||||
|
||||
{{- /* Custom Aside */ -}}
|
||||
{{- block "custom-aside" . }}{{ end -}}
|
||||
</aside>
|
||||
|
||||
<article class="page single">
|
||||
@@ -84,50 +89,44 @@
|
||||
<!--{{- $comment := .Scratch.Get "comment" | default dict -}}
|
||||
{{- $visitorIcon := dict "Class" "fa-regular fa-eye fa-fw me-1" | partial "plugin/icon.html" -}}
|
||||
{{- $commentIcon := dict "Class" "fa-regular fa-comments fa-fw me-1" | partial "plugin/icon.html" -}}
|
||||
{{- if $comment.enable -}}
|
||||
{{- /* Visitor Count */ -}}
|
||||
{{- if $comment.artalk.enable -}}
|
||||
<span class="comment-visitors" data-flag-title="{{ .Title }}">
|
||||
{{ $visitorIcon }}<span class="artalk-visitor-count" data-page-key="{{ .RelPermalink }}">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if ($comment.valine.enable | and $comment.valine.visitor) -}}
|
||||
<span id="{{ .RelPermalink }}" class="leancloud_visitors comment-visitors" data-flag-title="{{ .Title }}">
|
||||
{{ $visitorIcon }}<span class="leancloud-visitors-count">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if $comment.waline.enable | and $comment.waline.pageview -}}
|
||||
<span class="comment-visitors" data-flag-title="{{ .Title }}">
|
||||
{{ $visitorIcon }}<span data-path="{{ .RelPermalink }}" class="waline-pageview-count">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if $comment.twikoo.enable | and $comment.twikoo.visitor -}}
|
||||
<span id="{{ .RelPermalink }}" class="comment-visitors" data-flag-title="{{ .Title }}">
|
||||
{{ $visitorIcon }}<span id="twikoo_visitors">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if .Site.Params.ibruce.enable | and .Site.Params.ibruce.enablePost -}}
|
||||
<span id="busuanzi_container_page_pv" class="busuanzi_visitors comment-visitors" data-flag-title="{{ .Title }}">
|
||||
{{ $visitorIcon }}<span id="busuanzi_value_page_pv">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- end -}}
|
||||
{{- else if .Site.Params.ibruce.enable | and .Site.Params.ibruce.enablePost -}}
|
||||
<span id="busuanzi_container_page_pv" class="busuanzi_visitors comment-visitors" data-flag-title="{{ .Title }}">
|
||||
{{ $visitorIcon }}<span id="busuanzi_value_page_pv">-</span> {{ T "single.views" }}
|
||||
{{- if $comment.enable | and $comment.artalk.enable -}}
|
||||
<span class="comment-visitors" data-flag-title="{{ $title }}">
|
||||
{{- $visitorIcon }}<span class="artalk-visitor-count" data-page-key="{{ .RelPermalink }}">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if $comment.enable | and $comment.valine.enable | and $comment.valine.visitor -}}
|
||||
<span id="{{ .RelPermalink }}" class="leancloud_visitors comment-visitors" data-flag-title="{{ $title }}">
|
||||
{{- $visitorIcon }}<span class="leancloud-visitors-count">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if $comment.enable | and $comment.waline.enable | and $comment.waline.pageview -}}
|
||||
<span class="comment-visitors" data-flag-title="{{ $title }}">
|
||||
{{- $visitorIcon }}<span data-path="{{ .RelPermalink }}" class="waline-pageview-count">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if $comment.enable | and $comment.twikoo.enable | and $comment.twikoo.visitor -}}
|
||||
<span id="{{ .RelPermalink }}" class="comment-visitors" data-flag-title="{{ $title }}">
|
||||
{{- $visitorIcon }}<span id="twikoo_visitors">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- else if .Site.Params.busuanzi.enable | and .Site.Params.busuanzi.pageViews | and hugo.IsProduction -}}
|
||||
<span id="busuanzi_container_page_pv" class="busuanzi_visitors comment-visitors" data-flag-title="{{ $title }}">
|
||||
{{- $visitorIcon }}<span id="busuanzi_value_page_pv">-</span> {{ T "single.views" }}
|
||||
</span>
|
||||
{{- end -}}
|
||||
{{- /* Comment Count */ -}}
|
||||
{{- if $comment.enable -}}
|
||||
{{- if $comment.artalk.enable -}}
|
||||
<span class="comment-count" data-flag-title="{{ .Title }}">
|
||||
<span class="comment-count" data-flag-title="{{ $title }}">
|
||||
{{ $commentIcon }}<span class="artalk-comment-count" data-page-key="{{ .RelPermalink }}">-</span> {{ T "single.comments" }}
|
||||
</span>
|
||||
{{- else if $comment.valine.enable | and $comment.valine.commentCount -}}
|
||||
<span class="comment-count" data-flag-title="{{ .Title }}">
|
||||
<span class="comment-count" data-flag-title="{{ $title }}">
|
||||
{{ $commentIcon }}<span data-xid="{{ .RelPermalink }}" class="valine-comment-count">-</span> {{ T "single.comments" }}
|
||||
</span>
|
||||
{{- else if $comment.waline.enable | and $comment.waline.comment -}}
|
||||
<span class="comment-count" data-flag-title="{{ .Title }}">
|
||||
<span class="comment-count" data-flag-title="{{ $title }}">
|
||||
{{ $commentIcon }}<span data-path="{{ .RelPermalink }}" class="waline-comment-count">-</span> {{ T "single.comments" }}
|
||||
</span>
|
||||
{{- else if $comment.twikoo.enable | and $comment.twikoo.commentCount -}}
|
||||
<span id="{{ .RelPermalink }}" class="comment-count" data-flag-title="{{ .Title }}">
|
||||
<span id="{{ .RelPermalink }}" class="comment-count" data-flag-title="{{ $title }}">
|
||||
{{ $commentIcon }}<span id="twikoo-comment-count">-</span> {{ T "single.comments" }}
|
||||
</span>
|
||||
{{- end -}}
|
||||
@@ -161,21 +160,7 @@
|
||||
|
||||
{{- /* Content */ -}}
|
||||
{{- $content := dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}}
|
||||
{{- if $params.password -}}
|
||||
{{- $saltLen := strings.RuneCount (trim $params.password "") -}}
|
||||
{{- $saltLen = cond (eq (mod $saltLen 2) 0) (add $saltLen 1) $saltLen -}}
|
||||
{{- $base64EncodeContent := $content | base64Encode -}}
|
||||
{{- $content = printf "%v%v%v"
|
||||
(substr $base64EncodeContent 0 $saltLen)
|
||||
(substr (sha256 $params.password) $saltLen)
|
||||
(substr $base64EncodeContent $saltLen)
|
||||
-}}
|
||||
{{- end -}}
|
||||
<div class="content" id="content"
|
||||
{{- with $params.endFlag }} data-end-flag="{{ . }}"{{- end -}}
|
||||
{{- with $params.password }} data-password="{{ md5 . }}"{{- end -}}
|
||||
{{- with $params.password }} data-content="{{ $content }}"{{- end -}}
|
||||
>
|
||||
<div class="content" id="content"{{ with $params.endFlag }} data-end-flag="{{ . }}"{{ end }}>
|
||||
{{- if not $params.password -}}
|
||||
{{- /* Expiration Reminder */ -}}
|
||||
{{- partial "single/expiration-reminder.html" . -}}
|
||||
@@ -195,17 +180,23 @@
|
||||
{{- /* Collection Navigation */ -}}
|
||||
{{- partial "single/collection-nav.html" . -}}
|
||||
|
||||
{{- /* FixIt Decryptor */ -}}
|
||||
{{- partial "single/fixit-decryptor.html" . -}}
|
||||
{{- /* Content Encryption */ -}}
|
||||
{{- dict "Content" $content "Password" $params.password "Message" $params.message | partial "plugin/fixit-encryptor.html" -}}
|
||||
|
||||
{{- /* Custom block before post footer */ -}}
|
||||
{{- block "custom-post__footer:before" . }}{{ end -}}
|
||||
|
||||
{{- /* Footer */ -}}
|
||||
{{- partial "single/footer.html" . -}}
|
||||
|
||||
{{- /* Reward after Footer */ -}}
|
||||
{{- /* Reward after post footer */ -}}
|
||||
{{- if eq $reward.position "after" -}}
|
||||
{{- partial "single/reward.html" . -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- /* Custom block after post footer */ -}}
|
||||
{{- block "custom-post__footer:after" . }}{{ end -}}
|
||||
|
||||
{{- /* Comment */ -}}
|
||||
{{- partial "single/comment.html" . -}}
|
||||
</article>
|
||||
|
||||
Reference in New Issue
Block a user