From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 24 Oct 2018 12:31:44 +0000 (+0100)
Subject: nopaste: Remove download button and add button to the bottom
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2f81dbdf4406ee2e46d523d6feacb680fb54371;p=ipfire.org.git

nopaste: Remove download button and add button to the bottom

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

diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html
index 4c04e5df..e9976461 100644
--- a/src/templates/nopaste/view.html
+++ b/src/templates/nopaste/view.html
@@ -13,39 +13,30 @@
 
 						{% if entry.account %}
 							{{ _("by") }}
-							<a href="https://people.ipfire.org/users/{{ entry.account.uid }}">{{ entry.account }}</a>,
+							<a href="https://people.ipfire.org/users/{{ entry.account.uid }}">{{ entry.account }}</a>
 						{% else %}
-							{{ _("from %s") % entry.address }},
+							{{ _("from %s") % entry.address }}
 						{% end %}
 					</h6>
 
-					<div class="row mb-1">
-						<div class="col-12 text-md-right">
-							{% if content %}
-								<a class="btn btn-primary mr-2 mb-2" href="/raw/{{ entry.uuid }}">
-									<span class="fas fa-file-download mr-2"></span>
-									{{ _("Download") }}
-								</a>
-							{% end %}
-						</div>
-					</div>
-
 					<hr>
 
 					{% if content %}
-						{% module Code(content) %}
-					{% elif entry.mimetype.startswith("image/") %}
-						<img class="img-fluid" src="/raw/{{ entry.uuid }}">
-					{% else %}
-						<div class="row justify-content-center my-5">
-							<div class="col-12 col-md-6 text-center">
-								<a class="btn btn-primary btn-lg btn-block" href="/raw/{{ entry.uuid }}">
-									<span class="fas fa-file-download"></span>
-									{{ _("Download") }} ({{ format_size(entry.size) }})
-								</a>
-							</div>
+						<div class="mb-3">
+							{% module Code(content) %}
 						</div>
+
+						<hr>
+					{% elif entry.mimetype.startswith("image/") %}
+						<img class="img-fluid mb-3" src="/raw/{{ entry.uuid }}">
+
+						<hr>
 					{% end %}
+
+					<a class="btn btn-primary btn-lg btn-block" href="/raw/{{ entry.uuid }}">
+						<span class="fas fa-file-download"></span>
+						{{ _("Download") }} ({{ format_size(entry.size) }})
+					</a>
 				</div>
 			</div>
 		</div>