diff --git a/routes/routes.go b/routes/routes.go index 143bb2b..0cf1c35 100644 --- a/routes/routes.go +++ b/routes/routes.go @@ -190,6 +190,7 @@ func (d *deps) RepoTree(w http.ResponseWriter, r *http.Request) { data["ref"] = ref data["parent"] = treePath data["desc"] = getDescription(path) + data["dotdot"] = filepath.Dir(treePath) d.listFiles(files, data, w) return @@ -254,7 +255,7 @@ func (d *deps) Log(w http.ResponseWriter, r *http.Request) { data["name"] = name data["ref"] = ref data["desc"] = getDescription(path) - data["dotdot"] = filepath.Dir(path) + data["log"] = true if err := t.ExecuteTemplate(w, "log", data); err != nil { log.Println(err) diff --git a/static/style.css b/static/style.css index e012306..2fa2e9d 100644 --- a/static/style.css +++ b/static/style.css @@ -252,17 +252,18 @@ a:hover { } .file-wrapper { + display: flex; + flex-direction: row; + grid-template-columns: 1rem minmax(0, 1fr); + gap: 1rem; + padding: 0.5rem; background: var(--light-gray); - display: table; - padding: 0.5rem - width: 100%; } .file-content { background: var(--light-gray); overflow-y: hidden; overflow-x: auto; - display: block; } .diff-type { diff --git a/templates/file.html b/templates/file.html index 82a3384..8898786 100644 --- a/templates/file.html +++ b/templates/file.html @@ -1,29 +1,23 @@ {{ define "file" }} {{ template "head" . }} - {{.name }} — {{ .path }} - {{ template "repoheader" . }} {{ template "nav" . }}

{{ .path }}

- - - - - -
- 
-            {{- range .linecount }}
+      

+        

+          {{- range .linecount }}
 {{ . }}
-            {{- end -}}
-
- 		+ {{- end -}} + +
+ 
             {{- .content -}}
-
+
diff --git a/templates/head.html b/templates/head.html index 53487eb..08c572e 100644 --- a/templates/head.html +++ b/templates/head.html @@ -5,6 +5,26 @@ + {{ if .parent }} + {{ .meta.Title }} — {{ .name }} ({{ .ref }}): {{ .parent }}/ + + {{ else if .path }} + {{ .meta.Title }} — {{ .name }} ({{ .ref }}): {{ .path }} + {{ else if .files }} + {{ .meta.Title }} — {{ .name }} ({{ .ref }}) + {{ else if .commit }} + {{ .meta.Title }} — {{ .name }}: {{ .commit.This }} + {{ else if .branches }} + {{ .meta.Title }} — {{ .name }}: refs + {{ else if .commits }} + {{ if .log }} + {{ .meta.Title }} — {{ .name }}: log + {{ else }} + {{ .meta.Title }} — {{ .name }} + {{ end }} + {{ else }} + {{ .meta.Title }} + {{ end }} {{ if and .servername .gomod }} {{ end }} diff --git a/templates/index.html b/templates/index.html index 8bff3d7..80c9e1d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,10 +2,6 @@ {{ template "head" . }} - - {{ .meta.Title }} - -

{{ .meta.Title }}

{{ .meta.Description }}

diff --git a/templates/log.html b/templates/log.html index 1ab6cbc..7d74cb3 100644 --- a/templates/log.html +++ b/templates/log.html @@ -2,10 +2,6 @@ {{ template "head" . }} - - {{ .name }} — log - - {{ template "repoheader" . }} {{ template "nav" . }} diff --git a/templates/refs.html b/templates/refs.html index 8480856..76add7d 100644 --- a/templates/refs.html +++ b/templates/refs.html @@ -2,10 +2,6 @@ {{ template "head" . }} - - {{ .name }} — refs - - {{ template "repoheader" . }} {{ template "nav" . }} diff --git a/templates/repo.html b/templates/repo.html index 1c700b5..1cd9b5c 100644 --- a/templates/repo.html +++ b/templates/repo.html @@ -1,10 +1,5 @@ {{ define "repo" }} - {{ .name }} - {{ if .parent }} - — {{ .parent }} - {{ end }} - {{ template "head" . }} {{ template "repoheader" . }} diff --git a/templates/tree.html b/templates/tree.html index 496dceb..c4b7e4f 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -1,10 +1,6 @@ {{ define "tree" }} - {{ .name }} - {{ if .parent }} - — {{ .parent }} - {{ end }} - + {{ template "head" . }} {{ template "repoheader" . }}