fix: 修复标题不显示和标题样式的问题

fix: 分类页标题each循环错误
AirboZH · Oct 12, 2023 · 7290f84 · 7290f84
1 parent bf8a4a4
commit 7290f84
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 195 deletions.
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +213,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/templates/categories.html b/templates/categories.html
@@ -11,85 +11,88 @@
     <span>分类</span>
   </th:block>
 
-  <th:block th:each="category,index : ${categories}" th:fragment="content">
-    <div class="card categories">
-      <!-- top-category -->
-      <div
-        class="card-header d-flex justify-content-between hide-border-bottom"
-        th:id="'h_' + ${index.count}"
-      >
-        <!-- not have subcategory -->
-        <th:block th:if="${#lists.isEmpty(category.children)}">
-          <span class="ms-2">
-            <i class="far fa-folder fa-fw"></i>
-            <a class="mx-2" th:href="${category.status.permalink}"
+  <th:block th:fragment="content">
+    <h1 class="dynamic-title">分类</h1>
+    <div class="content">
+      <div class="card categories" th:each="category,index : ${categories}">
+        <!-- top-category -->
+        <div
+          class="card-header d-flex justify-content-between hide-border-bottom"
+          th:id="'h_' + ${index.count}"
+        >
+          <!-- not have subcategory -->
+          <th:block th:if="${#lists.isEmpty(category.children)}">
+            <span class="ms-2">
+              <i class="far fa-folder fa-fw"></i>
+              <a class="mx-2" th:href="${category.status.permalink}"
               >[[${category.spec.displayName}]]</a
+              >
+              <!-- content count -->
+              <span class="text-muted small font-weight-light">
+                [[${category.status.visiblePostCount} + ' 篇文章']]
+              </span>
+            </span>
+            <!-- arrow -->
+            <span
+              class="category-trigger hide-border-bottom disabled"
+              data-bs-toggle="collapse"
+              th:if="${#lists.isEmpty(category.children)}"
             >
-            <!-- content count -->
-            <span class="text-muted small font-weight-light">
-              [[${category.status.visiblePostCount} + ' 篇文章']]
+              <i class="fas fa-fw fa-angle-right"></i>
             </span>
-          </span>
-          <!-- arrow -->
-          <span
-            class="category-trigger hide-border-bottom disabled"
-            data-bs-toggle="collapse"
-            th:if="${#lists.isEmpty(category.children)}"
-          >
-            <i class="fas fa-fw fa-angle-right"></i>
-          </span>
-        </th:block>
-        <!-- have subcategory -->
-        <th:block th:if="${!#lists.isEmpty(category.children)}">
-          <span class="ms-2">
-            <i class="far fa-folder-open fa-fw"></i>
-            <a class="mx-2" th:href="${category.status.permalink}"
+          </th:block>
+          <!-- have subcategory -->
+          <th:block th:if="${!#lists.isEmpty(category.children)}">
+            <span class="ms-2">
+              <i class="far fa-folder-open fa-fw"></i>
+              <a class="mx-2" th:href="${category.status.permalink}"
               >[[${category.spec.displayName}]]</a
-            >
-            <!-- content count -->
-            <span class="text-muted small font-weight-light">
-              [[${#lists.size(category.children)} + '个分类 ' +
-              ${category.status.visiblePostCount} + ' 篇文章']]
+              >
+              <!-- content count -->
+              <span class="text-muted small font-weight-light">
+                [[${#lists.size(category.children)} + '个分类 ' +
+                ${category.status.visiblePostCount} + ' 篇文章']]
+              </span>
             </span>
-          </span>
-          <!-- arrow -->
-          <a
-            aria-expanded="true"
-            class="category-trigger hide-border-bottom"
-            data-bs-toggle="collapse"
-            th:aria-label="'h_' + ${index.count} + '-trigger'"
-            th:href="'#l_' + ${index.count}"
-          >
-            <i class="fas fa-fw fa-angle-down"></i>
-          </a>
-        </th:block>
-      </div>
+            <!-- arrow -->
+            <a
+              aria-expanded="true"
+              class="category-trigger hide-border-bottom"
+              data-bs-toggle="collapse"
+              th:aria-label="'h_' + ${index.count} + '-trigger'"
+              th:href="'#l_' + ${index.count}"
+            >
+              <i class="fas fa-fw fa-angle-down"></i>
+            </a>
+          </th:block>
+        </div>
 
-      <!-- Sub-categories -->
-      <div
-        aria-expanded="true"
-        class="collapse show"
-        th:id="'l_' + ${index.count}"
-        th:if="${!#lists.isEmpty(category.children)}"
-      >
-        <ul
-          class="list-group"
-          th:each="subcategory,index : ${category.children}"
+        <!-- Sub-categories -->
+        <div
+          aria-expanded="true"
+          class="collapse show"
+          th:id="'l_' + ${index.count}"
+          th:if="${!#lists.isEmpty(category.children)}"
         >
-          <li class="list-group-item">
-            <i class="far fa-folder fa-fw"></i>
+          <ul
+            class="list-group"
+            th:each="subcategory,index : ${category.children}"
+          >
+            <li class="list-group-item">
+              <i class="far fa-folder fa-fw"></i>
 
-            <a class="mx-2" th:href="${subcategory.status.permalink}"
+              <a class="mx-2" th:href="${subcategory.status.permalink}"
               >[[${subcategory.spec.displayName}]]</a
-            >
+              >
 
-            <span class="text-muted small font-weight-light">
-              [[${subcategory.status.visiblePostCount} + ' 篇文章']]
-            </span>
-          </li>
-        </ul>
+              <span class="text-muted small font-weight-light">
+                [[${subcategory.status.visiblePostCount} + ' 篇文章']]
+              </span>
+            </li>
+          </ul>
+        </div>
       </div>
+      <!-- .card -->
     </div>
-    <!-- .card -->
   </th:block>
 </html>
diff --git a/templates/error/error.html b/templates/error/error.html
@@ -1,14 +1,17 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{modules/layout :: html(title = ${error.status} + ': ' + ${#strings.defaultString(error.title, 'Internal server error')}, 
+  th:replace="~{modules/layout :: html(title = ${error.status} + ': ' + ${#strings.defaultString(error.title, 'Internal server error')},
   content = ~{::content}, layout = 'error' ,breadcrumb = ~{::breadcrumb})}"
 >
   <th:block th:fragment="breadcrumb">
     <span>
       <a href="/">首页</a>
     </span>
-    <span>[[${error.status} + ': ' + ${#strings.defaultString(error.title, 'Internal server error')}]]</span>
+    <span
+    >[[${error.status} + ': ' + ${#strings.defaultString(error.title,
+      'Internal server error')}]]</span
+    >
   </th:block>
   <th:block th:fragment="content">
     <div class="content">

diff --git a/templates/modules/layout.html b/templates/modules/layout.html
@@ -22,7 +22,6 @@
             </th:block>
             <th:block th:case="*">
               <article class="px-1">
-                <h1 class="dynamic-title">[[${title}]]</h1>
                 <th:block th:replace="${content}" />
               </article>
             </th:block>