From 8bcf12e1a767367f536e16578208db3c1317b0c9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 12 Jul 2020 20:32:32 +0100
Subject: [PATCH] Redesign tags and license edit pages

---
 app/templates/admin/licenses/edit.html |  6 ++----
 app/templates/admin/licenses/list.html | 19 +++++++++++++------
 app/templates/admin/tags/edit.html     |  6 ++----
 app/templates/admin/tags/list.html     | 21 ++++++++++++++++-----
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/templates/admin/licenses/edit.html b/app/templates/admin/licenses/edit.html
index eabe782..e488c56 100644
--- a/app/templates/admin/licenses/edit.html
+++ b/app/templates/admin/licenses/edit.html
@@ -9,10 +9,8 @@
 {% endblock %}
 
 {% block content %}
-	<p>
-		<a href="{{ url_for('admin.license_list') }}">Back to list</a> |
-		<a href="{{ url_for('admin.create_edit_license') }}">New License</a>
-	</p>
+	<a class="btn btn-primary float-right" href="{{ url_for('admin.create_edit_license') }}">New License</a>
+	<a class="btn btn-secondary mb-4" href="{{ url_for('admin.license_list') }}">Back to list</a>
 
 	{% from "macros/forms.html" import render_field, render_submit_field %}
 	<form method="POST" action="" enctype="multipart/form-data">
diff --git a/app/templates/admin/licenses/list.html b/app/templates/admin/licenses/list.html
index 869aac6..9d517c5 100644
--- a/app/templates/admin/licenses/list.html
+++ b/app/templates/admin/licenses/list.html
@@ -5,12 +5,19 @@ Licenses
 {% endblock %}
 
 {% block content %}
-	<p>
-		<a href="{{ url_for('admin.create_edit_license') }}">New License</a>
-	</p>
-	<ul>
+	<a class="btn btn-primary float-right" href="{{ url_for('admin.create_edit_license') }}">{{ _("New License") }}</a>
+
+	<h1>{{ _("Licenses") }}</h1>
+
+	<div class="list-group">
 		{% for l in licenses %}
-			<li><a href="{{ url_for('admin.create_edit_license', name=l.name) }}">{{ l.name }}</a> [{{ l.is_foss and "Free" or "Non-free"}}]</li>
+			<a class="list-group-item list-group-item-action"
+					href="{{ url_for('admin.create_edit_license', name=l.name) }}">
+				<span class="float-right badge {% if l.is_foss %}badge-primary{% else %}badge-warning{% endif %} badge-pill">
+					{{ l.is_foss and "Free" or "Non-free"}}
+				</span>
+				{{ l.name }}
+			</a>
 		{% endfor %}
-	</ul>
+	</div>
 {% endblock %}
diff --git a/app/templates/admin/tags/edit.html b/app/templates/admin/tags/edit.html
index 5ffe2d0..f25312e 100644
--- a/app/templates/admin/tags/edit.html
+++ b/app/templates/admin/tags/edit.html
@@ -9,10 +9,8 @@
 {% endblock %}
 
 {% block content %}
-	<p>
-		<a href="{{ url_for('admin.tag_list') }}">Back to list</a> |
-		<a href="{{ url_for('admin.create_edit_tag') }}">New Tag</a>
-	</p>
+	<a class="btn btn-primary float-right" href="{{ url_for('admin.create_edit_tag') }}">New Tag</a>
+	<a class="btn btn-secondary mb-4" href="{{ url_for('admin.tag_list') }}">Back to list</a>
 
 	{% from "macros/forms.html" import render_field, render_submit_field %}
 	<form method="POST" action="" enctype="multipart/form-data">
diff --git a/app/templates/admin/tags/list.html b/app/templates/admin/tags/list.html
index daae8e7..574d1a6 100644
--- a/app/templates/admin/tags/list.html
+++ b/app/templates/admin/tags/list.html
@@ -1,16 +1,27 @@
 {% extends "base.html" %}
 
 {% block title %}
-Tags
+{{ _("Tags") }}
 {% endblock %}
 
 {% block content %}
+	<a class="btn btn-primary float-right" href="{{ url_for('admin.create_edit_tag') }}">{{ _("New Tag") }}</a>
+
+	<h1>{{ _("Tags") }}</h1>
+
 	<p>
-		<a href="{{ url_for('admin.create_edit_tag') }}">New Tag</a>
+		Also see <a href="/help/package_tags/">Package Tags</a>.
 	</p>
-	<ul>
+
+	<div class="list-group">
 		{% for t in tags %}
-			<li><a href="{{ url_for('admin.create_edit_tag', name=t.name) }}">{{ t.title }}</a> [{{ t.packages | count }} packages]</li>
+			<a class="list-group-item list-group-item-action"
+					href="{{ url_for('admin.create_edit_tag', name=t.name) }}">
+				<span class="float-right badge badge-primary badge-pill">
+					{{ t.packages | count }}
+				</span>
+				{{ t.title }}
+			</a>
 		{% endfor %}
-	</ul>
+	</div>
 {% endblock %}
-- 
2.44.0