From 651aba02678bd01d544556f7eb8b0021bff90bf3 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Tue, 28 Feb 2017 20:28:54 +0700
Subject: [PATCH] Fixed pagination position in the project view

---
 src/PHPCensor/View/Project/view.phtml | 135 +++++++++++++-------------
 1 file changed, 67 insertions(+), 68 deletions(-)

diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index 8b00418a..9d6f2811 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -55,23 +55,74 @@
             <div class="box-header">
                 <h3 class="box-title"><?php Lang::out('builds'); ?> (<?php print $total; ?>)</h3>
             </div>
-        <table class="table table-hover">
-            <thead>
-            <tr>
-                <th><?php Lang::out('id'); ?></th>
-                <th><?php Lang::out('date'); ?></th>
-                <th class="hidden-md hidden-sm hidden-xs"><?php Lang::out('commit'); ?></th>
-                <th><?php Lang::out('branch'); ?></th>
-                <th><?php Lang::out('status'); ?></th>
-                <th><?php Lang::out('duration'); ?></th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody id="latest-builds">
-                <?php print $builds; ?>
-            </tbody>
-        </table>
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th><?php Lang::out('id'); ?></th>
+                    <th><?php Lang::out('date'); ?></th>
+                    <th class="hidden-md hidden-sm hidden-xs"><?php Lang::out('commit'); ?></th>
+                    <th><?php Lang::out('branch'); ?></th>
+                    <th><?php Lang::out('status'); ?></th>
+                    <th><?php Lang::out('duration'); ?></th>
+                    <th></th>
+                </tr>
+                </thead>
+                <tbody id="latest-builds">
+                    <?php print $builds; ?>
+                </tbody>
+            </table>
         </div>
+        <?php
+
+        print '<div><ul class="pagination">';
+
+        $project_url = APP_URL . 'project/view/' . $project->getId() . ((!empty($branch)) ? '/' . urlencode($branch) : '');
+
+        if ($page > 1) {
+            print '<li><a href="' . $project_url . '?p='.($page == 1 ? '1' : $page - 1).'">'.Lang::get('prev_link').'</a></li>';
+        }
+
+        if ($pages > 1) {
+
+            $start = $page - 3;
+
+            if ($start <= 0) {
+                $start = 1;
+            }
+
+            $end = $page + 3;
+
+            if ($end > $pages) {
+                $end = $pages;
+            }
+
+            if ($start > 1) {
+                print '<li><a href="' . $project_url . '">1...</a></li>';
+            }
+
+            for($i = $start; $i <= $end; $i++)
+            {
+                if ($pages > $end && $i == $pages) continue;
+
+                if ($i == $page) {
+                    print '<li class="bg-blue"><span>' . $i . '</span></li>';
+                } else {
+                    print '<li><a href="' . $project_url . '?p=' . $i . '">' . $i . '</a></li>';
+                }
+            }
+
+            if ($pages > $end) {
+                print '<li><a href="' . $project_url . '?p='.$pages.'">...'.$pages.'</a></li>';
+            }
+        }
+
+        if ($page < $pages - 1) {
+            print '<li><a href="' . $project_url . '?p='.($page == $pages ? $pages : $page + 1).'">'.Lang::get('next_link').'</a></li>';
+        }
+
+        print '</ul></div>';
+
+        ?>
     </div>
 
     <div class="col-lg-3 col-md-4 col-sm-4">
@@ -138,58 +189,6 @@
     </div>
 </div>
 
-<?php
-
-print '<div><ul class="pagination">';
-
-$project_url = APP_URL . 'project/view/' . $project->getId() . ((!empty($branch)) ? '/' . urlencode($branch) : '');
-
-if ($page > 1) {
-    print '<li><a href="' . $project_url . '?p='.($page == 1 ? '1' : $page - 1).'">'.Lang::get('prev_link').'</a></li>';
-}
-
-if ($pages > 1) {
-
-    $start = $page - 3;
-
-    if ($start <= 0) {
-        $start = 1;
-    }
-
-    $end = $page + 3;
-
-    if ($end > $pages) {
-        $end = $pages;
-    }
-
-    if ($start > 1) {
-        print '<li><a href="' . $project_url . '">1...</a></li>';
-    }
-
-    for($i = $start; $i <= $end; $i++)
-    {
-        if ($pages > $end && $i == $pages) continue;
-
-        if ($i == $page) {
-            print '<li class="bg-blue"><span>' . $i . '</span></li>';
-        } else {
-            print '<li><a href="' . $project_url . '?p=' . $i . '">' . $i . '</a></li>';
-        }
-    }
-
-    if ($pages > $end) {
-        print '<li><a href="' . $project_url . '?p='.$pages.'">...'.$pages.'</a></li>';
-    }
-}
-
-if ($page < $pages - 1) {
-    print '<li><a href="' . $project_url . '?p='.($page == $pages ? $pages : $page + 1).'">'.Lang::get('next_link').'</a></li>';
-}
-
-print '</ul></div>';
-
-?>
-
 <script>
     $(function() {
         $('#delete-project').on('click', function (e) {