From 7cc3ac541cf49a748066dfe6b1ed685f3f179d8d Mon Sep 17 00:00:00 2001 From: Tom Wiesing <tkw01536@gmail.com> Date: Mon, 5 Jun 2017 22:57:20 +0200 Subject: [PATCH] Make pagination look nice --- _includes/pagination.html | 105 +++++++++++++++++++------------------- index.md | 4 +- public/css/main.css | 5 +- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/_includes/pagination.html b/_includes/pagination.html index 15ce7e1..029e2e8 100644 --- a/_includes/pagination.html +++ b/_includes/pagination.html @@ -1,61 +1,62 @@ -<nav aria-label="Page navigation"> - <ul class="pagination"> +{% comment %} + Renders a pagination element. + Expects the default jekyll 'paginator' as argument. +{% endcomment %} + +<ul class="pagination"> + + <!-- The previous page --> {% if paginator.previous_page %} - <li> - <a href="{{ site.baseurl }}{{paginator.previous_page_path}}" aria-label="Previous"> - <span aria-hidden="true">«</span> - </a> - </li> + <li class="waves-effect"> + <a href="{{ site.baseurl }}{{paginator.previous_page_path}}"> + <i class="material-icons">chevron_left</i> + </a> + </li> {% else %} - <li class="disabled" > - <a href="#" aria-label="Previous"> - <span aria-hidden="true">«</span> - </a> - </li> - {% endif %} - {% if paginator.page > 4 %} - <li><a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: 'page:num/', '' }}">1</a></li> - {% if paginator.page > 5 %} - <li class="disabled" ><a href="#" >...</a></li> - {% endif %} + <li class="disabled"> + <a href="#!"> + <i class="material-icons">chevron_left</i> + </a> + </li> {% endif %} - {% assign min_index = paginator.page | minus:3 %} - {% assign max_index = paginator.page | plus:3 %} - {% for p in (min_index..max_index) %} - {% if p > 0 and p <= paginator.total_pages %} - <li {% if p == paginator.page %} class="active" {% endif %}> - {% if p == 1 %} - <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: 'page:num/', '' }}">1</a> - {% else %} - <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', p }}">{{ p }}</a> - {% endif %} + + <!-- Show all the pages --> + {% for page in (1..paginator.total_pages) %} + {% if page == paginator.page %} + <li class='active'> + <a href="#!"> + {{page}} + </a> + </li> + {% elsif page == 1 %} + <li class="waves-effect"> + <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}"> + {{page}} + </a> + </li> + {% else %} + <li class="waves-effect"> + <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}"> + {{page}} + </a> </li> {% endif %} {% endfor %} - {% if max_index < paginator.total_pages %} - {% assign max_indexp = max_index | plus:1 %} - {% if max_indexp < paginator.total_pages %} - <li class="disabled" ><a href="#" >...</a></li> - {% endif %} - <li><a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', paginator.total_pages }}">{{ paginator.total_pages }}</a></li> - {% endif %} + + + <!-- The next page --> {% if paginator.next_page %} - <li> - <a href="{{ site.baseurl }}{{ paginator.next_page_path }}" aria-label="Next"> - <span aria-hidden="true">»</span> - </a> - </li> + <li class="waves-effect"> + <a href="{{ site.baseurl }}{{paginator.next_page_path}}"> + <i class="material-icons">chevron_right</i> + </a> + </li> {% else %} - <li class="disabled" > - <a href="#" aria-label="Next"> - <span aria-hidden="true">»</span> - </a> - </li> + <li class="disabled"> + <a href="#!"> + <i class="material-icons">chevron_right</i> + </a> + </li> {% endif %} - </ul> -</nav> - - - - - + +</ul> \ No newline at end of file diff --git a/index.md b/index.md index 85719d4..f95cc43 100644 --- a/index.md +++ b/index.md @@ -14,10 +14,8 @@ This level of markup allows for offering interesting [knowledge management servi ## Recent News ([see all](/news/posts/)) -{% for post in site.posts %} - {% if forloop.index < 5 %} +{% for post in site.posts limit:5 %} {% include post_link.html %} - {% endif %} {% endfor %} <p>© {{ site.time | date: '%Y' }}. All rights reserved.</p> diff --git a/public/css/main.css b/public/css/main.css index e7de137..9c604bd 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -32,7 +32,10 @@ h1, h2, h3, h4, h5, h6 { /* background color */ -.page-footer, nav, .side-nav .collapsible-body > ul:not(.collapsible) > li.active, .side-nav.fixed .collapsible-body > ul:not(.collapsible) > li.active { +.page-footer, +nav, .side-nav .collapsible-body > ul:not(.collapsible) > li.active, +.side-nav.fixed .collapsible-body > ul:not(.collapsible) > li.active, +.pagination li.active { background-color: #5B78FD; } -- GitLab