jinja2: fixed alert messages for missing permissions, search result columns

cmeerw · cmeerw · commit 604d750759d6 · 2020-03-08T00:24:02.000Z
diff --git a/share/roundup/templates/jinja2/html/layout/banner.html b/share/roundup/templates/jinja2/html/layout/banner.html
@@ -1,13 +1,13 @@
 <div class="navbar navbar-light bg-light">
-  <a href="/" class='navbar-brand'>
+  <a href="{{ request.base }}" class='navbar-brand'>
     <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'>
-    <input type="hidden" name="@columns" value="{{ bug_columns_showall }}"/>
+    <input type="hidden" name="@columns" value="{{ 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 type="hidden" name="status" value="{{ status_notresolved }}"/>
     <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>
diff --git a/share/roundup/templates/jinja2/html/layout/navigation.html b/share/roundup/templates/jinja2/html/layout/navigation.html
@@ -1,6 +1,3 @@
-{% set columns = 'id,activity,title,creator,status' %}
-{% set columns_showall = 'id,activity,title,creator,assignedto,status' %}
-
 {% if request.user.hasPermission('View', 'query') %}
   <p>
     <b>{% trans %}Your Queries{% endtrans %}</b> (<a href="query?@template=edit">{% trans %}edit{% endtrans %}</a>)
@@ -35,15 +32,7 @@
        })|u }}">{% trans %}Show Unassigned{% endtrans %}</a>
     </li>
     <li class="nav-item">
-      <a href="{{ request.indexargs_url('issue', {
-        '@sort': '-activity',
-        '@group': 'priority',
-        '@filter': 'status',
-        '@columns': columns_showall,
-        '@search_text': '',
-        'status': status_notresolved,
-        '@dispname': i18n.gettext('Show All'),
-       })|u }}">{% trans %}Show All{% endtrans %}</a>
+      <a href="{{ request.base }}?@dispname={{ i18n.gettext('Show All')|u|urlencode }}">{% trans %}Show All{% endtrans %}</a>
     </li>
     <li>
       <a href="issue?@template=search">{% trans %}Search{% endtrans %}</a>
diff --git a/share/roundup/templates/jinja2/html/layout/page.html b/share/roundup/templates/jinja2/html/layout/page.html
@@ -1,4 +1,6 @@
 {% set status_notresolved = '-1,1,2,3,4,5,6,7' -%}
+{% set columns = 'id,activity,title,creator,status' -%}
+{% set columns_showall = 'id,activity,title,creator,assignedto,status' -%}
 <!doctype html>
 <html>
   <head>
@@ -29,7 +31,7 @@
             <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'>
+                <div class="alert alert-danger alert-dismissible fade show" role="alert">
                   <ul class="mb-0">
                     {% for message in options.error_message %}
                       <li>{{ message|safe }}</li>
@@ -41,7 +43,7 @@ <h3>{% block page_header %} {% endblock %}</h3>
                 </div>
               {% endif %}
               {% if options.ok_message %}
-                <div class='alert alert-success alert-dismissible fade show'>
+                <div class="alert alert-success alert-dismissible fade show" role="alert">
                   <ul class="mb-0">
                     {% for message in options.ok_message %}
                       <li>{{ message|safe }}</li>
diff --git a/share/roundup/templates/jinja2/html/layout/permission.html b/share/roundup/templates/jinja2/html/layout/permission.html
@@ -1,13 +1,12 @@
-{% if not (context.is_view_ok() or request.user.hasRole('Anonymous')) %}
-  <p class='alert alert-block alert-error fade in'> 
-    {% trans %}You are not allowed to view this page.{% endtrans %}
-    <button type='button' class='close' data-dismiss='alert'>X</button>
-  </p>
-{% endif %}
-
-{% if not context.is_view_ok() and request.user.hasRole('Anonymous') %}
-  <p class='alert alert-block alert-error fade in'> 
-    {% trans %}Please login with your username and password.{% endtrans %}
-    <button type='button' class='close' data-dismiss='alert'>X</button>
-  </p>
+{% if not context.is_view_ok() %}
+<div class="alert alert-warning alert-dismissible fade show" role="alert"> 
+  {% if request.user.hasRole('Anonymous') %}
+  {% trans %}Please login with your username and password.{% endtrans %}
+  {% else %}
+  {% trans %}You are not allowed to view this page.{% endtrans %}
+  {% endif %}
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
 {% endif %}
