From a8cf01142fb5288a32e5e8dcacd2913d845999b6 Mon Sep 17 00:00:00 2001
From: nineya <361654768@qq.com>
Date: Tue, 18 Jul 2023 09:14:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(link):=20=E4=BF=AE=E5=A4=8D=E5=8F=8B?=
 =?UTF-8?q?=E9=93=BE=E8=AF=84=E8=AE=BA=E5=8C=BA=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/links.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/links.html b/templates/links.html
index f396166..7bb81bd 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -9,9 +9,7 @@
             </div>
             <div class="card-content main">
                 <h1 class="title" th:text="'友情链接 - ' + ${contributor.displayName} + '的小伙伴们'"></h1>
-                <div class="main-content"
-                     th:data-id="${theme.config.page_config.link_comment_id}"
-                     data-target="SinglePage">
+                <div class="main-content">
                     <th:block th:each="group : ${groups}">
                         <div th:if="${!#lists.isEmpty(group.links)}" class="links">
                             <h3 class="link-title" th:text="${#strings.defaultString(group.spec.displayName, '小伙伴们')}" th:id="'toc' + ${groupStat.index}"></h3>
@@ -48,9 +46,9 @@
                 </div>
             </div>
         </div>
-        <div class="card card-content" id="comment-wrapper" th:if="${pluginFinder.available('PluginCommentWidget') && !#strings.isEmpty(theme.config.page_config.link_comment_id)}">
+        <div class="card card-content" id="comment-wrapper" th:if="${pluginFinder.available('PluginCommentWidget') && enableComment}">
             <h3 class="comment-title">评论</h3>
-            <div id="comment"></div>
+            <div class="widget-comment" th:data-id="${theme.config.page_config.link_comment_id}" data-target="SinglePage"></div>
         </div>
     </th:block>
 </th:block>
\ No newline at end of file

From ae4eb238a76f456bbe8164a62b5fc088f5502384 Mon Sep 17 00:00:00 2001
From: nineya <361654768@qq.com>
Date: Wed, 19 Jul 2023 13:56:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(link):=20=E4=BF=AE=E5=A4=8D=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/common/navbar.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/common/navbar.html b/templates/common/navbar.html
index 7055716..cf1e493 100644
--- a/templates/common/navbar.html
+++ b/templates/common/navbar.html
@@ -14,7 +14,7 @@
                     <a th:if="${#lists.isEmpty(menuItem.children)}"
                        class="item"
                        th:href="${menuItem.status.href}"
-                       th:target="${menuItem.spec.target}"
+                       th:target="${menuItem.spec.target?.value}"
                        th:title="${menuItem.status.displayName}">
                         <i th:if="${!#strings.isEmpty(#annotations.getOrDefault(menuItem, 'icon', ''))}"
                            th:class="${'m-icon ' + #annotations.getOrDefault(menuItem, 'icon', '')}"></i>
@@ -24,7 +24,7 @@
                         <div class="item-dropdown-link">
                             <a class="item"
                                th:href="${#strings.defaultString(menuItem.status.href, 'javascript:')}"
-                               th:target="${menuItem.spec.target}"
+                               th:target="${menuItem.spec.target?.value}"
                                th:title="${menuItem.status.displayName}">
                                 <i th:if="${!#strings.isEmpty(#annotations.getOrDefault(menuItem, 'icon', ''))}"
                                    th:class="${'m-icon ' + #annotations.getOrDefault(menuItem, 'icon', '')}"></i>
@@ -36,7 +36,7 @@
                             <li th:each="dropdown : ${menuItem.children}" class="item-sub-li">
                                 <a class="item"
                                    th:href="${#strings.defaultString(dropdown.status.href, 'javascript:')}"
-                                   th:target="${dropdown.spec.target}"
+                                   th:target="${dropdown.spec.target?.value}"
                                    th:title="${dropdown.status.displayName}">
                                     <i th:if="${!#strings.isEmpty(#annotations.getOrDefault(dropdown, 'icon', ''))}"
                                        th:class="${'m-icon ' + #annotations.getOrDefault(dropdown, 'icon', '')}"></i>
@@ -46,7 +46,7 @@
                                     <li th:each="dropdownChild : ${dropdown.children}">
                                         <a class="item"
                                            th:href="${dropdownChild.status.href}"
-                                           th:target="${dropdownChild.spec.target}"
+                                           th:target="${dropdownChild.spec.target?.value}"
                                            th:title="${dropdownChild.status.displayName}">
                                             <i th:if="${!#strings.isEmpty(#annotations.getOrDefault(dropdownChild, 'icon', ''))}"
                                                th:class="${'m-icon ' + #annotations.getOrDefault(dropdownChild, 'icon', '')}"></i>
@@ -68,7 +68,7 @@
             <div class="navbar-slideout-author">
                 <img width="50" height="50" th:src="${contributor.avatar}" th:alt="${contributor.displayName}" class="avatar"/>
                 <div class="info">
-                    <a class="link" target="_blank" rel="noopener noreferrer nofollow" th:text="${contributor.displayName}"></a>
+                    <p class="link" th:text="${contributor.displayName}"></p>
                     <p class="motto" th:text="${contributor.bio}"></p>
                 </div>
             </div>