Support passing any attribute to the pagination control wrapper. #1030

omeka · Sep 6, 2024 · ca67896 · ca67896
1 parent 9fc5cd5
commit ca67896
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/admin/themes/default/collections/browse.php b/admin/themes/default/collections/browse.php
@@ -6,7 +6,7 @@
 ?>
 
 <?php if (total_records('Collection') > 0): ?>
-    <?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+    <?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
     <?php if (is_allowed('Collections', 'add')): ?>
         <a href="<?php echo html_escape(url('collections/add')); ?>" class="green button">
             <?php echo __('Add a Collection'); ?>
@@ -86,7 +86,7 @@
             </table>
         </div>
 
-        <?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+        <?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
         <?php if (is_allowed('Collections', 'add')): ?>
             <a href="<?php echo html_escape(url('collections/add')); ?>" class="green button"><?php echo __('Add a Collection'); ?></a>
         <?php endif; ?>

diff --git a/admin/themes/default/item-types/browse.php b/admin/themes/default/item-types/browse.php
@@ -9,7 +9,7 @@
 <?php echo link_to('item-types', 'add', __('Add an Item Type'), array('class'=>'add green button')); ?>
 <?php endif ?>
 
-<?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
 
 <p class="without-item-type">
     <?php if ($totalItemsWithoutType):
@@ -54,7 +54,7 @@
 <?php echo link_to('item-types', 'add', __('Add an Item Type'), array('class'=>'add green button')); ?>
 <?php endif ?>
 
-<?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
 
 <p class="without-item-type"><?php echo $withoutTypeMessage; ?></p>
 

diff --git a/admin/themes/default/items/browse.php b/admin/themes/default/items/browse.php
@@ -12,7 +12,7 @@
 ?>
 
 <?php if ($total_results): ?>
-    <?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+    <?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
     <?php if (is_allowed('Items', 'add')): ?>
     <a href="<?php echo html_escape(url('items/add')); ?>" class="add full-width-mobile button green"><?php echo __('Add an Item'); ?></a>
     <?php endif; ?>
@@ -149,7 +149,7 @@
         </div>
     </form>
 
-    <?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+    <?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
     <?php if (is_allowed('Items', 'add')): ?>
     <a href="<?php echo html_escape(url('items/add')); ?>" class="add full-width-mobile button green"><?php echo __('Add an Item'); ?></a>
     <?php endif; ?>

diff --git a/admin/themes/default/search/index.php b/admin/themes/default/search/index.php
@@ -5,7 +5,7 @@
 ?>
 <?php echo search_filters(); ?>
 <?php if ($total_results): ?>
-<?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
 <table id="search-results">
     <thead>
         <tr>
@@ -33,7 +33,7 @@
         <?php endforeach; ?>
     </tbody>
 </table>
-<?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
 <?php else: ?>
 <div id="no-results">
     <p><?php echo __('Your query returned no results.');?></p>

diff --git a/admin/themes/default/tags/browse.php b/admin/themes/default/tags/browse.php
@@ -56,7 +56,7 @@
 
 <?php if ($total_results): ?>
 
-    <?php echo pagination_links(['aria_label' => __('Pagination')]); ?>
+    <?php echo pagination_links(); ?>
 
     <section>
         <div id="tags-nav">

diff --git a/admin/themes/default/users/browse.php b/admin/themes/default/users/browse.php
@@ -42,7 +42,7 @@
     <button id="search-users-button"><?php echo __('Search users'); ?></button>
 </form>
 
-<?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
 <div class="table-responsive">
     <table id="users">
         <thead>

diff --git a/application/libraries/globals.php b/application/libraries/globals.php
@@ -2807,10 +2807,11 @@ function pagination_links($options = array())
     $totalCount = isset($options['total_results']) ? (int) $options['total_results'] : (int) $p['total_results'];
     $pageNumber = isset($options['page']) ? (int) $options['page'] : (int) $p['page'];
     $itemCountPerPage = isset($options['per_page']) ? (int) $options['per_page'] : (int) $p['per_page'];
-    $ariaLabel = isset($options['aria_label']) ? $options['aria_label'] : '';
-    $params = [
-        'ariaLabel' => $ariaLabel
+    $defaultAttrs = [
+        'class' => 'pagination-nav',
+        'aria-label' => __('Pagination')
     ];
+    $attrs = isset($options['attributes']) ? $options['attributes'] + $defaultAttrs : $defaultAttrs;
 
     // Create an instance of Zend_Paginator.
     $paginator = Zend_Paginator::factory($totalCount);
@@ -2820,7 +2821,7 @@ function pagination_links($options = array())
               ->setItemCountPerPage($itemCountPerPage)
               ->setPageRange($pageRange);
 
-    return get_view()->paginationControl($paginator, $scrollingStyle, $partial, $params);
+    return get_view()->paginationControl($paginator, $scrollingStyle, $partial, ['attrs' => $attrs]);
 }
 
 /**

diff --git a/application/views/scripts/collections/browse.php b/application/views/scripts/collections/browse.php
@@ -4,7 +4,7 @@
 ?>
 
 <h1><?php echo $pageTitle; ?> <?php echo __('(%s total)', $total_results); ?></h1>
-<?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
 
 <?php
 $sortLinks[__('Title')] = 'Dublin Core,Title';
@@ -46,7 +46,7 @@
 
 <?php endforeach; ?>
 
-<?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
 
 <?php fire_plugin_hook('public_collections_browse', array('collections' => $collections, 'view' => $this)); ?>
 

diff --git a/application/views/scripts/common/pagination_control.php b/application/views/scripts/common/pagination_control.php
@@ -2,7 +2,7 @@
 if ($this->pageCount > 1):
     $getParams = $_GET;
 ?>
-<nav class="pagination-nav" aria-label="<?php echo $ariaLabel; ?>">
+<nav <?php echo tag_attributes($attrs); ?>>
     <ul class="pagination">
         <?php if (isset($this->previous)): ?>
         <!-- Previous page link -->

diff --git a/application/views/scripts/items/browse.php b/application/views/scripts/items/browse.php
@@ -11,7 +11,7 @@
 
 <?php echo item_search_filters(); ?>
 
-<?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
 
 <?php if ($total_results > 0): ?>
 
@@ -54,7 +54,7 @@
 </div><!-- end class="item hentry" -->
 <?php endforeach; ?>
 
-<?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
 
 <div id="outputs">
     <span class="outputs-label"><?php echo __('Output Formats'); ?></span>

diff --git a/application/views/scripts/search/index.php b/application/views/scripts/search/index.php
@@ -6,7 +6,7 @@
 <h1><?php echo $pageTitle; ?></h1>
 <?php echo search_filters(); ?>
 <?php if ($total_results): ?>
-<?php echo pagination_links(['aria_label' => __('Top pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Top pagination')]]); ?>
 <table id="search-results">
     <thead>
         <tr>
@@ -34,7 +34,7 @@
         <?php endforeach; ?>
     </tbody>
 </table>
-<?php echo pagination_links(['aria-label' => __('Bottom pagination')]); ?>
+<?php echo pagination_links(['attributes' => ['aria-label' => __('Bottom pagination')]]); ?>
 <?php else: ?>
 <div id="no-results">
     <p><?php echo __('Your query returned no results.');?></p>