diff --git a/settings.yaml b/settings.yaml index 638f199..c5eee06 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1347,27 +1347,57 @@ spec: style_5xx: 'error/common/error_default' children: - $formkit: select + id: style_4xx name: style_4xx label: 4xx错误页面风格 help: '发生4xx错误页面风格，如：404等。' options: - - value: 'error/4xx/error_blue_screen' + - value: 'error/common/error_blue_screen' label: 蓝屏代码 - - value: 'error/4xx/error_tv_screen' + - value: 'error/common/error_tv_screen' label: 电视雪花屏幕 - value: 'error/4xx/error_train' label: 小火车 - - value: 'error/4xx/error_concise' + - value: 'error/common/error_concise' label: 简洁 - value: 'error/common/error_default' label: 默认 + - value: 'error/common/error_custom' + label: 自定义 + - $formkit: code + name: html_content_4xx + if: $get(style_4xx).value === 'error/common/error_custom' + validation: required + label: 自定义4xx错误页面内容 + language: html + height: 45px + help: '填写页面内容，填写、和标签内容。' - $formkit: select name: style_5xx + id: style_5xx label: 5xx错误页面风格 help: '发生5xx错误页面风格，如：500等。' options: + - value: 'error/common/error_blue_screen' + label: 蓝屏代码 + - value: 'error/common/error_tv_screen' + label: 电视雪花屏幕 + - value: 'error/5xx/error_train' + label: 小火车 + - value: 'error/common/error_concise' + label: 简洁 - value: 'error/common/error_default' label: 默认 + - value: 'error/common/error_custom' + label: 自定义 + - $formkit: code + name: html_content_5xx + if: $get(style_5xx).value === 'error/common/error_custom' + validation: required + label: 自定义5xx错误页面内容 + language: html + height: 45px + help: '填写页面内容，填写、和标签内容。' - $formkit: radio name: effects_lantern_mode id: effects_lantern_mode diff --git a/templates/error/4xx/error_train.html b/templates/error/4xx/error_train.html index 56f4255..5d373ff 100644 --- a/templates/error/4xx/error_train.html +++ b/templates/error/4xx/error_train.html @@ -4,7 +4,8 @@ - 404 Not Found + [[${error.status + ' - ' + #strings.defaultString(error.title, 'Internal server error')}]] + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 500 + + + Internal server error. + + + + + + + + + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/templates/error/4xx/error_blue_screen.html b/templates/error/common/error_blue_screen.html similarity index 99% rename from templates/error/4xx/error_blue_screen.html rename to templates/error/common/error_blue_screen.html index cfb85c5..aa6cd26 100644 --- a/templates/error/4xx/error_blue_screen.html +++ b/templates/error/common/error_blue_screen.html @@ -3,7 +3,9 @@ th:fragment="error_fragment"> - 404 + + [[${error.status + ' - ' + #strings.defaultString(error.title, 'Internal server error')}]] +