tangled.org / core
Monorepo for Tangled tangled.org
fork atom

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
3/3
build.yml
fmt.yml
test.yml
options
unified split
Changed files
+19 -13
appview
pages
funcmap.go
templates
layouts
base.html
repo
pulls
fragments
pullNewComment.html
+6
appview/pages/funcmap.go
··· 243 244 "tinyAvatar": p.tinyAvatar, 245 "langColor": enry.GetColor, 246 } 247 } 248
··· 243 244 "tinyAvatar": p.tinyAvatar, 245 "langColor": enry.GetColor, 246 + "layoutSide": func() string { 247 + return "col-span-1 md:col-span-2 lg:col-span-3" 248 + }, 249 + "layoutCenter": func() string { 250 + return "col-span-1 md:col-span-8 lg:col-span-6" 251 + }, 252 } 253 } 254
+12 -12
appview/pages/templates/layouts/base.html
··· 17 <body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 18 {{ block "topbarLayout" . }} 19 <div class="px-1 grid grid-cols-1 md:grid-cols-12"> 20 - <div class="col-span-1 md:col-span-2"> 21 {{ block "topbarLeft" . }} {{ end }} 22 </div> 23 - <header style="z-index: 20" class="col-span-1 md:col-span-8"> 24 {{ block "topbar" . }} 25 {{ template "layouts/topbar" . }} 26 {{ end }} 27 </header> 28 - <div class="col-span-1 md:col-span-2"> 29 {{ block "topbarRight" . }} {{ end }} 30 </div> 31 </div> ··· 34 <div class="flex flex-col min-h-screen"> 35 {{ block "contentLayout" . }} 36 <div class="grid grid-cols-1 md:grid-cols-12 gap-2"> 37 - <div class="col-span-1 md:col-span-2"> 38 {{ block "contentLeft" . }} {{ end }} 39 </div> 40 - <main class="px-1 col-span-1 md:col-span-8"> 41 {{ block "content" . }}{{ end }} 42 </main> 43 - <div class="col-span-1 md:col-span-2"> 44 {{ block "contentRight" . }} {{ end }} 45 </div> 46 </div> ··· 48 49 {{ block "contentAfterLayout" . }} 50 <div class="grid grid-cols-1 md:grid-cols-12 gap-2"> 51 - <div class="col-span-1 md:col-span-2"> 52 {{ block "contentAfterLeft" . }} {{ end }} 53 </div> 54 - <main class="px-1 col-span-1 md:col-span-8"> 55 {{ block "contentAfter" . }}{{ end }} 56 </main> 57 - <div class="col-span-1 md:col-span-2"> 58 {{ block "contentAfterRight" . }} {{ end }} 59 </div> 60 </div> ··· 63 64 {{ block "footerLayout" . }} 65 <div class="px-1 grid grid-cols-1 md:grid-cols-12"> 66 - <div class="col-span-1 md:col-span-2"> 67 {{ block "footerLeft" . }} {{ end }} 68 </div> 69 - <footer class="mt-16 col-span-1 md:col-span-8"> 70 {{ block "footer" . }} 71 {{ template "layouts/footer" . }} 72 {{ end }} 73 </footer> 74 - <div class="col-span-1 md:col-span-2"> 75 {{ block "footerRight" . }} {{ end }} 76 </div> 77 </div>
··· 17 <body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 18 {{ block "topbarLayout" . }} 19 <div class="px-1 grid grid-cols-1 md:grid-cols-12"> 20 + <div class="{{ layoutSide }}"> 21 {{ block "topbarLeft" . }} {{ end }} 22 </div> 23 + <header style="z-index: 20" class="{{ layoutCenter }}"> 24 {{ block "topbar" . }} 25 {{ template "layouts/topbar" . }} 26 {{ end }} 27 </header> 28 + <div class="{{ layoutSide }}"> 29 {{ block "topbarRight" . }} {{ end }} 30 </div> 31 </div> ··· 34 <div class="flex flex-col min-h-screen"> 35 {{ block "contentLayout" . }} 36 <div class="grid grid-cols-1 md:grid-cols-12 gap-2"> 37 + <div class="{{ layoutSide }}"> 38 {{ block "contentLeft" . }} {{ end }} 39 </div> 40 + <main class="px-1 {{ layoutCenter }}"> 41 {{ block "content" . }}{{ end }} 42 </main> 43 + <div class="{{ layoutSide }}"> 44 {{ block "contentRight" . }} {{ end }} 45 </div> 46 </div> ··· 48 49 {{ block "contentAfterLayout" . }} 50 <div class="grid grid-cols-1 md:grid-cols-12 gap-2"> 51 + <div class="{{ layoutSide }}"> 52 {{ block "contentAfterLeft" . }} {{ end }} 53 </div> 54 + <main class="px-1 {{ layoutCenter }}"> 55 {{ block "contentAfter" . }}{{ end }} 56 </main> 57 + <div class="{{ layoutSide }}"> 58 {{ block "contentAfterRight" . }} {{ end }} 59 </div> 60 </div> ··· 63 64 {{ block "footerLayout" . }} 65 <div class="px-1 grid grid-cols-1 md:grid-cols-12"> 66 + <div class="{{ layoutSide }}"> 67 {{ block "footerLeft" . }} {{ end }} 68 </div> 69 + <footer class="mt-16 {{ layoutCenter }}"> 70 {{ block "footer" . }} 71 {{ template "layouts/footer" . }} 72 {{ end }} 73 </footer> 74 + <div class="{{ layoutSide }}"> 75 {{ block "footerRight" . }} {{ end }} 76 </div> 77 </div>
+1 -1
appview/pages/templates/repo/pulls/fragments/pullNewComment.html
··· 3 id="pull-comment-card-{{ .RoundNumber }}" 4 class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2"> 5 <div class="text-sm text-gray-500 dark:text-gray-400"> 6 - {{ template "user/fragments/picHandleLink" (didOrHandle .LoggedInUser.Did .LoggedInUser.Handle) }} 7 </div> 8 <form 9 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"
··· 3 id="pull-comment-card-{{ .RoundNumber }}" 4 class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2"> 5 <div class="text-sm text-gray-500 dark:text-gray-400"> 6 + {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }} 7 </div> 8 <form 9 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"