show numbers for paging; hide bar for datasets

eflows4hpc · Oct 17, 2022 · f68cf3a · f68cf3a
1 parent a0ebe79
commit f68cf3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/frontend/js/apicalls.js b/frontend/js/apicalls.js
@@ -260,7 +260,7 @@ async function setDatasetView() {
     $('#datasetViewTable').show();
     $('#modifyDatasetButtonGroup').hide();
     $('#filterForm').hide();
-    $('#pageNumbers').hide();
+    $('#pagingBar').hide();
     if (window.sessionStorage.auth_token) {
         $('#modifyDatasetButtonGroup').show();
     }
@@ -437,12 +437,12 @@ async function showListingOrSingleDataset() {
         if (window.sessionStorage.auth_token) {
             $('#addNewDatasetForm').show();
             $('#filterForm').show();
-            $('#pageNumbers').show();
+            $('#pagingBar').show();
         }
         listDatasets(getType(), getFilterSearch(), getFilterName(), getFilterUrl(), getFilterKeys(), getPage());
     } else if (getId() == "new") {
         $('#datasetListTable').hide();
-        $('#pageNumbers').hide();
+        $('#pagingBar').hide();
         $('#storageTypeChooser').hide();
         $('#datasetViewTable').show();
         $('#filterForm').hide();
@@ -671,9 +671,17 @@ async function updatePagingHrefs() {
     $('#page_prev_2').attr("href", basehref + "&page=" + Math.max(1, current_page - 2));
     $('#page_prev_1').attr("href", basehref + "&page=" + Math.max(1, current_page - 1));
     $('#page_next_1').attr("href", basehref + "&page=" + Math.min(max_page, current_page + 1));
-    $('#page_mext_2').attr("href", basehref + "&page=" + Math.min(max_page, current_page + 2));
+    $('#page_next_2').attr("href", basehref + "&page=" + Math.min(max_page, current_page + 2));
     $('#page_last').attr("href", basehref + "&page=" + max_page);
     $('#pageInput').attr("max", max_page);
+
+    $('#pageInput').attr("placeholder", current_page);
+    $('#pageInput').val(current_page);
+    $('#page_prev_2').text("<< (" + Math.max(1, current_page - 2) + ")");
+    $('#page_prev_1').text("Previous (" + Math.max(1, current_page - 1) + ")");
+    $('#page_next_1').text("Next (" + Math.min(max_page, current_page + 1) + ")");
+    $('#page_next_2').text(">> (" + Math.min(max_page, current_page + 2) + ")");
+    $('#page_last').text("Last (" + max_page + ")");
 }
 
 function gotoButtonPressed() {

diff --git a/frontend/templates/storage_content.html.jinja b/frontend/templates/storage_content.html.jinja
@@ -54,7 +54,7 @@
         </tbody>
       </table>
 
-      <div class="table-responsive">
+      <div class="table-responsive" id ="pagingBar">
         <table class="table">
           <td style="width:14%">
             <span>