forked from tangled.org/core
this repo has no description

appview: fix pull new comment template

fragment-in-a-fragment seems to break

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 966bd2e7 37f98529

verified
Changed files
+19 -13
appview
pages
templates
layouts
repo
pulls
+6
appview/pages/funcmap.go
···
"tinyAvatar": p.tinyAvatar,
"langColor": enry.GetColor,
+
"layoutSide": func() string {
+
return "col-span-1 md:col-span-2 lg:col-span-3"
+
},
+
"layoutCenter": func() string {
+
return "col-span-1 md:col-span-8 lg:col-span-6"
+
},
}
}
+12 -12
appview/pages/templates/layouts/base.html
···
<body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
{{ block "topbarLayout" . }}
<div class="px-1 grid grid-cols-1 md:grid-cols-12">
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "topbarLeft" . }} {{ end }}
</div>
-
<header style="z-index: 20" class="col-span-1 md:col-span-8">
+
<header style="z-index: 20" class="{{ layoutCenter }}">
{{ block "topbar" . }}
{{ template "layouts/topbar" . }}
{{ end }}
</header>
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "topbarRight" . }} {{ end }}
</div>
</div>
···
<div class="flex flex-col min-h-screen">
{{ block "contentLayout" . }}
<div class="grid grid-cols-1 md:grid-cols-12 gap-2">
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "contentLeft" . }} {{ end }}
</div>
-
<main class="px-1 col-span-1 md:col-span-8">
+
<main class="px-1 {{ layoutCenter }}">
{{ block "content" . }}{{ end }}
</main>
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "contentRight" . }} {{ end }}
</div>
</div>
···
{{ block "contentAfterLayout" . }}
<div class="grid grid-cols-1 md:grid-cols-12 gap-2">
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "contentAfterLeft" . }} {{ end }}
</div>
-
<main class="px-1 col-span-1 md:col-span-8">
+
<main class="px-1 {{ layoutCenter }}">
{{ block "contentAfter" . }}{{ end }}
</main>
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "contentAfterRight" . }} {{ end }}
</div>
</div>
···
{{ block "footerLayout" . }}
<div class="px-1 grid grid-cols-1 md:grid-cols-12">
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "footerLeft" . }} {{ end }}
</div>
-
<footer class="mt-16 col-span-1 md:col-span-8">
+
<footer class="mt-16 {{ layoutCenter }}">
{{ block "footer" . }}
{{ template "layouts/footer" . }}
{{ end }}
</footer>
-
<div class="col-span-1 md:col-span-2">
+
<div class="{{ layoutSide }}">
{{ block "footerRight" . }} {{ end }}
</div>
</div>
+1 -1
appview/pages/templates/repo/pulls/fragments/pullNewComment.html
···
id="pull-comment-card-{{ .RoundNumber }}"
class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2">
<div class="text-sm text-gray-500 dark:text-gray-400">
-
{{ template "user/fragments/picHandleLink" (didOrHandle .LoggedInUser.Did .LoggedInUser.Handle) }}
+
{{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}
</div>
<form
hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"