jinja2: updated file listing/editing

Author: cmeerw

share/roundup/templates/jinja2/html/file.index.html

@@ -4,28 +4,32 @@ <h4>{% trans %}Files{% endtrans %}</h4>
     <th>{% trans %}File name{% endtrans %}</th>
     <th>{% trans %}Uploaded{% endtrans %}</th>
     <th>{% trans %}Type{% endtrans %}</th>
-    <th>{% trans %}Edit{% endtrans %}</th>
-    <th>{% trans %}Remove{% endtrans %}</th>
+    <th>{% if context.is_edit_ok() %}{% trans %}Edit{% endtrans %}{% else %}{% trans %}Details{% endtrans %}{% endif %}</th>
+    {% if context.is_edit_ok() %}<th>{% trans %}Remove{% endtrans %}</th>{% endif %}
   </tr>
   {% for file in context.files %}
     <tr>
       <td>
-        <a href='{{ file.download_url() }}'>{{ file.name.plain()|u }}</a>
+        <a class="btn btn-sm btn-outline-primary" href='{{ file.download_url()|u|safe }}'>{{ file.name.plain()|u }}</a>
       </td>
       <td>{{ file.creator.plain()|u }}, {{ file.creation.plain()|u }}</td>
       <td>{{ file.type.plain()|u }}</td>
-      {% if file.is_edit_ok %}
-        <td>
-          <a href='file{{ file.id }}'>{% trans %}edit{% endtrans %}</a>
-        </td>
-      {% endif %}
-      {% if context.is_edit_ok %}
+      <td>
+        <a class="btn btn-sm btn-success" href='file{{ file.id }}'>
+		  {% if file.is_edit_ok() %}
+		  {% trans %}edit{% endtrans %}
+		  {% else %}
+		  {% trans %}view{% endtrans %}
+		  {% endif %}
+		</a>
+      </td>
+      {% if file.is_edit_ok() %}
         <td>
           <form method="POST" action='issue{{ context.id }}'>
             <input type="hidden" name="@remove@files" value='{{ file.id }}'>
             <input name="@csrf" type="hidden" value="{{ utils.anti_csrf_nonce() }}">
             <input type="hidden" name="@action" value="edit">
-            <input type="submit" value="{% trans %}remove{% endtrans %}">
+            <input class="btn btn-sm btn-danger" type="submit" value="{% trans %}remove{% endtrans %}">
           </form>
         </td>
       {% endif %}

share/roundup/templates/jinja2/html/file.item.html

@@ -1,4 +1,6 @@
 {% extends 'layout/page.html' %}
+{% import 'layout/view.tmpl' as view with context -%}
+{% import 'layout/edit.tmpl' as edit with context -%}
 
 {% block head_title %}
   {% trans %}File display{% endtrans %}
@@ -16,32 +18,33 @@
     <form method="POST"
       enctype="multipart/form-data" action='{{ context.designator() }}'>
 
-      <dl class="row row-cols-1 row-cols-md-2">
-        <div class="col row">
-          <dt class="col col-auto">{% trans %}Name{% endtrans %}</dt>
-          <dd class="col col-auto">{{ context.name.field()|u|safe }}</dd>
-        </div>
-        <div class="col row">
-          <dt class="col col-auto">{% trans %}Content Type{% endtrans %}</dt>
-          <dd class="col col-auto">{{ context.type.field()|u|safe }}</dd>
-        </div>
-      </dl>
+      <dl class="row row-cols-1 row-cols-lg-2 no-gutters">
+		{% if context.is_edit_ok() %}
+		{{ edit.field_small('Name', 'name', 'name', required=True) }}
+		{{ edit.field_small('Content Type', 'type', 'type', required=True) }}
+		{% else %}
+		{{ view.field_small('Name', 'name') }}
+		{{ view.field_small('Content Type', 'type') }}
+		{% endif %}
+	  </dl>
 
       <input type="hidden" name="@template" value="item">
       <input type="hidden" name="@required" value="name,type">
       {% if '@multilink' in request.form %}
         <input type="hidden" name="@multilink"
           value='{{ request.form["@multilink"].value()|u }}'>
       {% endif %}
+      {% if context.is_edit_ok() %}
       <div class='form-actions'>
-        {{ context.submit()|u|safe }}
+        {{ context.submit(html_kwargs={'class': 'btn btn-primary'})|u|safe }}
       </div>
+      {% endif %}
     </form>
   {% endif %}
 
   {% if context.id and context.is_view_ok() %}
     <div>
-      <a href='file{{ context.id }}/{{ context.name.plain()|u }}'>{% trans %}Download{% endtrans %}</a>
+      <a class="btn btn-success" href="file{{ context.id }}/{{ context.name.plain()|u }}">{% trans %}Download{% endtrans %}</a>
     </div>
   {% endif %}