https://github.com/atjiu/pybbs/issues/184

atjiu · atjiu · commit e39957997034 · 2023-05-10T10:29:10.000+08:00
diff --git a/plugins/theme-simple-plugin/src/main/resources/templates/theme/simple/error.ftl b/plugins/theme-simple-plugin/src/main/resources/templates/theme/simple/error.ftl
@@ -1,22 +1,22 @@
 <!doctype html>
 <html lang="zh-CN">
 <head>
-  <meta charset="UTF-8">
-  <#--<meta name="viewport"-->
-  <#--content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">-->
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>Ooooops, 出错了~~</title>
-  <link rel="icon" href="https://yiiu.co/favicon.ico">
-  <#--css-->
-  <link rel="stylesheet" href="/static/theme/simple/css/app.css"/>
+    <meta charset="UTF-8">
+    <#--<meta name="viewport"-->
+    <#--content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">-->
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Ooooops, 出错了~~</title>
+    <link rel="icon" href="https://atjiu.github.io/favicon.ico">
+    <#--css-->
+    <link rel="stylesheet" href="/static/theme/simple/css/app.css"/>
 </head>
 <body>
 <div class="container">
-  <section>
-    <h1>: (</h1>
-    <h3>${errorCode}</h3>
-    <p>${exception.message!}</p>
-  </section>
+    <section>
+        <h1>: (</h1>
+        <h3>${errorCode}</h3>
+        <p>${exception.message!}</p>
+    </section>
 </div>
 </body>
 </html>
diff --git a/plugins/theme-simple-plugin/src/main/resources/templates/theme/simple/layout/layout.ftl b/plugins/theme-simple-plugin/src/main/resources/templates/theme/simple/layout/layout.ftl
@@ -1,27 +1,27 @@
 <#macro html page_title page_tab>
-  <!doctype html>
-  <html lang="zh-CN">
-  <head>
-    <meta charset="UTF-8">
-    <#--<meta name="viewport"-->
-          <#--content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">-->
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>${page_title!} - ${site.name}</title>
-    <link rel="icon" href="https://yiiu.co/favicon.ico">
-    <#--css-->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="/static/theme/${site.theme}/css/app.css"/>
-    <#--javascript-->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-  </head>
-  <body>
-  <#include "../components/loading.ftl"/>
-  <div class="container">
-    <#include "header.ftl"/>
-    <@header page_tab=page_tab/>
-    <section><#nested /></section>
-    <#include "footer.ftl"/>
-  </div>
-  </body>
-  </html>
+    <!doctype html>
+    <html lang="zh-CN">
+    <head>
+        <meta charset="UTF-8">
+        <#--<meta name="viewport"-->
+        <#--content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">-->
+        <meta http-equiv="X-UA-Compatible" content="ie=edge">
+        <title>${page_title!} - ${site.name}</title>
+        <link rel="icon" href="https://atjiu.github.io/favicon.ico">
+        <#--css-->
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"/>
+        <link rel="stylesheet" href="/static/theme/${site.theme}/css/app.css"/>
+        <#--javascript-->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+    </head>
+    <body>
+    <#include "../components/loading.ftl"/>
+    <div class="container">
+        <#include "header.ftl"/>
+        <@header page_tab=page_tab/>
+        <section><#nested /></section>
+        <#include "footer.ftl"/>
+    </div>
+    </body>
+    </html>
 </#macro>
diff --git a/src/main/resources/templates/admin/comment/list.ftl b/src/main/resources/templates/admin/comment/list.ftl
@@ -58,7 +58,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td colspan="5">${comment.content}</td>
+                            <td colspan="5">${model.formatContent(comment.content)}</td>
                         </tr>
                     </#list>
                     </tbody>
