repos / git-pr

a self-hosted git collaboration server
git clone https://github.com/picosh/git-pr.git

commit
ebbdd7d
parent
fe35422
author
Eric Bower
date
2024-10-22 00:12:53 -0400 EDT
style: pr detail reorg
4 files changed,  +72, -24
M static/git-pr.css
+6, -0
 1@@ -35,3 +35,9 @@ details {
 2   border: 2px solid var(--review);
 3   padding: 0.5rem 0.75rem;
 4 }
 5+
 6+@media only screen and (max-width: 40em) {
 7+  .collapse {
 8+    flex-direction: column;
 9+  }
10+}
M tmpl/patch.html
+19, -13
 1@@ -1,19 +1,25 @@
 2 {{define "patch"}}
 3-<div>
 4-  <h3 class="text-lg m-0 p-0 mb">
 5-    {{if .Review}}<code class="pill-review">REVIEW</code>{{end}}
 6-    <a href="#{{.Url}}">{{.Title}}</a>
 7-  </h3>
 8+<div class="flex gap-2">
 9+  <div style="width: 300px;">
10+    <div>
11+      <h3 class="text-lg m-0 p-0 mb">
12+        {{if .Review}}<code class="pill-review">REVIEW</code>{{end}}
13+        <a href="#{{.Url}}">{{.Title}}</a>
14+      </h3>
15 
16-  <div class="group-h text-sm">
17-    <code class="pill{{if .Review}}-review{{end}}">{{.AuthorName}} &lt;{{.AuthorEmail}}&gt;</code>
18-    <date>{{.FormattedAuthorDate}}</date>
19-  </div>
20-</div>
21+      <div class="group-h text-sm">
22+        <code class="pill{{if .Review}}-review{{end}}">{{.AuthorName}} &lt;{{.AuthorEmail}}&gt;</code>
23+        <date>{{.FormattedAuthorDate}}</date>
24+      </div>
25+    </div>
26 
27-{{if .Body}}<pre class="m-0">{{.Body}}</pre>{{end}}
28+    {{if .Body}}<pre class="m-0">{{.Body}}</pre>{{end}}
29 
30-{{if .BodyAppendix}}<pre class="m-0">{{.BodyAppendix}}</pre>{{end}}
31+    {{if .BodyAppendix}}<pre class="m-0">{{.BodyAppendix}}</pre>{{end}}
32+  </div>
33 
34-<div>{{.DiffStr}}</div>
35+  <div class="flex-1">
36+    {{.DiffStr}}
37+  </div>
38+</div>
39 {{end}}
M tmpl/patchset.html
+42, -10
 1@@ -1,16 +1,48 @@
 2 {{define "patchset"}}
 3 <div class="group">
 4-  <h2 class="text-xl">
 5-    Patchset <code>ps-{{.Patchset.ID}}</code>
 6-  </h2>
 7-  {{range $idx, $val := .Patches}}
 8-    <div class="group" id="{{.Url}}">
 9-      {{template "patch" .}}
10+  <div class="flex gap-2 collapse">
11+    <div style="width: 300px;">
12+      <h2 class="text-xl">
13+        Patchset <code>ps-{{.Patchset.ID}}</code>
14+      </h2>
15+
16+      {{range .Patches}}
17+        <div class="group">
18+          <div>
19+            <h3 class="text-lg m-0 p-0 mb">
20+              {{if .Review}}<code class="pill-review">REVIEW</code>{{end}}
21+              <a href="#{{.Url}}">{{.Title}}</a>
22+            </h3>
23+
24+            <div class="group-h text-sm">
25+              <code class="pill{{if .Review}}-review{{end}}">{{.AuthorName}} &lt;{{.AuthorEmail}}&gt;</code>
26+              <date>{{.FormattedAuthorDate}}</date>
27+            </div>
28+          </div>
29+
30+          {{if .Body}}<pre class="m-0">{{.Body}}</pre>{{end}}
31+
32+          {{if .BodyAppendix}}<pre class="m-0">{{.BodyAppendix}}</pre>{{end}}
33+        </div>
34+      {{else}}
35+        <div class="box">
36+          No patches found for patch request.
37+        </div>
38+      {{end}}
39+    </div>
40+
41+    <div class="flex-1">
42+      {{range .Patches}}
43+        <div id="{{.Url}}">
44+          <h3 class="text-lg"><a href="#{{.Url}}">{{.Title}}</a></h3>
45+          <div>{{.DiffStr}}</div>
46+        </div>
47+      {{else}}
48+        <div class="box">
49+          No patches found for patch request.
50+        </div>
51+      {{end}}
52     </div>
53-  {{else}}
54-  <div class="box">
55-    No patches found for patch request.
56   </div>
57-  {{end}}
58 </div>
59 {{end}}
M tmpl/pr-detail.html
+5, -1
 1@@ -16,7 +16,7 @@
 2 {{template "pr-header" .}}
 3 
 4 <main class="group">
 5-  <div class="flex gap-2">
 6+  <div class="flex gap-2 collapse">
 7     <div class="group text-sm" style="width: 300px;">
 8       <h3 class="text-lg">Logs</h3>
 9       {{range .Logs}}
10@@ -88,7 +88,11 @@
11         {{end}}
12 
13         <div>
14+          {{if eq .Patchset.ID $.Patchset.ID}}
15           <code class="{{if .Review}}pill-review{{end}}">{{.FormattedID}}</code>
16+          {{else}}
17+          <a href="/ps/{{.Patchset.ID}}"><code class="{{if .Review}}pill-review{{end}}">{{.FormattedID}}</code></a>
18+          {{end}}
19           <span> by </span>
20           {{template "user-pill" .UserData}}
21           <span>on <date>{{.Date}}</date></span>