replace warnf by errorf

3 years ago · 4873b6788d
parent d7d1a1306d
commit 4873b6788d
1 changed files with 53 additions and 53 deletions
--- a/layouts/partials/sidebar/left.html
+++ b/layouts/partials/sidebar/left.html
@ -7,28 +7,28 @@

    <header>
        {{ with .Site.Params.sidebar.avatar }}
-            {{ if (default true .enabled) }}
-            <figure class="site-avatar">
-                <a href="{{ .Site.BaseURL | relLangURL }}">
+        {{ if (default true .enabled) }}
+        <figure class="site-avatar">
+            <a href="{{ .Site.BaseURL | relLangURL }}">
                {{ if not .local }}
-                    <img src="{{ .src }}" width="300" height="300" class="site-logo" loading="lazy" alt="Avatar">
+                <img src="{{ .src }}" width="300" height="300" class="site-logo" loading="lazy" alt="Avatar">
                {{ else }}
-                    {{ $avatar := resources.Get (.src) }}
+                {{ $avatar := resources.Get (.src) }}

-                    {{ if $avatar }}
-                        {{ $avatarResized := $avatar.Resize "300x" }}
-                        <img src="{{ $avatarResized.RelPermalink }}" width="{{ $avatarResized.Width }}"
-                            height="{{ $avatarResized.Height }}" class="site-logo" loading="lazy" alt="Avatar">
-                    {{ else }}
-                        {{ errorf "Failed loading avatar from %q" . }}
-                    {{ end }}
+                {{ if $avatar }}
+                {{ $avatarResized := $avatar.Resize "300x" }}
+                <img src="{{ $avatarResized.RelPermalink }}" width="{{ $avatarResized.Width }}"
+                    height="{{ $avatarResized.Height }}" class="site-logo" loading="lazy" alt="Avatar">
+                {{ else }}
+                {{ errorf "Failed loading avatar from %q" . }}
                {{ end }}
-                </a>
-                {{ with $.Site.Params.sidebar.emoji }}
-                    <span class="emoji">{{ . }}</span>
                {{ end }}
-            </figure>
+            </a>
+            {{ with $.Site.Params.sidebar.emoji }}
+            <span class="emoji">{{ . }}</span>
            {{ end }}
+        </figure>
+        {{ end }}
        {{ end }}

        <div class="site-meta">
@ -38,37 +38,36 @@
    </header>

    {{- with .Site.Menus.social -}}
-        <ol class="social-menu">
-            {{ range . }}
-                <li>
-                    <a 
-                        href='{{ .URL }}'
-                        {{ if eq (default true .Params.newTab) true }}target="_blank"{{ end }}
-                        {{ with .Name }}title="{{ . }}"{{ end }}
-                    >
-                        {{ $icon := default "link" .Params.Icon }}
-                        {{ with $icon }}
-                            {{ partial "helper/icon" . }}
-                        {{ end }}
-                    </a>
-                </li>
-            {{ end }}
-        </ol>
+    <ol class="social-menu">
+        {{ range . }}
+        <li>
+            <a href='{{ .URL }}' {{ if eq (default true .Params.newTab) true }}target="_blank" {{ end }} {{ with .Name
+                }}title="{{ . }}" {{ end }}>
+                {{ $icon := default "link" .Params.Icon }}
+                {{ with $icon }}
+                {{ partial "helper/icon" . }}
+                {{ end }}
+            </a>
+        </li>
+        {{ end }}
+    </ol>
    {{- end -}}

    <ol class="menu" id="main-menu">
        {{ $currentPage := . }}
        {{ range .Site.Menus.main }}
-        {{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .)) }}
+        {{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .)
+        ($currentPage.IsMenuCurrent "main" .)) }}

        <li {{ if $active }} class='current' {{ end }}>
-            <a href='{{ .URL | relLangURL }}' {{ if eq .Params.newTab true }}target="_blank"{{ end }}>
+            <a href='{{ .URL | relLangURL }}' {{ if eq .Params.newTab true }}target="_blank" {{ end }}>
                {{ $icon := default .Pre .Params.Icon }}
                {{ if .Pre }}
-                    {{ warnf "Menu item [%s] is using [pre] field to set icon, please use [params.icon] instead.\nMore information: https://docs.stack.jimmycai.com/configuration/custom-menu.html" .URL }}
+                {{ errorf "Menu item [%s] is using [pre] field to set icon, please use [params.icon] instead.\nMore
+                information: https://docs.stack.jimmycai.com/configuration/custom-menu.html" .URL }}
                {{ end }}
                {{ with $icon }}
-                    {{ partial "helper/icon" . }}
+                {{ partial "helper/icon" . }}
                {{ end }}
                <span>{{- .Name -}}</span>
            </a>
@ -78,22 +77,23 @@
        <div class="menu-bottom-section">
            {{- $currentLanguageCode := .Language.Lang -}}
            {{ with .Site.Home.AllTranslations }}
-                <li id="i18n-switch">  
-                    {{ partial "helper/icon" "language" }}
-                    <select name="language" onchange="window.location.href = this.selectedOptions[0].value">
-                        {{ range . }}
-                            <option value="{{ .Permalink }}" {{ if eq .Language.Lang $currentLanguageCode }}selected{{ end }}>{{ .Language.LanguageName }}</option>
-                        {{ end }}
-                    </select>
-                </li>
+            <li id="i18n-switch">
+                {{ partial "helper/icon" "language" }}
+                <select name="language" onchange="window.location.href = this.selectedOptions[0].value">
+                    {{ range . }}
+                    <option value="{{ .Permalink }}" {{ if eq .Language.Lang $currentLanguageCode }}selected{{ end }}>{{
+                        .Language.LanguageName }}</option>
+                    {{ end }}
+                </select>
+            </li>
            {{ end }}

            {{ if (default false .Site.Params.colorScheme.toggle) }}
-                <li id="dark-mode-toggle">
-                    {{ partial "helper/icon" "toggle-left" }}
-                    {{ partial "helper/icon" "toggle-right" }}
-                    <span>{{ T "darkMode" }}</span>
-                </li>
+            <li id="dark-mode-toggle">
+                {{ partial "helper/icon" "toggle-left" }}
+                {{ partial "helper/icon" "toggle-right" }}
+                <span>{{ T "darkMode" }}</span>
+            </li>
            {{ end }}
        </div>
    </ol>