r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #661 from anaggh/master 

Fix pagination in blogx and alternative
This commit is contained in:
Diego Najar 2018-03-09 09:27:55 +01:00 committed by GitHub
parent afecc3946f f527fe7c56
commit 321225c6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bl-kernel/helpers/theme.class.php
View File

@ -169,7 +169,7 @@ class Theme {
public static function jquery($cdn=false) public static function jquery($cdn=false)
{ {
if ($cdn) { if ($cdn) {
return '<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>'; return '<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT" crossorigin="anonymous"></script>';
} }
return '<script src="'.DOMAIN_CORE_JS.'jquery.min.js'.'"></script>'.PHP_EOL; return '<script src="'.DOMAIN_CORE_JS.'jquery.min.js'.'"></script>'.PHP_EOL;
} }
@ -183,4 +183,4 @@ class Theme {
} }
} }
?> ?>

2
bl-themes/alternative/css/style.css
View File

@ -113,4 +113,4 @@ section.home-page:nth-child(even) { /* Alternate the background color */
height:100%; height:100%;
width:100%; width:100%;
position:absolute; position:absolute;
} }

4
bl-themes/alternative/index.php
View File

@ -28,7 +28,7 @@
<!-- Javascript --> <!-- Javascript -->
<?php <?php
echo Theme::js('js/jquery.min.js'); echo Theme::jquery();
echo Theme::js('js/bootstrap.min.js'); echo Theme::js('js/bootstrap.min.js');
?> ?>
@ -36,4 +36,4 @@
<?php Theme::plugins('siteBodyEnd'); ?> <?php Theme::plugins('siteBodyEnd'); ?>
</body> </body>
</html> </html>

2
bl-themes/alternative/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
bl-themes/alternative/php/home.php
View File

@ -45,28 +45,26 @@
<!-- Pagination --> <!-- Pagination -->
<?php if (Paginator::amountOfPages()>1): ?> <?php if (Paginator::amountOfPages()>1): ?>
<div class="paginator"> <nav class="paginator" aria-label="Page navigation">
<nav aria-label="Page navigation"> <ul class="pagination flex-wrap justify-content-center">
<ul class="pagination justify-content-center">
<!-- Previuos button --> <!-- Previous button -->
<li class="page-item <?php if (Paginator::showNext()); echo 'disabled' ?>"> <li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
<a class="page-link" href="<?php echo Paginator::prevPageUrl(); ?>" tabindex="-1">Previous</a> <a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a>
</li> </li>
<!-- List of pages --> <!-- List of pages -->
<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?> <?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
<li class="page-item <?php if ($i==Paginator::currentPage()); echo 'active' ?>"> <li class="page-item <?php if ($i==Paginator::currentPage()) echo 'active' ?>">
<a class="page-link" href="<?php echo Paginator::numberUrl($i); ?>"><?php echo $i ?></a> <a class="page-link" href="<?php echo Paginator::numberUrl($i) ?>"><?php echo $i ?></a>
</li> </li>
<?php endfor ?> <?php endfor ?>
<!-- Next button --> <!-- Next button -->
<li class="page-item <?php if (Paginator::showPrev()); echo 'disabled' ?>"> <li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
<a class="page-link" href="<?php echo Paginator::nextPageUrl(); ?>">Next</a> <a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a>
</li> </li>
</ul> </ul>
</nav> </nav>
</div>
<?php endif ?> <?php endif ?>

4
bl-themes/blogx/index.php
View File

@ -46,7 +46,7 @@
<!-- Javascript --> <!-- Javascript -->
<?php <?php
echo Theme::js('js/jquery.min.js'); echo Theme::jquery();
echo Theme::js('js/bootstrap.min.js'); echo Theme::js('js/bootstrap.min.js');
?> ?>
@ -54,4 +54,4 @@
<?php Theme::plugins('siteBodyEnd'); ?> <?php Theme::plugins('siteBodyEnd'); ?>
</body> </body>
</html> </html>

2
bl-themes/blogx/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
bl-themes/blogx/php/home.php
View File

@ -35,10 +35,10 @@
<!-- Pagination --> <!-- Pagination -->
<?php if (Paginator::amountOfPages()>1): ?> <?php if (Paginator::amountOfPages()>1): ?>
<nav class="my-4" aria-label="Page navigation"> <nav class="my-4" aria-label="Page navigation">
<ul class="pagination"> <ul class="pagination flex-wrap">
<!-- Previuos button --> <!-- Previous button -->
<li class="page-item <?php if (Paginator::showNext()) echo 'disabled' ?>"> <li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
<a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a> <a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a>
</li> </li>
@ -50,10 +50,10 @@
<?php endfor ?> <?php endfor ?>
<!-- Next button --> <!-- Next button -->
<li class="page-item <?php if (Paginator::showPrev()) echo 'disabled' ?>"> <li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a> <a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a>
</li> </li>
</ul> </ul>
</nav> </nav>
<?php endif ?> <?php endif ?>

2
bl-themes/docsx/index.php
View File

@ -38,7 +38,7 @@
<!-- Javascript --> <!-- Javascript -->
<?php <?php
echo Theme::js('js/jquery.min.js'); echo Theme::jquery();
echo Theme::js('js/bootstrap.min.js'); echo Theme::js('js/bootstrap.min.js');
echo Theme::js('js/highlight.min.js'); echo Theme::js('js/highlight.min.js');
?> ?>

2
bl-themes/docsx/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long