Redesign tags and license edit pages

diff --git a/app/templates/admin/licenses/edit.html b/app/templates/admin/licenses/edit.html
index eabe782d9cf8fdfc7b606255bb21a85c3064dc8d..e488c5678af90109df7d84120064203fab586a9b 100644 (file)
--- 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 869aac62cda4d5b9a4b3a4cb9f5fe3a86f78799d..9d517c578096cf5d08f13bac34d7521b287a2c54 100644 (file)
--- 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 5ffe2d00d181e7dd89257eb90b7c2f4b78219966..f25312e541e5642a1daaf1946b83ca81a73447d3 100644 (file)
--- 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 daae8e78a47faa09fec4de148ef9012b58ec2cb8..574d1a62ff7885e197bb5aff89c504fc804c9d4a 100644 (file)
--- 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 %}