From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Feb 2024 20:19:10 +0000 (+0000)
Subject: nopaste: Simplify the layout of the upload pages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98083479392f326cfaea875628dbf8897bed64b6;p=ipfire.org.git

nopaste: Simplify the layout of the upload pages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 30cee3b2..b434e59b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -301,6 +301,7 @@ templates_netbootdir = $(templatesdir)/netboot
 
 templates_nopaste_DATA = \
 	src/templates/nopaste/create.html \
+	src/templates/nopaste/upload.html \
 	src/templates/nopaste/view.html
 
 templates_nopastedir = $(templatesdir)/nopaste
diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html
index 7cafb5cb..48d59ba4 100644
--- a/src/templates/nopaste/create.html
+++ b/src/templates/nopaste/create.html
@@ -3,21 +3,22 @@
 {% block title %}{{ _("New Paste") }}{% end block %}
 
 {% block container %}
-	<section class="hero is-primary">
-		<div class="hero-body">
-			<div class="container">
-				<h1 class="title">{{ _("New Paste") }}</h1>
-			</div>
-		</div>
-	</section>
-
 	<section class="section">
 		<div class="container">
-			<div class="columns">
-				<div class="column is-8">
-					<form action="" method="POST">
+			<div class="columns is-centered">
+				<div class="column is-half">
+					<form action="" method="POST" enctype="multipart/form-data">
 						{% raw xsrf_form_html() %}
 
+						{% block paste %}
+							<div class="field">
+								<div class="control">
+									<textarea class="textarea" rows="12" name="content" required
+										placeholder="{{ _("Paste your content here...") }}"></textarea>
+								</div>
+							</div>
+						{% end %}
+
 						<div class="field">
 							<label class="label">{{ _("Subject") }}</label>
 
@@ -27,13 +28,6 @@
 							</div>
 						</div>
 
-						<div class="field">
-							<div class="control">
-								<textarea class="textarea" rows="12" name="content" required
-									placeholder="{{ _("Paste your content here...") }}"></textarea>
-							</div>
-						</div>
-
 						<div class="field">
 							<label class="label">{{ _("Expires After") }}</label>
 
@@ -53,8 +47,13 @@
 
 						<div class="field">
 							<div class="control">
-								<button type="submit" class="button is-primary">
-									<i class="fa-solid fa-upload"></i> {{ _("Upload") }}
+								<button type="submit" class="button is-primary is-fullwidth">
+									<span class="icon-text">
+										<span class="icon">
+											<i class="fa-solid fa-upload"></i>
+										</span>
+										<span>{{ _("Upload") }}</span>
+									</span>
 								</button>
 							</div>
 						</div>
diff --git a/src/templates/nopaste/upload.html b/src/templates/nopaste/upload.html
index f953bfc9..a6475e45 100644
--- a/src/templates/nopaste/upload.html
+++ b/src/templates/nopaste/upload.html
@@ -1,82 +1,26 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Upload File") }}{% end block %}
-
-{% block container %}
-	<section class="hero is-primary">
-		<div class="hero-body">
-			<div class="container">
-				<h1 class="title">{{ _("Upload File") }}</h1>
-			</div>
-		</div>
-	</section>
-
-	<section class="section">
-		<div class="container">
-			<div class="columns">
-				<div class="column is-8">
-					<form action="" method="POST" enctype="multipart/form-data">
-						{% raw xsrf_form_html() %}
-
-						<div class="field">
-							<label class="label">{{ _("File") }}</label>
-
-							<div class="control">
-								<div class="file has-name is-fullwidth">
-									<label class="file-label">
-										<input class="file-input" type="file" name="file">
-
-										<span class="file-cta">
-											<span class="file-icon">
-												<i class="fas fa-upload"></i>
-											</span>
-											<span class="file-label">
-												{{ _("Choose a file…") }}
-											</span>
-										</span>
-
-										<span class="file-name"></span>
-									</label>
-								</div>
-							</div>
-						</div>
-
-						<div class="field">
-							<label class="label">{{ _("Subject") }}</label>
-
-							<div class="control">
-								<input class="input" type="text" name="subject"
-									placeholder="{{ _("Subject") }} ({{ _("optional") }})">
-							</div>
-						</div>
-
-						<div class="field">
-							<label class="label">{{ _("Expires After") }}</label>
-
-							<div class="control">
-								<div class="select is-fullwidth" name="expires">
-									<select>
-										<option value="0">{{ _("never") }}</option>
-										<option value="600">{{ _("after ten minutes") }}</option>
-										<option value="3600">{{ _("after one hour") }}</option>
-										<option value="{{ 24 * 3600 }}">{{ _("after one day") }}</option>
-										<option value="{{ 7 * 24 * 3600 }}">{{ _("after one week") }}</option>
-										<option value="{{ 30 * 24 * 3600 }}" selected>{{ _("after one month") }}</option>
-									</select>
-								</div>
-							</div>
-						</div>
-
-						<div class="field">
-							<div class="control">
-								<button type="submit" class="button is-primary">
-									<i class="fa-solid fa-upload"></i> {{ _("Upload") }}
-								</button>
-							</div>
-						</div>
-					</form>
-				</div>
+{% extends "create.html" %}
+
+{% block paste %}
+	<div class="field">
+		<label class="label">{{ _("File") }}</label>
+
+		<div class="control">
+			<div class="file has-name is-fullwidth">
+				<label class="file-label">
+					<input class="file-input" type="file" name="file">
+
+					<span class="file-cta">
+						<span class="file-icon">
+							<i class="fas fa-upload"></i>
+						</span>
+						<span class="file-label">
+							{{ _("Choose a file…") }}
+						</span>
+					</span>
+
+					<span class="file-name"></span>
+				</label>
 			</div>
 		</div>
-	</section>
+	</div>
 {% end block %}