kumi/revuo-weekly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blog-fixes' into 'master'

Browse source 
Fix pagination

See merge request rehrar/revuo-weekly!120
This commit is contained in:
Diego Salazar 2021-02-04 02:25:17 +00:00
commit 302cb4a2cc
4 changed files with 57 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
_includes/head.html
View file

@ -19,7 +19,7 @@
{%endif%}
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Revuo Monero - {{page.title}}">
<meta name="twitter:image" content="{{ page.image }}">
<meta name="twitter:image" content="https://revuo-monero.com{{ page.image }}">
<!-- CSS & fonts -->
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl | replace: '//', '/' }}">

52
_layouts/default.html
View file

@ -31,33 +31,31 @@
</main>
<!-- Pagination links -->
{% if paginator.total_pages > 1 %}
<div class="pagination">
{% if paginator.previous_page == 1 %}
<a href="{{ '/' | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&laquo;</a>
{% elsif paginator.previous_page%}
<a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&laquo;</a>
{% else %}
<span class="page-item">&laquo;</span>
{% endif %}
{% for page in (1..paginator.total_pages) %}
{% if page == paginator.page %}
<span class="page-item">{{ page }}</span>
{% elsif page == 1 %}
<a href="{{ '/' | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">{{ page }}</a>
{% else %}
<a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}" class="page-item">{{ page }}</a>
{% endif %}
{% endfor %}
{% if paginator.next_page %}
<a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&raquo;</a>
{% else %}
<span class="page-item">&raquo;</span>
{% endif %}
</div>
{% endif %}
<div class="pagination">
{% if paginator.total_pages > 1 %}
<div class="page-numbers"><p>
{% if paginator.previous_page %}
<a href="{{ paginator.previous_page_path}}" class="page-button prev">Prev</a>
{% endif %}
{% for page in (1..paginator.total_pages) %}
{% assign total = paginator.total_pages %}
{% if page == paginator.page %}
{{ page }} of {{total}}
{% endif %}
{% endfor %}
{% if paginator.next_page %}
<a href="{{ paginator.next_page_path}}" class="page-button next">Next</a>
{% endif %}
</p></div>
{% endif %}
</div>
</div>

52
_layouts/revuo-weekly.html
View file

@ -32,33 +32,31 @@
</main>
<!-- Pagination links -->
{% if paginator.total_pages > 1 %}
<div class="pagination">
{% if paginator.previous_page == 1 %}
<a href="{{ '/' | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&laquo;</a>
{% elsif paginator.previous_page%}
<a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&laquo;</a>
{% else %}
<span class="page-item">&laquo;</span>
{% endif %}
{% for page in (1..paginator.total_pages) %}
{% if page == paginator.page %}
<span class="page-item">{{ page }}</span>
{% elsif page == 1 %}
<a href="{{ '/' | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">{{ page }}</a>
{% else %}
<a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}" class="page-item">{{ page }}</a>
{% endif %}
{% endfor %}
{% if paginator.next_page %}
<a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&raquo;</a>
{% else %}
<span class="page-item">&raquo;</span>
{% endif %}
</div>
{% endif %}
<div class="pagination">
{% if paginator.total_pages > 1 %}
<div class="page-numbers">
{% if paginator.previous_page %}
<a href="{{ paginator.previous_page_path}}" class="page-item prev">«</a>
{% endif %}
{% for page in (1..paginator.total_pages) %}
{% assign total = paginator.total_pages %}
{% if page == paginator.page %}
<p class="page-numbers-display">{{ page }} of {{total}}</p>
{% endif %}
{% endfor %}
{% if paginator.next_page %}
<a href="{{ paginator.next_page_path}}" class="page-item next">»</a>
{% endif %}
</div>
{% endif %}
</div>
</div>

6
_sass/custom.scss
View file

@ -375,4 +375,10 @@ img.dvchain {
.text-center {
text-align: center;
}
.page-numbers-display {
display: inline-block;
margin-left: 1rem;
margin-right: 1rem;
}