From 7f58a15444416d41f01dbd045cf1972250998920 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Feb 2025 12:25:51 +0000
Subject: [PATCH] builds: Move commenting into a modal

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/builds/macros.html | 45 ++++++++++++++++++++++++++++++++
 src/templates/builds/show.html   | 28 +++-----------------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/src/templates/builds/macros.html b/src/templates/builds/macros.html
index 6c718f53..6d253bc3 100644
--- a/src/templates/builds/macros.html
+++ b/src/templates/builds/macros.html
@@ -20,6 +20,51 @@
 
 {% from "users/macros.html" import Avatar with context %}
 
+{% macro BuildComment(build) %}
+	<div class="modal" id="build-{{ build.uuid }}-comment">
+		<div class="modal-background"></div>
+
+		<div class="modal-content">
+			<section class="modal-card-body">
+				<h5 class="title is-5">
+					{{ _("Comment on %s") % build }}
+				</h5>
+
+				<form method="POST" action="/builds/{{ build.uuid }}/comment">
+					{{ xsrf_form_html() | safe }}
+
+					<div class="field">
+						<div class="control">
+							<textarea class="textarea" name="text" rows="8"
+								placeholder="{{ _("Comment...") }}"></textarea>
+						</div>
+					</div>
+
+					<div class="field">
+						<div class="control">
+							<button class="button is-info is-fullwidth">
+								{{ _("Post Comment") }}
+							</button>
+						</div>
+					</div>
+				</form>
+			</section>
+		</div>
+
+		<button class="modal-close is-large" aria-label="close"></button>
+	</div>
+
+	<a href="#" class="button is-info modal-toggle" data-target="build-{{ build.uuid }}-comment">
+		<span class="icon-text">
+			<span class="icon">
+				<i class="fa-solid fa-comment"></i>
+			</span>
+
+			<span>{{ _("Comment") }}</span>
+		</span>
+	</a>
+{% endmacro %}
+
 {% macro BuildList(builds, shorter=False, limit=None, more_url=None) %}
 	{% if builds %}
 		{% set rest = False %}
diff --git a/src/templates/builds/show.html b/src/templates/builds/show.html
index ba3d1f6a..b046ee04 100644
--- a/src/templates/builds/show.html
+++ b/src/templates/builds/show.html
@@ -2,7 +2,7 @@
 
 {% from "macros.html" import Text with context %}
 {% from "bugs/macros.html" import BugList with context %}
-{% from "builds/macros.html" import BuildPackages, BuildWatchers with context %}
+{% from "builds/macros.html" import BuildComment, BuildPackages, BuildWatchers with context %}
 {% from "builds/groups/macros.html" import BuildGroupList with context %}
 {% from "events/macros.html" import EventList with context %}
 {% from "jobs/macros.html" import JobList with context %}
@@ -130,6 +130,9 @@
 						{{ _("Delete Build") }}
 					</a>
 				{% endif %}
+
+				{# Comment #}
+				{{ BuildComment(build) }}
 			</div>
 		</div>
 	</section>
@@ -238,27 +241,4 @@
 			{{ EventList(priority=4, build=build, show_build=False) }}
 		</div>
 	</section>
-
-	{# Comment - This probably should go into a modal #}
-	<section class="section">
-		<div class="container">
-			<form method="POST" action="/builds/{{ build.uuid }}/comment">
-				{{ xsrf_form_html() | safe }}
-
-				<div class="field">
-					<label class="label">{{ _("Comment") }}</label>
-					<div class="control">
-						<textarea class="textarea" name="text" rows="8"
-							placeholder="{{ _("Comment...") }}"></textarea>
-					</div>
-				</div>
-
-				<div class="field">
-					<div class="control">
-						<button class="button is-link">Submit</button>
-					</div>
-				</div>
-			</form>
-		</div>
-	</section>
 {% endblock %}
-- 
2.47.2