polished jinja2 template

Author: cmeerw

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

@@ -13,7 +13,8 @@
   {% include 'layout/permission.html' %}
 
   {% if context.is_view_ok() %}
-    {% if request.batch() %}
+    {% set batch = request.batch() %}
+    {% if batch %}
       <table class='table'>
         <tr class='info'>
 		  {% if request.show.priority %}
@@ -44,7 +45,7 @@
           <td>{% trans %}Assigned To{% endtrans %}</td>
 		  {% endif %}
         </tr>
-        {% for issue in request.batch() %}
+        {% for issue in batch %}
           <tr>
 		   {% if request.show.priority %}
            <td>{{ issue.priority.plain()|u }}</td>
@@ -79,8 +80,8 @@
         {% endfor %}
       </table>
       {% include 'layout/pagination.html' %}
-      <div>
-        <a class='btn btn-secondary'
+      <div class="d-flex justify-content-end">
+        <a class='btn btn-sm btn-secondary'
            href="{{ request.indexargs_url('issue', {'@action':'export_csv'}) }}">
           {% trans %}Download as CSV{% endtrans %}
         </a>

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

@@ -54,13 +54,13 @@ <h4>Messages</h4>
           Author: {{ msg.author.plain()|u }}, Date: {{ msg.date.plain()|u }}
         </div>
         <div class="col col-lg-auto">
-          {% if context.is_edit_ok %}
+          {% if context.is_edit_ok() %}
             <form method="POST" action='issue{{ context.id }}' class='form-inline'>
               <input type="hidden" name="@remove@messages" value='{{ msg.id }}'>
               <input name="@csrf" type="hidden"
                      value="{{ utils.anti_csrf_nonce() }}">
               <input type="hidden" name="@action" value="edit">
-              <input type="submit" value="remove">
+              <input class="btn btn-danger btn-sm" type="submit" value="{% trans %}Remove{% endtrans %}">
             </form>
           {% endif %}
         </div>

share/roundup/templates/jinja2/html/issue.item.readonly.html

@@ -2,7 +2,7 @@
 {% set dd_class_full = 'col col-8 col-md-9 col-lg-10' -%}
 {% set dt_class_half = 'col col-4 col-md-3 col-lg-4' -%}
 {% set dd_class_half = 'col col-8 col-md-9 col-lg-8' -%}
-<dl class="row row-cols-1 row-cols-lg-2">
+<dl class="row row-cols-1 row-cols-lg-2 no-gutters">
   <div class="col col-lg-12 row">
     <dt class="{{ dt_class_full }}">{% trans %}Title{% endtrans %}</dt>
     <dd class="{{ dd_class_full }}">{{ context.title.plain()|u }}</dd>
@@ -15,10 +15,12 @@
     <dt class="{{ dt_class_half }}">{% trans %}Status{% endtrans %}</dt>
     <dd class="{{ dd_class_half }}">{{ context.status.plain()|u }}</dd>
   </div>
+  {% if context.superseder %}
   <div class="col col-lg-12 row">
     <dt class="{{ dt_class_full }}">{% trans %}Superseder{% endtrans %}</dt>
     <dd class="{{ dd_class_full }}">{{ context.superseder.plain()|u }}</dd>
   </div>
+  {% endif %}
   <div class="col col-lg-12 row">
     <dt class="{{ dt_class_full }}">{% trans %}Nosy list{% endtrans %}</dt>
     <dd class="{{ dd_class_full }}">{{ context.nosy.plain()|u }}</dd>

share/roundup/templates/jinja2/html/layout/banner.html

@@ -1,14 +1,14 @@
 <div class="navbar navbar-light bg-light">
   <a href="/" class='navbar-brand'>
-    <i class='icon-home'></i> {% trans %}Roundup Demo Tracker{% endtrans %}
+    <i class='icon-home'></i> {{ config.TRACKER_NAME|u }}
   </a>
-  <form name="searchform" method="get" action="issue" class='form-inline  my-2 my-lg-0 navbar-search pull-right'>
+  <form name="searchform" method="get" action="issue" class='form-inline my-2 my-lg-0 navbar-search'>
     <input type="hidden" name="@columns" value="{{ bug_columns_showall }}"/>
     <input type="hidden" name="@sort" value="-activity">
     <input type="hidden" name="@group" value="priority">
     <input type="hidden" name="@filter" value="status">
     <input type="hidden" name="status" value="{{ bug_status_notclosed }}"/>
