Improve pagination

system/plugins/urlify/URLify.php

@@ -75,7 +75,7 @@ class URLify {
             'П' => 'P', 'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U', 'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C',
             'Ч' => 'Ch', 'Ш' => 'Sh', 'Щ' => 'Sh', 'Ъ' => '', 'Ы' => 'Y', 'Ь' => '', 'Э' => 'E', 'Ю' => 'Yu',
             'Я' => 'Ya',
-            '№' => ''
+            '№' => 'No'
         ),
         'uk' => array ( /* Ukrainian */
             'Є' => 'Ye', 'І' => 'I', 'Ї' => 'Yi', 'Ґ' => 'G', 'є' => 'ye', 'і' => 'i', 'ї' => 'yi', 'ґ' => 'g'
@@ -113,7 +113,7 @@ class URLify {
             'Ú' => 'U', 'Ù' => 'U', 'Ủ' => 'U', 'Ũ' => 'U', 'Ụ' => 'U', 'Ư' => 'U', 'Ứ' => 'U', 'Ừ' => 'U', 'Ử' => 'U', 'Ữ' => 'U', 'Ự' => 'U',
             'ú' => 'u', 'ù' => 'u', 'ủ' => 'u', 'ũ' => 'u', 'ụ' => 'u', 'ư' => 'u', 'ứ' => 'u', 'ừ' => 'u', 'ử' => 'u', 'ữ' => 'u', 'ự' => 'u',
             'Ý' => 'Y', 'Ỳ' => 'Y', 'Ỷ' => 'Y', 'Ỹ' => 'Y', 'Ỵ' => 'Y', 'ý' => 'y', 'ỳ' => 'y', 'ỷ' => 'y', 'ỹ' => 'y', 'ỵ' => 'y',
-            'Đ' => 'D', 'đ' => 'd'
+            'Đ' => 'DJ', 'đ' => 'dj'
         ),
         'ar' => array ( /* Arabic */
             'أ' => 'a', 'ب' => 'b', 'ت' => 't', 'ث' => 'th', 'ج' => 'g', 'ح' => 'h', 'خ' => 'kh', 'د' => 'd',
@@ -133,7 +133,7 @@ class URLify {
             'DZ' => 'DZ', 'dz' => 'dz', 'DŽ' => 'DZ', 'dž' => 'dz', 'CH' => 'CH', 'Ĺ' => 'L', 'ĺ' => 'l', 'Ľ' => 'L',
             'ľ' => 'l', 'Ŕ' => 'R', 'ŕ' => 'r'
         ),
-        'add' => array ( /* Custom */
+        'cus' => array ( /* Custom */
             'Ĉ' => 'C', 'ĉ' => 'c', 'Ċ' => 'C', 'ċ' => 'c', 'Ď' => 'D', 'ď' => 'd', 'Ĕ' => 'E', 'ĕ' => 'e', 'Ĝ' => 'G', 'ĝ' => 'g',
             'Ġ' => 'G', 'ġ' => 'g', 'Ĥ' => 'H', 'ĥ' => 'h', 'Ħ' => 'H', 'ħ' => 'h', 'Ĭ' => 'I', 'ĭ' => 'i', 'IJ' => 'J', 'ij' => 'j',
             'Ĵ' => 'J', 'ĵ' => 'j', 'Ŀ' => 'L', 'ŀ' => 'l', 'ʼn' => 'n', 'Ō' => 'O', 'ō' => 'o', 'Ŏ' => 'O', 'ŏ' => 'o', 'Œ' => 'OE',

themes/blog/main.html.php

@@ -89,15 +89,7 @@
 </section><!--//section-->
 <?php endforeach; ?>
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
-    <div class="pager">
-        <?php if (!empty($pagination['prev'])): ?>
-            <span class="newer pull-left"><a class="btn btn-cta-secondary" href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
-        <?php endif; ?>
-        <span class="page-number"><?php echo $pagination['pagenum'];?></span>
-        <?php if (!empty($pagination['next'])): ?>
-            <span class="older pull-right"><a class="btn btn-cta-secondary" href="?page=<?php echo $page + 1 ?>" rel="next">Older</a></span>
-        <?php endif; ?>
-    </div>
+    <div class="pagination"><?php echo $pagination['html'];?></div>
 <?php endif; ?>
 <?php if (disqus_count()): ?>
     <?php echo disqus_count() ?>

themes/blog/profile.html.php

@@ -28,20 +28,13 @@
                             </li>
                         <?php endforeach; ?>
                     </ul>
-                    <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
-                        <div class="pager">
-                            <?php if (!empty($pagination['prev'])): ?>
-                                <span class="newer pull-left"><a class="btn btn-cta-secondary" href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
-                            <?php endif; ?>
-                            <?php if (!empty($pagination['next'])): ?>
-                                <span class="older pull-right"><a class="btn btn-cta-secondary" href="?page=<?php echo $page + 1 ?>" rel="next">Older</a></span>
-                            <?php endif; ?>
-                        </div>
-                    <?php endif; ?>
                 <?php } else {
                     echo 'No posts found!';
                 } ?>
             </div><!--//item-->
         </div><!--//content--> 
     </div><!--//section-inner-->
-</section><!--//section-->
+</section><!--//section-->
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
+	<div class="pagination"><?php echo $pagination['html'];?></div>
+<?php endif; ?>

themes/clean/css/style.css

@@ -1,5 +1,5 @@
 /*-------------------------
-	Simple reset
+    Simple reset
 --------------------------*/
 
 * {
@@ -8,7 +8,7 @@
 }
 
 /*-------------------------
-	General Styles
+    General Styles
 --------------------------*/
 
 html {
@@ -48,7 +48,7 @@ img {
 }
 
 /*----------------------------
-	Headings
+    Headings
 -----------------------------*/
 
 h1 {
@@ -127,7 +127,7 @@ h6 {
 }
 
 /*-------------------------
-	Tab
+    Tab
 --------------------------*/
 
 .tab {
@@ -138,14 +138,14 @@ h6 {
 }
 
 .tab ul {
-	padding:0;
-	margin:0;
+    padding:0;
+    margin:0;
 }
 
 .tab  li {
     display: inline-block;
-	margin:0;
-	padding:0;
+    margin:0;
+    padding:0;
 }
 
 .tab a {
@@ -166,7 +166,7 @@ h6 {
 }
 
 /*----------------------------
-	Content & Posts
+    Content & Posts
 -----------------------------*/
 
 #content {
@@ -360,7 +360,7 @@ blockquote p {
 }
 
 /*-------------------------
-	Table
+    Table
 --------------------------*/
 
 table {
@@ -410,7 +410,7 @@ td {
 }
 
 /*----------------------------
-	The left bar
+    The left bar
 -----------------------------*/
 
 aside {
@@ -497,7 +497,7 @@ aside .copyright p {
 }
 
 /*-------------------------
-	Raleted posts
+    Raleted posts
 --------------------------*/
 
 .related {
@@ -512,7 +512,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	Pagination buttons
+    Pagination buttons
 -----------------------------*/
 
 .postnav {
@@ -608,7 +608,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	The 404 page
+    The 404 page
 -----------------------------*/
 
 .message {
@@ -629,7 +629,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	Search form
+    Search form
 -----------------------------*/
 
 .search {
@@ -684,7 +684,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	Profile
+    Profile
 -----------------------------*/
 
 .profile {
@@ -702,7 +702,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	Share + Author info
+    Share + Author info
 -----------------------------*/
 
 .separator {
@@ -761,7 +761,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	Media queries
+    Media queries
 -----------------------------*/
 
 @media all and (max-width: 1024px) {
@@ -851,7 +851,7 @@ aside .copyright p {
 }
 
 /*----------------------------
-	Video
+    Video
 -----------------------------*/
 
 .video-wrapper {
@@ -948,5 +948,5 @@ ul.archivegroup {
 
 .archivegroup li.expanded, .archivegroup li.collapsed, .archivegroup li.expanded li, .archivegroup li.collapsed li {
     list-style: none;
-	background:none;
-}
+    background:none;
+}    

themes/clean/profile.html.php

@@ -31,6 +31,7 @@
             <?php if (!empty($pagination['prev'])): ?>
                 <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
             <?php endif; ?>
+             <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
             <?php if (!empty($pagination['next'])): ?>
                 <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
             <?php endif; ?>

themes/default/profile.html.php

@@ -29,10 +29,11 @@
     <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
             <?php if (!empty($pagination['prev'])): ?>
-                <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
+                <span class="newer"><a href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
             <?php endif; ?>
+            <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
             <?php if (!empty($pagination['next'])): ?>
-                <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
+                <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older</a></span>
             <?php endif; ?>
         </div>
     <?php endif; ?>

themes/logs/profile.html.php

@@ -29,10 +29,11 @@
     <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
             <?php if (!empty($pagination['prev'])): ?>
-                <span class="newer">&laquo; <a href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
+                <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; Newer</a></span>
             <?php endif; ?>
+            <span class="page-number"><?php echo $pagination['pagenum'];?></span>
             <?php if (!empty($pagination['next'])): ?>
-                <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older</a> &raquo;</span>
+                <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older  &raquo;</a></span>
             <?php endif; ?>
         </div>
     <?php endif; ?>