diff --git a/annotation-setting.yaml b/annotation-setting.yaml index fa28cd3e..74790770 100644 --- a/annotation-setting.yaml +++ b/annotation-setting.yaml @@ -135,3 +135,41 @@ spec: - $formkit: "textarea" name: "description" label: "分组描述" + +--- + +apiVersion: v1alpha1 +kind: AnnotationSetting +metadata: + generateName: annotation-setting- +spec: + targetRef: + group: core.halo.run + kind: EquipmentGroup + formSchema: + - $formkit: "textarea" + name: "description" + label: "分组描述" + +--- + +apiVersion: v1alpha1 +kind: AnnotationSetting +metadata: + generateName: annotation-setting- +spec: + targetRef: + group: core.halo.run + kind: Equipment + formSchema: + - $formkit: "text" + name: "model" + label: "装备型号/版本" + - $formkit: "text" + name: "button" + label: "左下角按钮显示文字" + value: "详情" + - $formkit: "text" + name: "link" + label: "左下角按钮跳转链接" + diff --git a/templates/equipment.html b/templates/equipments.html similarity index 85% rename from templates/equipment.html rename to templates/equipments.html index 11348790..8582fe55 100644 --- a/templates/equipment.html +++ b/templates/equipments.html @@ -1,11 +1,11 @@ + th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'equipments',title = ${title + ' | ' + site.title}, head = ~{::head},_title = ${title})}"> - @@ -14,7 +14,7 @@
- +
@@ -24,36 +24,35 @@ detail = ${theme.config.equipment.detail}, buttonUrl = '', buttonTitle = '')}" >
-
- +
+
-

[[${category.category_name}]]

-
[[${category.description}]]
-
+

[[${group.spec.displayName}]]

+
[[${#annotations.get(group, 'description')}]]
+
+ th:alt="${equipment.spec.displayName}" + th:src="${isLazyload ? loadingImg : equipment.spec.url}" + th:data-lazy-src="${ isLazyload ? equipment.spec.url : ''}">
- [[${equipment.name}]] + th:onclick="rm.rightmenuCopyText([[${equipment.spec.displayName}]]);btf.snackbarShow('已复制装备名称');"> + [[${equipment.spec.displayName}]]
-
[[${equipment.model}]] +
[[${#annotations.get(equipment, 'model')}]]
- [[${equipment.description}]] + [[${equipment.spec.description}]]
- [[${equipment.button}]] + [[${#annotations.get(equipment, 'button')}]] @@ -197,8 +196,8 @@ + name = 'equipment', + allowComment = true)}"/>
diff --git a/templates/error/404.html b/templates/error/404.html index d4c32ea4..a5f50e03 100644 --- a/templates/error/404.html +++ b/templates/error/404.html @@ -1,5 +1,5 @@ - diff --git a/templates/error/500.html b/templates/error/500.html index 23a64196..4c91681d 100644 --- a/templates/error/500.html +++ b/templates/error/500.html @@ -1,5 +1,5 @@ - diff --git a/templates/fcircle.html b/templates/fcircle.html index fbd147e0..42b06741 100644 --- a/templates/fcircle.html +++ b/templates/fcircle.html @@ -55,8 +55,8 @@
以下内容自动生成，未经过审核
- - @@ -165,10 +165,6 @@ - - - - diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html index 70b7d0e1..db6df69e 100644 --- a/templates/modules/layouts/layout.html +++ b/templates/modules/layouts/layout.html @@ -26,7 +26,7 @@ -
+
@@ -68,6 +68,21 @@ +
+ + +
+ + + + + + + + + + @@ -76,12 +91,6 @@ - - - - - @@ -91,9 +100,6 @@ - - - @@ -125,15 +131,8 @@ -
- - -
- - - - + \ No newline at end of file diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html index 6b72aeee..592ee767 100644 --- a/templates/modules/widgets/aside/comments.html +++ b/templates/modules/widgets/aside/comments.html @@ -13,7 +13,7 @@ th:with="newcommentnumber = ${#conversions.convert(theme.config.sidebar.newcomment.newcommentnumber, 'java.lang.Integer') >= 0 ? theme.config.sidebar.newcommentnumber : 5}">
diff --git a/templates/moments.html b/templates/moments.html index b3ee604a..06828232 100644 --- a/templates/moments.html +++ b/templates/moments.html @@ -1,8 +1,8 @@ + th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'moments',title = ${title + ' | ' + site.title}, head = ~{::head}, _title = ${title})}"> -
- +
diff --git a/templates/new_comment.html b/templates/new_comment.html index 31c07154..5cfc3164 100644 --- a/templates/new_comment.html +++ b/templates/new_comment.html @@ -53,7 +53,7 @@