-    <input class="form-control mr-sm-2 input-medium search-query" id="search-text" type="search" name="@search_text">
-    <input class="form-control my-2 my-sm-0" type="submit" value="{% trans %}search in open bugs{% endtrans %}" name="submit" class='btn'>
+    <input class="form-control form-control-sm mr-sm-2 search-query" id="search-text" type="search" name="@search_text">
+    <input class="btn btn-sm btn-outline-success my-2 my-sm-0" type="submit" value="{% trans %}Search{% endtrans %}" name="submit">
   </form>
-</div> <!-- navbar -->
+</div>

share/roundup/templates/jinja2/html/layout/navigation.html

@@ -27,8 +27,8 @@
         '@search_text': '',
         'status': status_notresolved,
         'assignedto': '-1',
-        '@dispname': i18n.gettext('Show Unassigned')|u,
-       }) }}">{% trans %}Show Unassigned{% endtrans %}</a>
+        '@dispname': i18n.gettext('Show Unassigned'),
+       })|u|safe }}">{% trans %}Show Unassigned{% endtrans %}</a>
     </li>
     <li class="nav-item">
       <a href="{{ request.indexargs_url('issue', {
@@ -38,8 +38,8 @@
         '@columns': columns_showall,
         '@search_text': '',
         'status': status_notresolved,
-        '@dispname': i18n.gettext('Show All')|u,
-       }) }}">{% trans %}Show All{% endtrans %}</a>
+        '@dispname': i18n.gettext('Show All'),
+       })|u|safe }}">{% trans %}Show All{% endtrans %}</a>
     </li>
     <li>
       <a href="issue?@template=search">{% trans %}Search{% endtrans %}</a>
@@ -50,7 +50,7 @@
           <input type="hidden" name="@type" value="issue">
           <input type="hidden" name="@action" value="show">
           <input class="form-control form-control-sm col-2" type="text" name="@number">
-          <input class="form-control form-control-sm btn btn-outline-secondary" type="submit" value="{% trans %}Show issue{% endtrans %}">
+          <input class="btn btn-sm btn-outline-secondary" type="submit" value="{% trans %}Show issue{% endtrans %}">
         </div>
       </form>
     </li>
@@ -110,7 +110,7 @@
   <hr>
 {% endif %}
 
-{% if  request.user.username == 'anonymous' %}
+{% if request.user.username == 'anonymous' %}
   <form method="POST" action='{{ request.base }}'>
     <ul class='nav flex-column'>
       <li class='nav-header'>
@@ -128,7 +128,7 @@
         </label>
       </li>
       <li class="nav-item">
-        <input class="btn btn-secondary form-control-sm" type="submit" value="{% trans %}Login{% endtrans %}">
+        <input class="btn btn-sm btn-secondary" type="submit" value="{% trans %}Login{% endtrans %}">
       </li>
       <li class='vspace-one'>
         {% if request.user.hasPermission('Register', 'user') %}

share/roundup/templates/jinja2/html/layout/page.html

@@ -19,14 +19,14 @@
     {% block page_content %}
       <div class='container-fluid'>
         <div class='row'>
-          <div class='col-2 navigation'>
+          <div class='col-3 col-lg-2 navigation'>
             {% block leftnav %}
               {% include 'layout/navigation.html' %}
             {% endblock %}
           </div>
 
-          <div class='col-10'>
-            <div class='pb-2 mt-4 mb-2 border-bottom'>
+          <div class='col-9 col-lg-10'>
+            <div class='pb-2 mb-2 border-bottom'>
               <h3>{% block page_header %} {% endblock %}</h3>
               {% if options.error_message %}
                 <div class='alert alert-danger alert-dismissible fade show'>

share/roundup/templates/jinja2/static/style.css

@@ -16,20 +16,31 @@ h1 {
   line-height: 24px;
 }
 
-.navbar {
-  margin: 20px 0;
+.navbar-light {
+  border-radius: 4px;
+  border: 1px solid #d4d4d4;
+  background-image: linear-gradient(to bottom,#ffffff,#e8e8e8);
+  background-repeat: repeat-x;
+  margin: 20px 15px;
+  padding: .3rem 1rem;
 }
 
-.navbar form {
+.navbar-light form {
   margin: 8px;
 }
 
-.navbar .btn {
+.navbar-light .btn {
   margin-top: 0;
 }
 
-.navbar .brand {
-  color: #B31B1B;
+tr.info {
+  background-color: #d9edf7;
+}
+
+pre {
+  background-color: #f0f0f0;
+  border: 1pt solid gray;
+  padding: 6pt;
 }
 
 footer {