Merge pull request #32 from RRZE-Webteam/dev

Nachtrag v1.0.8

Author: cassandre

assets/js/fau-studium-display-admin.min.js

@@ -1,7 +1,5 @@
 const { __, _x, _n, sprintf } = wp.i18n;
 
-//console.log(__('Test', 'fau-studium-display'));
-
 jQuery(document).ready(function($) {
 
     let searchResults = $('#degree-program-results');
@@ -67,12 +65,8 @@ jQuery(document).ready(function($) {
             .map(function() { return $(this).data('id'); })
             .get();
         if (checkedIds.length > 0) {
-            searchResults.find('button, a.button').addClass('button-disabled');
-            searchResults.find('input[type="checkbox"][name^="batch-import"]').addClass('disabled');
             $.each(checkedIds, function(index, id) {
-                searchResults.find('div.program-item[data-program_id="' + id + '"] span.dashicons-plus')
-                    .removeClass('dashicons-plus')
-                    .addClass('dashicons-update').addClass('spin');
+                $('a.add-degree-program[data-id="' + id + '"]').trigger('click');
             });
             sync_degree_programs(checkedIds, []);
         } else {

src/js/fau-studium-display-admin.js

@@ -133,17 +133,28 @@
         if ($page > 1) {
             echo '<a href="' . add_query_arg('pagenum', ($page - 1), $current_url) . '" class="page-number prev" aria-label="' . __('Previous page', 'fau-studium-display') . '"><span class="pagination-icon pagination-icon-prev"></span></a>';
         }
-        $ellipsis_done = false;
+        $ellipsis1_done = false;
+        $ellipsis2_done = false;
         for ($i = 1; $i <= $num_pages; $i++) {
             if ($page == $i) {
                 echo '<span class="page-number current" aria-current="page">' . $i . '</span>';
-            } elseif ($i > 3 && $i < ($num_pages - 2)) {
-                if (!$ellipsis_done) {
+            } elseif ($i == 1 ||
+                      $i == $num_pages ||
+                      $i == $page - 1 ||
+                      $i == $page + 1 ||
+                      ($page == 1 && in_array($i, [3, $num_pages - 2, $num_pages - 1])) ||
+                      ($page == $num_pages && $i == $num_pages - 2)
+                ) {
+                echo '<a href="' . add_query_arg('pagenum', $i, $current_url) . '" class="page-number" aria-label="' . sprintf(__('Page %d', 'fau-studium-display'), $i) . '">' . $i . '</a>';
+            } else {
+                if ($page < $i && !$ellipsis1_done) {
                     echo '<span class="page-ellipsis" aria-hidden="true">...</span>';
-                    $ellipsis_done = true;
+                    $ellipsis1_done = true;
+                }
+                if ($page > $i && !$ellipsis2_done) {
+                    echo '<span class="page-ellipsis" aria-hidden="true">...</span>';
+                    $ellipsis2_done = true;
                 }
-            } else {
-                echo '<a href="' . add_query_arg('pagenum', $i, $current_url) . '" class="page-number" aria-label="' . sprintf(__('Page %d', 'fau-studium-display'), $i) . '">' . $i . '</a>';
             }
         }
         if ($page < $num_pages) {