Merge c02016a into e1052c2

fisharebest · Mar 8, 2021 · 9a866cb · 9a866cb
2 parents e1052c2 + c02016a
commit 9a866cb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/resources/js/vendor.js b/resources/js/vendor.js
@@ -28,8 +28,9 @@ import {
 } from '@fortawesome/free-regular-svg-icons';
 import {
   // For resources/views/icons/*
-  faArrowDown, faArrowLeft, faArrowRight, faArrowUp, faArrowsAltV, faBan, faBars,
-  faCalendar, faCaretDown, faCaretUp, faCheck, faCodeBranch, faDownload, faExclamationTriangle, faGenderless,
+  faAngleLeft, faAngleDoubleLeft, faAngleRight, faAngleDoubleRight, faArrowDown, faArrowLeft,
+  faArrowRight, faArrowUp, faArrowsAltV, faBan, faBars, faCalendar, faCaretDown, faCaretUp,
+  faCheck, faCodeBranch, faDownload, faExclamationTriangle, faGenderless,
   faGripHorizontal, faGripLines, faHistory, faInfoCircle, faLanguage, faLink, faList,
   faLock, faMagic, faMap, faMapMarkerAlt, faMars, faMedkit, faPaintBrush, faPause, faPencilAlt,
   faPlay, faPlus, faPuzzlePiece, faQuestionCircle, faRedo, faSearch, faSearchMinus, faSearchPlus,
@@ -128,8 +129,9 @@ library.add(
 );
 library.add(
   // For resources/views/icons/*
-  faArrowDown, faArrowLeft, faArrowRight, faArrowUp, faArrowsAltV, faBan, faBars,
-  faCalendar, faCaretDown, faCaretUp, faCheck, faCodeBranch, faDownload, faExclamationTriangle, faGenderless,
+  faAngleLeft, faAngleDoubleLeft, faAngleRight, faAngleDoubleRight, faArrowDown, faArrowLeft,
+  faArrowRight, faArrowUp, faArrowsAltV, faBan, faBars, faCalendar, faCaretDown, faCaretUp,
+  faCheck, faCodeBranch, faDownload, faExclamationTriangle, faGenderless,
   faGripHorizontal, faGripLines, faHistory, faInfoCircle, faLanguage, faLink, faList,
   faLock, faMagic, faMap, faMapMarkerAlt, faMars, faMedkit, faPaintBrush, faPause, faPencilAlt,
   faPlay, faPlus, faPuzzlePiece, faQuestionCircle, faRedo, faSearch, faSearchMinus, faSearchPlus,

diff --git a/resources/views/icons/first.phtml b/resources/views/icons/first.phtml
@@ -0,0 +1,5 @@
+<?Php
+use Fisharebest\Webtrees\I18N;
+
+?>
+<span class="wt-icon-folder"><i class="fas fa-angle-double-<?= I18N::direction() === 'ltr' ? 'left' : 'right'; ?> fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/last.phtml b/resources/views/icons/last.phtml
@@ -0,0 +1,5 @@
+<?Php
+use Fisharebest\Webtrees\I18N;
+
+?>
+<span class="wt-icon-folder"><i class="fas fa-angle-double-<?= I18N::direction() === 'ltr' ? 'right' : 'left'; ?> fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/next.phtml b/resources/views/icons/next.phtml
@@ -0,0 +1,5 @@
+<?Php
+use Fisharebest\Webtrees\I18N;
+
+?>
+<span class="wt-icon-folder"><i class="fas fa-angle-<?= I18N::direction() === 'ltr' ? 'right' : 'left'; ?> fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/previous.phtml b/resources/views/icons/previous.phtml
@@ -0,0 +1,5 @@
+<?Php
+use Fisharebest\Webtrees\I18N;
+
+?>
+<span class="wt-icon-folder"><i class="fas fa-angle-<?= I18N::direction() === 'ltr' ? 'left' : 'right'; ?> fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/lists/datatables-attributes.phtml b/resources/views/lists/datatables-attributes.phtml
@@ -1,23 +1,19 @@
 <?php
 
 use Fisharebest\Webtrees\I18N;
-
 ?>
 
 data-auto-width="false"
-data-dom="<&quot;d-flex justify-content-between&quot;pf><t><&quot;d-flex justify-content-between&quot;irl>"
+data-dom="<&quot;d-flex justify-content-between&quot;pfl><t><&quot;d-flex justify-content-between&quot;pilr>"
 data-state-save="true"
 data-length-menu="<?= e(json_encode([[10, 20, 50, 100, 500, 1000, -1], [I18N::number(10), I18N::number(20), I18N::number(50), I18N::number(100), I18N::number(500), I18N::number(1000), I18N::translate('All')]])) ?>"
+data-paging-type="full_numbers"
 data-language="<?= e(json_encode([
     'paginate'       => [
-        /* I18N: A button label, first page */
-        'first'    => I18N::translate('first'),
-        /* I18N: A button label, last page */
-        'last'     => I18N::translate('last'),
-        /* I18N: A button label, next page */
-        'next'     => I18N::translate('next'),
-        /* I18N: A button label, previous page */
-        'previous' => I18N::translate('previous'),
+        'first'    => view('icons/first'),
+        'last'     => view('icons/last'),
+        'next'     => view('icons/next'),
+        'previous' => view('icons/previous'),
     ],
     'emptyTable'     => I18N::translate('No records to display'),
     /* I18N: %s are placeholders for numbers */