From de7ed0f1f3f72eeb9e7048ed9399a64cb76035ec Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 3 Sep 2014 21:32:04 -0400
Subject: [PATCH] Half-baked newish admin dashboard

---
 admin/admin_main.php    | 12 ++++-----
 inc/ticket_list.inc.php | 60 +++++++++++++----------------------------
 language/en/text.php    |  2 +-
 3 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/admin/admin_main.php b/admin/admin_main.php
index f2cae84a..0860a0bf 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -59,7 +59,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
 <div class="row">
-    <div class="col-md-8 col-md-offset-2" style="padding-top: 20px">
+    <div class="col-md-10 col-md-offset-1" style="padding-top: 20px">
     <?php 
         /* This will handle error, success and notice messages */
         hesk_handle_messages();
@@ -70,12 +70,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	        if ( ! isset($_SESSION['hide']['ticket_list']) )  //Number of tickets (table header. NOT ACTUAL TABLE)
             {
                 echo '
-                <div class="row">
-                    <div class="col-md-4">&nbsp;</div>
-                    <div class="col-md-4" style="text-align: center"><h3>'.$hesklang['open_tickets'].'</h3></div>
-                    <div class="col-md-4">&nbsp;</div>
-                </div>
-                ';
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4>'.$hesklang['open_tickets'].' <span style="float: right; font-size: .75em"><a href="new_ticket.php">'.$hesklang['nti'].'</a></span></h4>
+                    </div>'; // The rest of the panel will be printed by print_tickets.inc.php
 	        }
 
 	        /* Reset default settings? */
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index 38cda5b4..33bdc779 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -115,33 +115,29 @@ if ($total > 0)
 
 	if ($pages > 1)
 	{
+        //-- Precondition: The panel has already been created, and there is NO open <div class="panel-body"> tag yet.
 		echo '
-        <div>
-            <div align="center" style="float: left">
-                '.sprintf($hesklang['tickets_on_pages'],$total,$pages).' '.$hesklang['jump_page'].' <select name="myHpage" id="myHpage">
-            </div>
-            <div align="right" style="text-align: right">
-                <a href="new_ticket.php">'.$hesklang['nti'].'</a>
-            </div>
-        </div>';
-		for ($i=1;$i<=$pages;$i++)
-		{
-        	$tmp = ($page == $i) ? ' selected="selected"' : '';
-			echo '<option value="'.$i.'"'.$tmp.'>'.$i.'</option>';
-		}
-		echo'</select> <input type="button" value="'.$hesklang['go'].'" onclick="javascript:window.location=\''.$href.'?'.$query.'\'+document.getElementById(\'myHpage\').value" class="btn btn-default btn-xs" /><br />';
-
+            <div class="panel-body">
+                '.sprintf($hesklang['tickets_on_pages'],$total,$pages).' '.$hesklang['jump_page'].' <select name="myHpage" id="myHpage">';
+                for ($i=1;$i<=$pages;$i++)
+                {
+                    $tmp = ($page == $i) ? ' selected="selected"' : '';
+                    echo '<option value="'.$i.'"'.$tmp.'>'.$i.'</option>';
+                }
+                echo'</select> <input type="button" value="'.$hesklang['go'].'" onclick="javascript:window.location=\''.$href.'?'.$query.'\'+document.getElementById(\'myHpage\').value" class="btn btn-default btn-xs" /><br />';
+                
 		/* List pages */
+        echo '<div class="row"><div class="col-md-10 col-md-offset-1 col-sm-12" style="text-align: center"><ul class="pagination">';
 		if ($pages > 7)
 		{
 			if ($page > 2)
 			{
-				echo '<a href="'.$href.'?'.$query.'1"><b>&laquo;</b></a> &nbsp; ';
+				echo '<li><a href="'.$href.'?'.$query.'1">&laquo;</a></li>'; // <<
 			}
 
 			if ($prev_page)
 			{
-				echo '<a href="'.$href.'?'.$query.$prev_page.'"><b>&lsaquo;</b></a> &nbsp; ';
+				echo '<li><a href="'.$href.'?'.$query.$prev_page.'">&lsaquo;</a></li>'; // <
 			}
 		}
 
@@ -151,11 +147,11 @@ if ($total > 0)
 			{
 				if ($i == $page)
 				{
-					echo ' <b>'.$i.'</b> ';
+					echo '<li class="active"><a href="#">'.$i.'</a></li> ';
 				}
 				else
 				{
-					echo ' <a href="'.$href.'?'.$query.$i.'">'.$i.'</a> ';
+					echo '<li><a href="'.$href.'?'.$query.$i.'">'.$i.'</a></li>';
 				}
 			}
 		}
@@ -164,36 +160,16 @@ if ($total > 0)
 		{
 			if ($next_page)
 			{
-				echo ' &nbsp; <a href="'.$href.'?'.$query.$next_page.'"><b>&rsaquo;</b></a> ';
+				echo '<li><a href="'.$href.'?'.$query.$next_page.'">&rsaquo;</a></li>'; // >
 			}
 
 			if ($page < ($pages - 1))
 			{
-				echo ' &nbsp; <a href="'.$href.'?'.$query.$pages.'"><b>&raquo;</b></a>';
+				echo '<li><a href="'.$href.'?'.$query.$pages.'">&raquo;</a></li>'; // >>
 			}
 		}
+        echo '</ul></div></div></span>';
 
-		echo '</p>';
-        echo '
-        <div>
-            <div align="center" style="float: left"></div>
-            <div align="right" style="text-align: right">
-                <a href="new_ticket.php">'.$hesklang['nti'].'</a>
-            </div>
-        </div>';
-
-	} // end PAGES > 1
-	else
-	{
-		echo '
-        <div>
-            <div align="center" style="float: left">
-                '.sprintf($hesklang['tickets_on_pages'],$total,$pages).'
-            </div>
-            <div align="right" style="text-align: right">
-                <a href="new_ticket.php">'.$hesklang['nti'].'</a>
-            </div>
-        </div>';
 	}
 
 	/* We have the full SQL query now, get tickets */
diff --git a/language/en/text.php b/language/en/text.php
index 7988b9e0..58a37197 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -410,7 +410,7 @@ $hesklang['remember_user']='Remember my username';
 $hesklang['wrong_user']='Wrong username';
 $hesklang['no_permission']='You don\'t have permission to perform this task, please login with an account that has.';
 $hesklang['tickets_on_pages']='Number of tickets: %d | Number of pages: %d'; // First %d is replaced with number of tickets, second %d with number of pages
-$hesklang['jump_page']=' | Jump to page:';
+$hesklang['jump_page']='Jump to page:';
 $hesklang['no_tickets_open']='No unresolved tickets found';
 $hesklang['no_tickets_crit']='No tickets found matching your criteria';
 $hesklang['confirm_execute']='Are you sure you want to continue?';