1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00

Merge pull request #4714 from Jimmi08/patch-14

Fixes #4713 Forum styling fix in pagination in forum and topic pages.
This commit is contained in:
Cameron
2022-03-27 10:26:02 -07:00
committed by GitHub

View File

@@ -921,7 +921,7 @@
// $url = e107::getUrl()->create('forum/thread/view', $urlparms); // $url = e107::getUrl()->create('forum/thread/view', $urlparms);
$title = $tp->lanVars(LAN_GOTOPAGEX, $aa); $title = $tp->lanVars(LAN_GOTOPAGEX, $aa);
$url = e107::url('forum', 'topic', $urlparms) . '&p=' . $aa; $url = e107::url('forum', 'topic', $urlparms) . '&p=' . $aa;
$opts[] = "<a data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>"; $opts[] = "<a class='page-link' data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
} }
$text .= ' ... '; $text .= ' ... ';
for($a = $pages - 3; $a <= $pages - 1; $a++) for($a = $pages - 3; $a <= $pages - 1; $a++)
@@ -932,7 +932,7 @@
// $url = e107::getUrl()->create('forum/thread/view', $urlparms); // $url = e107::getUrl()->create('forum/thread/view', $urlparms);
$title = $tp->lanVars(LAN_GOTOPAGEX, $aa); $title = $tp->lanVars(LAN_GOTOPAGEX, $aa);
$url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa; $url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa;
$opts[] = "<a data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>"; $opts[] = "<a class='page-link' data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
} }
} }
else else
@@ -946,16 +946,16 @@
// $url = e107::getUrl()->create('forum/thread/view', $urlparms); // $url = e107::getUrl()->create('forum/thread/view', $urlparms);
$title = $tp->lanVars(LAN_GOTOPAGEX, $aa); $title = $tp->lanVars(LAN_GOTOPAGEX, $aa);
$url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa; $url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa;
$opts[] = "<a data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>"; $opts[] = "<a class='page-link' data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
} }
} }
if(deftrue('BOOTSTRAP')) if(deftrue('BOOTSTRAP'))
{ {
$text = "<ul class='pagination pagination-sm forum-viewforum-pagination'> $text = "<ul class='pagination pagination-sm forum-viewforum-pagination'>
<li>"; <li class='page-item'>";
$text .= implode("</li><li>", $opts); // ."</div>"; $text .= implode("</li><li class='page-item'>", $opts); // ."</div>";
$text .= "</li></ul>"; $text .= "</li></ul>";
} }
else else