{%s lc.Get("ui.media_tip") %} {%s lc.Get("ui.media_what_is") %}
- {% default %} -{%s lc.Get("ui.media_empty") %} {%s lc.Get("ui.media_what_is") %}
- {% endswitch %} - -{%s meta.Lc.Get("ui.revision_warning") %} {%s meta.Lc.Get("ui.revision_link") %}
- {%s= NaviTitle(meta, h.CanonicalName()) %} - {%s= contents %} -`) -//line hypview/readers.qtpl:21 - qw422016.E().S(lc.Get("ui.media_tip")) -//line hypview/readers.qtpl:21 - qw422016.N().S(` `) -//line hypview/readers.qtpl:21 - qw422016.E().S(lc.Get("ui.media_what_is")) -//line hypview/readers.qtpl:21 - qw422016.N().S(`
- `) -//line hypview/readers.qtpl:22 - default: -//line hypview/readers.qtpl:22 - qw422016.N().S(` -`) -//line hypview/readers.qtpl:23 - qw422016.E().S(lc.Get("ui.media_empty")) -//line hypview/readers.qtpl:23 - qw422016.N().S(` `) -//line hypview/readers.qtpl:23 - qw422016.E().S(lc.Get("ui.media_what_is")) -//line hypview/readers.qtpl:23 - qw422016.N().S(`
- `) -//line hypview/readers.qtpl:24 - } -//line hypview/readers.qtpl:24 - qw422016.N().S(` - -`) -//line hypview/readers.qtpl:86 - qw422016.E().S(meta.Lc.Get("ui.revision_warning")) -//line hypview/readers.qtpl:86 - qw422016.N().S(` `) -//line hypview/readers.qtpl:86 - qw422016.E().S(meta.Lc.Get("ui.revision_link")) -//line hypview/readers.qtpl:86 - qw422016.N().S(`
- `) -//line hypview/readers.qtpl:87 - qw422016.N().S(NaviTitle(meta, h.CanonicalName())) -//line hypview/readers.qtpl:87 - qw422016.N().S(` - `) -//line hypview/readers.qtpl:88 - qw422016.N().S(contents) -//line hypview/readers.qtpl:88 - qw422016.N().S(` -%s
`, lc.Get("ui.revision_no_text")) + contents = template.HTML(fmt.Sprintf(`%s
`, lc.Get("ui.revision_no_text"))) textContents string err error mycoFilePath string @@ -151,26 +169,17 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { textContents, err = history.FileAtRevision(mycoFilePath, revHash) if err == nil { ctx, _ := mycocontext.ContextFromStringInput(textContents, mycoopts.MarkupOptions(hyphaName)) - contents = mycomarkup.BlocksToHTML(ctx, mycomarkup.BlockTree(ctx)) + contents = template.HTML(mycomarkup.BlocksToHTML(ctx, mycomarkup.BlockTree(ctx))) } - page := hypview.Revision( - viewutil.MetaFrom(w, rq), - h, - contents, - revHash, - ) - w.Header().Set("Content-Type", "text/html;charset=utf-8") - w.WriteHeader(http.StatusOK) - _, _ = fmt.Fprint( - w, - viewutil.Base( - viewutil.MetaFrom(w, rq), - lc.Get("ui.revision_title", &l18n.Replacements{"name": util.BeautifulName(hyphaName), "rev": revHash}), - page, - map[string]string{}, - ), - ) + meta := viewutil.MetaFrom(w, rq) + _ = pageRevision.RenderTo(meta, map[string]any{ + "ViewScripts": cfg.ViewScripts, + "Contents": contents, + "RevHash": revHash, + "NaviTitle": hypview.NaviTitle(meta, h.CanonicalName()), + "HyphaName": h.CanonicalName(), + }) } // handlerText serves raw source text of the hypha. @@ -190,8 +199,7 @@ func handlerBinary(w http.ResponseWriter, rq *http.Request) { util.PrepareRq(rq) hyphaName := util.HyphaNameFromRq(rq, "binary") switch h := hyphae.ByName(hyphaName).(type) { - case *hyphae.EmptyHypha: - case *hyphae.TextualHypha: + case *hyphae.EmptyHypha, *hyphae.TextualHypha: w.WriteHeader(http.StatusNotFound) log.Printf("Textual hypha ‘%s’ has no media, cannot serve\n", h.CanonicalName()) case *hyphae.MediaHypha: @@ -205,59 +213,61 @@ func handlerBinary(w http.ResponseWriter, rq *http.Request) { func handlerHypha(w http.ResponseWriter, rq *http.Request) { util.PrepareRq(rq) var ( - hyphaName = util.HyphaNameFromRq(rq, "page", "hypha") - h = hyphae.ByName(hyphaName) - contents string - openGraph string - lc = l18n.FromRequest(rq) + hyphaName = util.HyphaNameFromRq(rq, "page", "hypha") + h = hyphae.ByName(hyphaName) + contents template.HTML + openGraph template.HTML + lc = l18n.FromRequest(rq) + meta = viewutil.MetaFrom(w, rq) + subhyphae, prevHyphaName, nextHyphaName = tree.Tree(h.CanonicalName()) + cats = categories.CategoriesWithHypha(h.CanonicalName()) + category_list = ":" + strings.Join(cats, ":") + ":" + isMyProfile = cfg.UseAuth && util.IsProfileName(h.CanonicalName()) && meta.U.Name == strings.TrimPrefix(h.CanonicalName(), cfg.UserHypha+"/") + + data = map[string]any{ + "HyphaName": h.CanonicalName(), + "SubhyphaeHTML": subhyphae, + "PrevHyphaName": prevHyphaName, + "NextHyphaName": nextHyphaName, + "IsMyProfile": isMyProfile, + "NaviTitle": hypview.NaviTitle(meta, h.CanonicalName()), + "BacklinkCount": backlinks.BacklinksCount(h.CanonicalName()), + "GivenPermissionToModify": user.CanProceed(rq, "edit"), + "Categories": cats, + "IsMediaHypha": false, + } ) + slog.Info("reading hypha", "name", h.CanonicalName(), "can edit", data["GivenPermissionToModify"]) + meta.BodyAttributes = map[string]string{ + "cats": category_list, + } switch h := h.(type) { case *hyphae.EmptyHypha: - // contents = hypview.EmptyHypha() - util.HTTP404Page(w, - viewutil.Base( - viewutil.MetaFrom(w, rq), - util.BeautifulName(hyphaName), - hypview.Hypha(viewutil.MetaFrom(w, rq), h, ""), - map[string]string{}, - openGraph)) + w.WriteHeader(http.StatusNotFound) + data["Contents"] = "" + _ = pageHypha.RenderTo(meta, data) case hyphae.ExistingHypha: - fileContentsT, errT := os.ReadFile(h.TextFilePath()) - if errT == nil { + fileContentsT, err := os.ReadFile(h.TextFilePath()) + if err == nil { ctx, _ := mycocontext.ContextFromStringInput(string(fileContentsT), mycoopts.MarkupOptions(hyphaName)) getOpenGraph, descVisitor, imgVisitor := tools.OpenGraphVisitors(ctx) + openGraph = template.HTML(getOpenGraph()) ast := mycomarkup.BlockTree(ctx, descVisitor, imgVisitor) - contents = mycomarkup.BlocksToHTML(ctx, ast) - openGraph = getOpenGraph() + contents = template.HTML(mycomarkup.BlocksToHTML(ctx, ast)) } switch h := h.(type) { case *hyphae.MediaHypha: - contents = mycoopts.Media(h, lc) + contents + contents = template.HTML(mycoopts.Media(h, lc)) + contents + data["IsMediaHypha"] = true } - meta := viewutil.MetaFrom(w, rq) - category_list := ":" + strings.Join(categories.CategoriesWithHypha(h.CanonicalName()), ":") + ":" - subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.CanonicalName()) - isMyProfile := cfg.UseAuth && util.IsProfileName(h.CanonicalName()) && meta.U.Name == strings.TrimPrefix(h.CanonicalName(), cfg.UserHypha+"/") + data["Contents"] = contents + meta.HeadElements = append(meta.HeadElements, openGraph) + _ = pageHypha.RenderTo(meta, data) - _ = pageHypha.RenderTo( - meta, - map[string]any{ - "SubhyphaeHTML": subhyphae, - "PrevHyphaName": prevHyphaName, - "NextHyphaName": nextHyphaName, - "IsMyProfile": isMyProfile, - "NaviTitle": hypview.NaviTitle(meta, h.CanonicalName()), - "Contents": template.HTML(contents), - }) - util.HTTP200Page(w, - viewutil.Base( - viewutil.MetaFrom(w, rq), - util.BeautifulName(hyphaName), - hypview.Hypha(viewutil.MetaFrom(w, rq), h, contents), - map[string]string{"cats": category_list}, - openGraph)) + // TODO: check head cats + // TODO: check opengraph } } diff --git a/web/views/hypha-empty.html b/web/views/hypha-empty.html deleted file mode 100644 index 2af3638..0000000 --- a/web/views/hypha-empty.html +++ /dev/null @@ -1,32 +0,0 @@ -{{define "empty hypha card"}} -{{block "empty no rights" .}}You are not authorized to create new hyphae. Here is what you can do:{{end}}
-{{block "write a text tip" .}}Write a note, a diary, an article, a story or anything textual using Mycomarkup. Full history of edits to the document will be saved.{{end}}
-{{block "write a text writing conventions" .}}Make sure to follow this wiki's writing conventions if there are any.{{end}}
- {{block "write a text btn" .}}Create{{end}} -{{block "upload a media tip" .}}Upload a picture, a video or an audio. Most common formats can be viewed from the browser, others can only be downloaded and viewed locally. You can write a description for the media later.{{end}}
- -+ {{if .IsMediaHypha}} + {{block "tip" .}}You can manage the hypha's media on this page.{{end}} + {{else}} + {{block "empty" .}}This hypha has no media, you can upload it here.{{end}} + {{end}} + + {{block "what is media?" .}}What is media?{{end}} + +
+ ++ {{block "revision warning" .}}Please note that viewing media is not supported in history for now.{{end}} + + {{block "revision link" .}}Get Mycomarkup source of this revision{{end}} + +
+ {{.NaviTitle}} + {{.Contents}} +{{block "empty no rights" .}}You are not authorized to create new hyphae. Here is what you can do:{{end}}
+{{block "write a text tip" .}}Write a note, a diary, an article, a story or anything textual using Mycomarkup. Full history of edits to the document will be saved.{{end}}
+{{block "write a text writing conventions" .}}Make sure to follow this wiki's writing conventions if there are any.{{end}}
+ {{block "write a text btn" .}}Create{{end}} +{{block "upload a media tip" .}}Upload a picture, a video or an audio. Most common formats can be viewed from the browser, others can only be downloaded and viewed locally. You can write a description for the media later.{{end}}
+ +