diff --git a/assets/css/app.scss b/assets/css/app.scss index a9b63e15be..0b9727a947 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -241,6 +241,21 @@ @apply bg-ch-secondary text-ch-text-secondary; } + // Pager + .pager-bar { + } + .pager-bar .pager-select { + } + .pager-bar .pager-counter { + @apply mt-4; + } + .pager-bar .pager-jumper { + @apply mt-4; + } + .pager-bar .pager-jumper .btn-link { + @apply -mt-2 mx-2; + } + @import "scss/index.scss"; } diff --git a/public/main/inc/lib/sortable_table.class.php b/public/main/inc/lib/sortable_table.class.php index d4780aaa1b..d0bc83c7b5 100644 --- a/public/main/inc/lib/sortable_table.class.php +++ b/public/main/inc/lib/sortable_table.class.php @@ -300,39 +300,17 @@ class SortableTable extends HTML_Table $params['urlVar'] = $this->param_prefix.'page_nr'; $params['currentPage'] = $this->page_nr; $icon_attributes = ['style' => 'vertical-align: middle;']; - /*$params['prevImg'] = Display:: return_icon( - 'action_prev.png', - get_lang('Previous page'), - $icon_attributes - );*/ - $params['prevImg'] = Display::returnFontAwesomeIcon('caret-left'); - - /*$params['nextImg'] = Display:: return_icon( - 'action_next.png', - get_lang('Next page'), - $icon_attributes - );*/ - $params['nextImg'] = Display::returnFontAwesomeIcon('caret-right'); - - /*$params['firstPageText'] = Display:: return_icon( - 'action_first.png', - get_lang('First page'), - $icon_attributes - );*/ - $params['firstPageText'] = Display::returnFontAwesomeIcon('step-backward'); - - /*$params['lastPageText'] = Display:: return_icon( - 'action_last.png', - get_lang('Last page'), - $icon_attributes - );*/ - $params['lastPageText'] = Display::returnFontAwesomeIcon('step-forward'); + $params['prevImg'] = Display::getMdiIcon('step-backward'); + $params['nextImg'] = Display::getMdiIcon('step-forward'); + $params['firstPageText'] = Display::getMdiIcon('step-backward-2'); + $params['lastPageText'] = Display::getMdiIcon('step-forward-2'); $params['firstPagePre'] = ''; $params['lastPagePre'] = ''; $params['firstPagePost'] = ''; $params['lastPagePost'] = ''; $params['spacesBeforeSeparator'] = ''; $params['spacesAfterSeparator'] = ''; + $params['curPageLinkClassName'] = 'ch-pager'; $query_vars = array_keys($_GET); $query_vars_needed = [ $this->param_prefix.'column', @@ -402,15 +380,15 @@ class SortableTable extends HTML_Table $form = $this->get_page_select_form(); $nav = $this->get_navigation_html(); $html = '
'; - $html .= '
'; + $html .= '
'; $html .= '
'; - $html .= '
'.$form.'
'; + $html .= '
'.$form.'
'; $html .= '
'; $html .= '
'; - $html .= '
'.$this->get_table_title().'
'; + $html .= '
'.$this->get_table_title().'
'; $html .= '
'; $html .= '
'; - $html .= '
'.$nav.'
'; + $html .= '
'.$nav.'
'; $html .= '
'; $html .= '
'; $html .= '
';