mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-19 07:02:51 +00:00
Code Issues Releases Wiki Activity

A better navigation

Browse Source
This commit is contained in:
Timur Ismagilov 2020-08-29 00:43:36 +05:00
parent 7d0ad92669
commit f33d7598ac
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
http_readers.go
View File

@ -33,7 +33,6 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
textPath = hyphaName + "&.gmi"
textContents, err = history.FileAtRevision(textPath, revHash)
)
log.Println(revHash, hyphaName, textPath, textContents, err)
if err == nil {
contents = gemtext.ToHtml(hyphaName, textContents)
}
@ -41,8 +40,11 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
<main>
<nav>
<ul>
<li><a href="/page/%[1]s">See the latest revision</a></li>
<li><a href="/page/%[1]s">Hypha</a></li>
<li><a href="/edit/%[1]s">Edit</a></li>
<li><a href="/text/%[1]s">Raw text</a></li>
<li><a href="/history/%[1]s">History</a></li>
<li><b>%[5]s</b></li>
</ul>
</nav>
<article>
@ -58,7 +60,8 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) {
`, hyphaName,
naviTitle(hyphaName),
contents,
tree.TreeAsHtml(hyphaName, IterateHyphaNamesWith))
tree.TreeAsHtml(hyphaName, IterateHyphaNamesWith),
revHash)
w.Header().Set("Content-Type", "text/html;charset=utf-8")
w.WriteHeader(http.StatusOK)
w.Write([]byte(base(hyphaName, form)))
@ -81,6 +84,14 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) {
table := fmt.Sprintf(`
<main>
<nav>
<ul>
<li><a href="/page/%[1]s">Hypha</a></li>
<li><a href="/edit/%[1]s">Edit</a></li>
<li><a href="/text/%[1]s">Raw text</a></li>
<li><b>History</b></li>
</ul>
</nav>
<table>
<thead>
<tr>
@ -91,10 +102,10 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) {
</tr>
</thead>
<tbody>
%s
%[2]s
</tbody>
</table>
</main>`, tbody)
</main>`, hyphaName, tbody)
w.Header().Set("Content-Type", "text/html;charset=utf-8")
w.WriteHeader(http.StatusOK)
w.Write([]byte(base(hyphaName, table)))
@ -144,9 +155,9 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) {
<main>
<nav>
<ul>
<li><b>Hypha</b></li>
<li><a href="/edit/%[1]s">Edit</a></li>
<li><a href="/text/%[1]s">Raw text</a></li>
<li><a href="/binary/%[1]s">Binary part</a></li>
<li><a href="/history/%[1]s">History</a></li>
</ul>
</nav>

2
metarrhiza

@ -1 +1 @@
Subproject commit 41b2e0bda18d1c4188363790fcd6289f29b296c3
Subproject commit 2a36350d4248610d7e09119d03a602414252abe4