From 12e123926762216ee9da1b4e91f3cd805aaaaafe Mon Sep 17 00:00:00 2001 From: kl Date: Mon, 28 Dec 2020 15:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF=E6=8A=BD?= =?UTF-8?q?=E8=B1=A1=E5=87=BA=E9=80=9A=E7=94=A8=E7=9A=84header=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E6=B0=B4=E5=8D=B0=E7=AD=89=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8C=AA=E5=88=B0=E9=80=9A=E7=94=A8header?= =?UTF-8?q?=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/web/commonHeader.ftl | 49 ++++++++++++++ server/src/main/resources/web/compress.ftl | 32 +-------- .../main/resources/web/fileNotSupported.ftl | 2 +- server/src/main/resources/web/flv.ftl | 32 +-------- server/src/main/resources/web/html.ftl | 32 +-------- server/src/main/resources/web/markdown.ftl | 51 +------------- server/src/main/resources/web/media.ftl | 39 ++--------- .../src/main/resources/web/officePicture.ftl | 30 +-------- server/src/main/resources/web/pdf.ftl | 67 ++++++------------- server/src/main/resources/web/picture.ftl | 43 +++--------- server/src/main/resources/web/txt.ftl | 45 +------------ server/src/main/resources/web/xml.ftl | 56 ++-------------- 12 files changed, 106 insertions(+), 372 deletions(-) create mode 100644 server/src/main/resources/web/commonHeader.ftl diff --git a/server/src/main/resources/web/commonHeader.ftl b/server/src/main/resources/web/commonHeader.ftl new file mode 100644 index 00000000..7969ad50 --- /dev/null +++ b/server/src/main/resources/web/commonHeader.ftl @@ -0,0 +1,49 @@ + + + + + + + + + + + + diff --git a/server/src/main/resources/web/compress.ftl b/server/src/main/resources/web/compress.ftl index 9161ed84..f8698633 100644 --- a/server/src/main/resources/web/compress.ftl +++ b/server/src/main/resources/web/compress.ftl @@ -5,15 +5,8 @@ + <#include "*/commonHeader.ftl"> + <#include "*/commonHeader.ftl"> - \ No newline at end of file diff --git a/server/src/main/resources/web/markdown.ftl b/server/src/main/resources/web/markdown.ftl index e61ff772..4ca7293b 100644 --- a/server/src/main/resources/web/markdown.ftl +++ b/server/src/main/resources/web/markdown.ftl @@ -3,7 +3,9 @@ - 普通文本预览 + markdown文本预览 + + <#include "*/commonHeader.ftl"> @@ -30,15 +32,6 @@ - - - - - - - - - - diff --git a/server/src/main/resources/web/media.ftl b/server/src/main/resources/web/media.ftl index e0cd1f4b..1273f903 100644 --- a/server/src/main/resources/web/media.ftl +++ b/server/src/main/resources/web/media.ftl @@ -1,23 +1,16 @@ - + 多媒体文件预览 - + - + <#include "*/commonHeader.ftl"> + <#include "*/commonHeader.ftl"> - <#if pdfUrl?contains("http://") || pdfUrl?contains("https://")> - <#assign finalUrl="${pdfUrl}"> - <#else> - <#assign finalUrl="${baseUrl}${pdfUrl}"> - - - <#if "false" == switchDisabled> - 使用图片预览 - +<#if pdfUrl?contains("http://") || pdfUrl?contains("https://")> + <#assign finalUrl="${pdfUrl}"> +<#else> + <#assign finalUrl="${baseUrl}${pdfUrl}"> + + +<#if "false" == switchDisabled> + 使用图片预览 + - \ No newline at end of file diff --git a/server/src/main/resources/web/picture.ftl b/server/src/main/resources/web/picture.ftl index 6f09a13c..f4906c04 100644 --- a/server/src/main/resources/web/picture.ftl +++ b/server/src/main/resources/web/picture.ftl @@ -4,25 +4,20 @@ 图片预览 + + <#include "*/commonHeader.ftl"> -