diff --git a/package.json b/package.json index 64ea04e..bfed1f9 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "author": "nineya", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "release": "eslint **/*.js && gulp release", - "push": "eslint **/*.js && gulp push", + "release": "eslint src/**/*.js && gulp release", + "push": "eslint src/**/*.js && gulp push", "zip": "gulp zip", - "build": "eslint **/*.js && gulp", - "lint": "eslint **/*.js" + "build": "eslint src/**/*.js && gulp", + "lint": "eslint src/**/*.js" }, "repository": { "type": "git", diff --git a/settings.yaml b/settings.yaml index 01c3522..2f53f59 100644 --- a/settings.yaml +++ b/settings.yaml @@ -267,14 +267,14 @@ spec: formSchema: - $formkit: attachment name: default_thumbnail - label: 默认文章缩略图 + label: 默认文章封面图 placeholder: '请输入/选择图片路径' - help: "如果文章没有指定缩略图,则默认显示当前缩略图。" + help: "如果文章没有指定封面图,则默认显示当前封面图。" - $formkit: select name: top_thumbnail_mode - label: 置顶文章列表缩略图模式 + label: 置顶文章列表封面图模式 value: back - help: '置顶的文章在列表的缩略图模式,除网格布局外,如果文章元数据配置了thumbnail_mode项,则当前配置将被覆盖。注:设置网格布局后,非置顶文章也会变成网格布局。' + help: '置顶的文章在列表的封面图模式,除网格布局外,如果文章元数据配置了thumbnail_mode项,则当前配置将被覆盖。注:设置网格布局后,非置顶文章也会变成网格布局。' options: - value: default label: 默认模式 @@ -292,9 +292,9 @@ spec: label: 网格模式(强优先) - $formkit: select name: thumbnail_mode - label: 文章列表缩略图模式 + label: 文章列表封面图模式 value: default - help: '文章列表缩略图模式,除网格布局外,如果文章元数据配置了thumbnail_mode项,则当前配置将被覆盖。' + help: '文章列表封面图模式,除网格布局外,如果文章元数据配置了thumbnail_mode项,则当前配置将被覆盖。' options: - value: default label: 默认模式 @@ -846,7 +846,7 @@ spec: formSchema: - $formkit: attachment name: links_thumbnail - label: 友链页面-缩略图 + label: 友链页面-封面图 placeholder: '请输入/选择图片路径' - $formkit: attachment name: links_default_avatar diff --git a/templates/main/article.html b/templates/main/article.html index 4b99666..f62b903 100644 --- a/templates/main/article.html +++ b/templates/main/article.html @@ -1,9 +1,10 @@ + th:with="updateInterval = ${T(java.lang.Math).floor((#dates.createNow().getTime()/1000.0 - post.status.lastModifyTime.getEpochSecond())/86400.0).intValue()}, + thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail : post.spec.cover}"> -
-
+
+
  @@ -34,7 +35,7 @@
- +