summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lin <jeremy.lin@gmail.com>2021-11-15 10:53:54 -0800
committerGitHub <noreply@github.com>2021-11-15 11:53:54 -0700
commite81369e2208e47d9650f9699ad8bc7692640b275 (patch)
treeabd9c4ae2e437a0dff55a251ce93a2d955c21bff
parente7457b43e4703080ae8713ada798ce3e20b83690 (diff)
fileserver: Move default browse template into a separate file (#4417)
This makes it easier for users to find the default browse template if they want to create a custom template based on that. It also makes it easier to view the template with proper syntax highlighting.
-rw-r--r--modules/caddyhttp/fileserver/browse.go4
-rw-r--r--modules/caddyhttp/fileserver/browse.html (renamed from modules/caddyhttp/fileserver/browsetpl.go)22
2 files changed, 7 insertions, 19 deletions
diff --git a/modules/caddyhttp/fileserver/browse.go b/modules/caddyhttp/fileserver/browse.go
index 92a1e6e..bd4de3a 100644
--- a/modules/caddyhttp/fileserver/browse.go
+++ b/modules/caddyhttp/fileserver/browse.go
@@ -16,6 +16,7 @@ package fileserver
import (
"bytes"
+ _ "embed"
"encoding/json"
"fmt"
"net/http"
@@ -31,6 +32,9 @@ import (
"go.uber.org/zap"
)
+//go:embed browse.html
+var defaultBrowseTemplate string
+
// Browse configures directory browsing.
type Browse struct {
// Use this template file instead of the default browse template.
diff --git a/modules/caddyhttp/fileserver/browsetpl.go b/modules/caddyhttp/fileserver/browse.html
index 06ef06d..c0ea131 100644
--- a/modules/caddyhttp/fileserver/browsetpl.go
+++ b/modules/caddyhttp/fileserver/browse.html
@@ -1,20 +1,4 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package fileserver
-
-const defaultBrowseTemplate = `<!DOCTYPE html>
+<!DOCTYPE html>
<html>
<head>
<title>{{html .Name}}</title>
@@ -40,7 +24,7 @@ h1 a:hover {
}
a:visited {
- color: #800080;
+ color: #800080;
}
header,
@@ -477,4 +461,4 @@ footer {
timeList.forEach(localizeDatetime);
</script>
</body>
-</html>`
+</html>