matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move pagination navigation inside the toolbar

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-07-25 00:44:07 -04:00
parent ee63829e7f
commit 033cecd946
6 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY.rst
View File

@@ -60,6 +60,7 @@
- Update the EXIFTOOL driver to run for all documents
regardless of MIME type.
- Remove task inspection from task manager app.
- Move pagination navigation inside the toolbar.
3.2.6 (2019-07-10)
==================

1
docs/releases/3.3.rst
View File

@@ -75,6 +75,7 @@ Changes
or single celery commands like "flower".
- Add platform template to return queues for a worker.
- Remove task inspection from task manager app.
- Move pagination navigation inside the toolbar.
Removals

10
mayan/apps/appearance/static/appearance/css/base.css
View File

@@ -542,3 +542,13 @@ a i {
.navbar-fixed-top {
box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.4);
}
.toolbar {
border: 1px solid rgba(0, 0, 0, 0.1);
box-shadow: 1px 1px 2px rgba(0, 0, 0, .3);
margin-bottom: 10px;
padding-bottom: 8px;
padding-left: 12px;
padding-right: 15px;
padding-top: 8px;
}

1
mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
View File

@@ -103,7 +103,6 @@
</div>
{% endfor %}
</div>
{% include 'pagination/pagination.html' %}
</div>
{% endif %}
</div>

1
mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
View File

@@ -142,7 +142,6 @@
</tbody>
</table>
</div>
{% include 'pagination/pagination.html' %}
</div>
{% endif %}
</div>

45
mayan/apps/appearance/templates/appearance/list_toolbar.html
View File

@@ -3,7 +3,9 @@
{% load common_tags %}
{% load navigation_tags %}
<div class="well center-block" style="border: 1px solid rgba(0, 0, 0, 0.1); margin-bottom: 10px; padding-bottom: 8px; padding-top: 8px; padding-left: 12px; padding-right: 15px; box-shadow: 1px 1px 2px rgba(0, 0, 0, .3);">
{% if is_paginated or links_multi_menus_results %}
<div class="well center-block toolbar">
{% endif %}
<div class="pull-left">
<div class="btn-toolbar" role="toolbar">
@@ -17,6 +19,42 @@
</div>
</div>
{% if is_paginated %}
<div class="pull-left">
<div class="btn-toolbar" role="toolbar" style="margin-left: 10px;">
<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 %}
{% for page in page_obj.pages %}
{% 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 %}
</div>
</div>
</div>
{% 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>
@@ -48,4 +86,7 @@
</div>
<div class="clearfix"></div>
{% endif %}
</div>
{% if is_paginated or links_multi_menus_results %}
</div>
{% endif %}