From fd0d5728a1ed728fb7eaa6b166ef5e795fe0472b Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario@mayan-edms.com>
Date: Fri, 26 Jul 2019 02:34:01 -0400
Subject: [PATCH] Improve toolbar display logic

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
---
 .../templates/appearance/list_toolbar.html    | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/mayan/apps/appearance/templates/appearance/list_toolbar.html b/mayan/apps/appearance/templates/appearance/list_toolbar.html
index d73de69556..72a4148390 100644
--- a/mayan/apps/appearance/templates/appearance/list_toolbar.html
+++ b/mayan/apps/appearance/templates/appearance/list_toolbar.html
@@ -7,53 +7,51 @@
     <div class="well center-block toolbar">
 {% endif %}
 
-    <div class="pull-left">
-        <div class="btn-toolbar" role="toolbar">
-            <div class="btn-group">
-                {% if links_multi_menus_results %}
-                    <a class="btn btn-default btn-sm check-all" data-checked=false data-icon-checked="fa fa-check-square" data-icon-unchecked="far fa-square" title="{% trans 'Select/Deselect all' %}">
-                        <i class="far fa-square"></i>
-                    </a>
-                {% endif %}
+    {% if links_multi_menus_results %}
+        <div class="pull-left">
+            <div class="btn-toolbar" role="toolbar" style="margin-right: 10px;">
+                <div class="btn-group">
+                        <a class="btn btn-default btn-sm check-all" data-checked=false data-icon-checked="fa fa-check-square" data-icon-unchecked="far fa-square" title="{% trans 'Select/Deselect all' %}">
+                            <i class="far fa-square"></i>
+                        </a>
+                </div>
             </div>
         </div>
-    </div>
+    {% endif %}
 
-{% if is_paginated %}
-    <div class="pull-left">
-        <div class="btn-toolbar" role="toolbar" style="margin-left: 10px;">
-            <div class="btn-group">
+    {% if is_paginated %}
+        <div class="pull-left">
+            <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group">
+                    {% if page_obj.has_previous %}
+                        <a class="btn btn-default btn-sm" href="?{{ page_obj.previous_page_number.querystring }}">&lsaquo;&lsaquo;</a>
+                    {% else %}
+                        <a class="btn btn-default btn-sm disabled" href="#">&lsaquo;&lsaquo;</a>
+                    {% endif %}
 
-        {% if page_obj.has_previous %}
-            <a class="btn btn-default btn-sm" href="?{{ page_obj.previous_page_number.querystring }}">&lsaquo;&lsaquo;</a>
-        {% else %}
-            <a class="btn btn-default btn-sm disabled" href="#">&lsaquo;&lsaquo;</a>
-        {% endif %}
+                    {% for page in page_obj.pages %}
 
-        {% for page in page_obj.pages %}
+                        {% if page %}
 
-            {% if page %}
-
-                {% ifequal page page_obj.number %}
-                    <a class="active btn btn-default btn-sm pagination-disabled" href="#">{{ page }}</a>
-                {% else %}
-                    <a class="btn btn-default btn-sm" href="?{{ page.querystring }}">{{ page }}</a>
-                {% endifequal %}
-            {% else %}
-                <a class="btn btn-default btn-sm disabled" href="#">...</a>
-            {% endif %}
-
-        {% endfor %}
-        {% if page_obj.has_next %}
-            <a class="btn btn-default btn-sm" href="?{{ page_obj.next_page_number.querystring }}">&rsaquo;&rsaquo;</a>
-        {% else %}
-            <a class="btn btn-default btn-sm disabled" href="#">&rsaquo;&rsaquo;</a>
-        {% endif %}
+                            {% ifequal page page_obj.number %}
+                                <a class="active btn btn-default btn-sm pagination-disabled" href="#">{{ page }}</a>
+                            {% else %}
+                                <a class="btn btn-default btn-sm" href="?{{ page.querystring }}">{{ page }}</a>
+                            {% endifequal %}
+                        {% else %}
+                            <a class="btn btn-default btn-sm disabled" href="#">...</a>
+                        {% endif %}
 
+                    {% endfor %}
+                    {% if page_obj.has_next %}
+                        <a class="btn btn-default btn-sm" href="?{{ page_obj.next_page_number.querystring }}">&rsaquo;&rsaquo;</a>
+                    {% else %}
+                        <a class="btn btn-default btn-sm disabled" href="#">&rsaquo;&rsaquo;</a>
+                    {% endif %}
+                </div>
             </div>
         </div>
-    </div>
-{% endif %}
+    {% endif %}
 
     {% if links_multi_menus_results %}
         <p class="pull-right" id="multi-item-title" style="line-height: 16px; padding-top: 8px;">{% trans 'Select items to activate bulk actions. Use Shift + click to select many.' %}</p>
@@ -84,9 +82,9 @@
                 {% endfor %}
             </ul>
         </div>
-        <div class="clearfix"></div>
     {% endif %}
 
 {% if is_paginated or links_multi_menus_results %}
+    <div class="clearfix"></div>
     </div>
 {% endif %}