Merge branch 'master' of github.com:chamilo/chamilo-lms

crisgol · Oct 6, 2021 · 2497502 · 2497502
2 parents 456701f + ad77b7d
commit 2497502
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 31 deletions.
diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -233,6 +233,29 @@
     @apply border-ch-text rounded-sm p-1;
   }
 
+  // Progress bars
+  .progress {
+    @apply rounded-sm ring-1 ring-ch-secondary bg-ch-primary text-sm text-center min-h-full ml-12 mr-4;
+  }
+  .progress .progress-bar {
+    @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/display.lib.php b/public/main/inc/lib/display.lib.php
@@ -2255,6 +2255,7 @@ public static function getMdiIcon(string $name, string $additionalClass = null,
      * @param string     $additionalClass Optional. Additional class
      *
      * @return string
+     * @deprecated Use getMdiIcon() instead
      */
     public static function returnFontAwesomeIcon(
         $name,

diff --git a/public/main/inc/lib/sortable_table.class.php b/public/main/inc/lib/sortable_table.class.php
@@ -300,39 +300,17 @@ public function get_pager()
             $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 @@ public function return_table()
                 $form = $this->get_page_select_form();
                 $nav = $this->get_navigation_html();
                 $html = '<div class="q-card">';
-                $html .= '<div class="flex flex-row justify-between">';
+                $html .= '<div class="flex flex-row justify-between pager-bar">';
                 $html .= '<div class="col">';
-                $html .= '<div class="page-select pb-2 pt-2">'.$form.'</div>';
+                $html .= '<div class="pb-2 pt-2 pager-select">'.$form.'</div>';
                 $html .= '</div>';
                 $html .= '<div class="col">';
-                $html .= '<div class="row justify-center">'.$this->get_table_title().'</div>';
+                $html .= '<div class="row justify-center pager-counter">'.$this->get_table_title().'</div>';
                 $html .= '</div>';
                 $html .= '<div class="col">';
-                $html .= '<div class="row justify-end">'.$nav.'</div>';
+                $html .= '<div class="row justify-end pager-jumper">'.$nav.'</div>';
                 $html .= '</div>';
                 $html .= '</div>';
                 $html .= '</div>';