From 73e6b1df5bc72968dca1fc7d7d039f1dfdeaa85b Mon Sep 17 00:00:00 2001
From: maravelle <maravelle@protonmail.com>
Date: Wed, 3 Feb 2021 19:23:33 -0700
Subject: [PATCH] Fix pagination

---
 _includes/head.html        |  2 +-
 _layouts/default.html      | 52 ++++++++++++++++++--------------------
 _layouts/revuo-weekly.html | 52 ++++++++++++++++++--------------------
 _sass/custom.scss          |  6 +++++
 4 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index e83e04d..b8d8844 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -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: '//', '/' }}">
diff --git a/_layouts/default.html b/_layouts/default.html
index 9d3ba7a..b508d70 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -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>
 	    
diff --git a/_layouts/revuo-weekly.html b/_layouts/revuo-weekly.html
index 5aa0cce..639023b 100644
--- a/_layouts/revuo-weekly.html
+++ b/_layouts/revuo-weekly.html
@@ -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>
 	    
diff --git a/_sass/custom.scss b/_sass/custom.scss
index 523ee4c..3be23c9 100644
--- a/_sass/custom.scss
+++ b/_sass/custom.scss
@@ -375,4 +375,10 @@ img.dvchain {
 
 .text-center {
     text-align: center;
+}
+
+.page-numbers-display {
+    display: inline-block;
+    margin-left: 1rem;
+    margin-right: 1rem;
 }
\ No newline at end of file