修复搜索页面顶部边距样式

增加控制台按钮跳转地址及跳转方式设置

settings.yaml

@@ -98,6 +98,8 @@ spec:
             show_console: false
             console_icon: ri-equalizer-line
             console_title: 控制台
+            console_url: '/console'
+            console_target: _blank
           children:
             - $formkit: radio
               name: show_console
@@ -111,11 +113,28 @@ spec:
             - $formkit: text
               name: console_icon
               if: $get(show_console).value
-              label: 控制台图标，留空显示默认图标
+              label: 控制台图标
+              help: '控制台图标，留空显示默认图标。'
             - $formkit: text
               name: console_title
               if: $get(show_console).value
               label: 控制台鼠标悬停提示，留空不显示
+            - $formkit: text
+              name: console_url
+              validation: required
+              if: $get(show_console).value
+              label: 控制台跳转URL
+              help: '控制台跳转URL，可使用“redirect_uri”参数进行登录后跳转，例如：“/login?redirect_uri=/”，登录后默认跳转到前台页面。'
+            - $formkit: radio
+              if: $get(show_console).value
+              name: console_target
+              validation: required
+              label: 控制台跳转方式
+              options:
+                - value: _blank
+                  label: 新标签页
+                - value: _self
+                  label: 当前窗口
         - $formkit: radio
           name: load_progress
           label: 加载进度条

src/css/style.less

@@ -5241,6 +5241,8 @@ button.swiper-pagination-bullet {
 /* 搜索界面 */
 .search-page {
 
+  margin-top: 1.4rem !important;
+
   .search-form-inner {
     width: 100%;
     display: flex;
@@ -5310,3 +5312,7 @@ button.swiper-pagination-bullet {
     background: var(--theme);
   }
 }
+
+.search-page-title {
+  margin-top: 0 !important;
+}

templates/common/navbar.html

@@ -69,7 +69,7 @@
             </div>
             <i th:unless="${theme.config.page_config.search.search_enable}" class="ri-search-line navbar-searchicon" onclick="javascript:SearchWidget.open();"></i>
             <a th:if="${theme.config.page_config.search.search_enable}" class="navbar-searchicon" target="_self" href="/search"><i class="ri-search-line navbar-searchicon"></i></a>
-            <a th:if="${theme.config.basic_style.console.show_console}" class="navbar-console" href="/console" target="_blank"
+            <a th:if="${theme.config.basic_style.console.show_console}" class="navbar-console" th:href="@{${theme.config.basic_style.console.console_url}}" th:target="${theme.config.basic_style.console.console_target}"
                th:title="${theme.config.basic_style.console.console_title}">
                 <i th:class="${#strings.defaultString(theme.config.basic_style.console.console_icon, 'ri-equalizer-line')}"></i>
             </a>

templates/search.html

@@ -4,7 +4,7 @@
         th:with="isJournals = true, enableShare = false, baseEnableComment = false"
         xmlns:th="https://www.thymeleaf.org">
     <th:block th:fragment="content">
-        <div class="card card-content search-page">
+        <div class="card card-content search-page search-page-title">
             <div class="card-tab">
                 <div>[[${#strings.replace(title, ' - ' + site.title, '')}]]</div>
             </div>

theme.yaml

@@ -30,7 +30,7 @@ spec:
   settingName: theme-dream2-plus-setting
   configMapName: theme-dream2-plus-configMap
   # 版本号
-  version: 1.3.1.beta1.002
+  version: 1.3.1.beta2
   # 最低支持的 Halo 版本
   require: ">=2.20.0"
   # 许可