diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index aacedb035..cbd3858a5 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -79,8 +79,6 @@ h3, .throw, .row1 { background-color: #ddd; } .content dl, dd { margin:5px; } - -UL.thumbnails span.wrap2:hover { background-color:#7CBA0F; color:#999; } UL.thumbnails span.wrap2 { background-color:transparent; } @@ -130,7 +128,6 @@ A:hover, A:active { cursor: pointer; } -.content .navigationBar {color:#999;} ul.actions, .content form#waiting {text-align:center;} /* jQuery tooltips */ @@ -723,17 +720,11 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; } #filterList .ui-slider .ui-slider-range {background: rgba(255,166,70, 0.9); margin-top: -1px; border: 1px solid #ffaf58;} #filterList .ui-widget-content {border: 1px solid #EEE; background: #DDD;} -.navigationBar, .navigationBar a, -.navigationBar span { - background-color: #f9f9f9; border-radius: 10px; -} -.navigationBar a:hover {background-color: #ffd2a1;} + #batchManagerGlobal option[disabled] {background-color: #EEE;} .dimension-cancel {background-color: #F8F8F8 !important;} .pageNumberSelected {color: #FFF !important; font-weight: bold;} -.navigationBar span { - color: #BBB; -} + #batchManagerGlobal .ui-state-default, #batchManagerGlobal .ui-widget-content .ui-state-default,#batchManagerGlobal .ui-widget-header .ui-state-default { border: 1px solid #ffaf58; background: #ffaf58; } diff --git a/admin/themes/default/print.css b/admin/themes/default/print.css index 9e2998f8e..6471c10a4 100644 --- a/admin/themes/default/print.css +++ b/admin/themes/default/print.css @@ -1,4 +1,3 @@ -#menubar, .content .navigationBar, .navThumb, #addComment { display: none; } diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 69d178541..c92b67027 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -587,13 +587,11 @@ UL.thumbnails SPAN.wrap2 {ldelim} {if !empty($navbar) } -
+
-
{include file='navigation_bar.tpl'|@get_extent:'navbar'} -
-
+
{'display'|@translate} 20 50 diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl index 28f197ac7..153ab7144 100644 --- a/admin/themes/default/template/batch_manager_unit.tpl +++ b/admin/themes/default/template/batch_manager_unit.tpl @@ -113,9 +113,7 @@ jQuery("a.preview-box").colorbox( { {/foreach} -
{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} -

diff --git a/admin/themes/default/template/navigation_bar.tpl b/admin/themes/default/template/navigation_bar.tpl index 475017f3a..b605da4b2 100644 --- a/admin/themes/default/template/navigation_bar.tpl +++ b/admin/themes/default/template/navigation_bar.tpl @@ -1,28 +1,34 @@ -

+
{if isset($navbar.URL_FIRST)} - {'First'|@translate} - + {else} - {'First'|@translate} - {'Previous'|@translate} + + + {/if} {assign var='prev_page' value=0} +
{foreach from=$navbar.pages key=page item=url} - {if $page > $prev_page+1}...{/if} + {if $page > $prev_page+1}...{/if} {if $page == $navbar.CURRENT_PAGE} - {$page} + {$page} {else} {$page} {/if} {assign var='prev_page' value=$page} {/foreach} +
{if isset($navbar.URL_NEXT)} - - {'Last'|@translate} + {else} - {'Next'|@translate} - {'Last'|@translate} + + + {/if}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 0e53304cc..f8669a653 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -365,10 +365,6 @@ TABLE.doubleSelect SELECT.categoryList { justify-content: center; } -.pagination-container * { - margin: 10px; -} - .pagination-arrow { font-size: 14px; cursor: pointer; @@ -396,6 +392,10 @@ TABLE.doubleSelect SELECT.categoryList { align-items: baseline; } +.pagination-item-container > *{ + margin: 5px; +} + .pagination-item-container span { font-size: 20px; font-weight: bold; @@ -1868,6 +1868,10 @@ LEGEND { display: none; } +.batchManager-pagination { + display: flex; + align-items: center; +} #order_filters a.addFilter {font-weight:normal;margin-left:20px;} #order_filters a.removeFilter {font-weight:normal;} diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 8144c435a..1211db76a 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -71,8 +71,6 @@ h1 { .content dl, dd { margin:5px; } - -UL.thumbnails span.wrap2:hover { background-color:#7CBA0F; color:#666; } UL.thumbnails span.wrap2 { background-color:#333; } @@ -119,7 +117,6 @@ a.Piwigo:hover span.Piwigo { a { color:#bbb; } a:hover, a:active { color: #f70; cursor: pointer; } -.content .navigationBar {color:#666;} ul.actions, .content form#waiting {text-align:center;} #adminHome A, #menubar li A, #menubar dt { @@ -826,19 +823,13 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; text-decoration: none; background-color: #ffa646 !important; color: initial; } #forbidAction, .selectionEmptyBlock {background-color: #5a5757; color: #c1c1c1;} -.navigationBar, .navigationBar a, -.navigationBar span { - background-color: #555; border-radius: 10px; -} + .pageNumberSelected {background-color: #b4b4b4;} -.navigationBar a:hover {background-color: #888; color: #444;} #action_title .large, #action_author .large {background-color: #333; color: #fefefe;} #addFilter optgroup, #batchManagerGlobal option[disabled] {background-color: #555;} .dimension-cancel {background-color: #555 !important;} .pageNumberSelected {color: #777 !important; font-weight: bold;} -.navigationBar span { - color: #777; -} + #batchManagerGlobal .ui-state-default, #batchManagerGlobal .ui-widget-content .ui-state-default,#batchManagerGlobal .ui-widget-header .ui-state-default { border: 1px solid #ffaf58; background: #ffaf58; }