From 06981a768e09d9f3744974f6f9e2dbb55aca17d5 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Mon, 17 Feb 2014 23:54:50 +0200
Subject: [PATCH] UI Improvements - Default Theme - Updates #194

---
 public/themes/default/footer.chunk.php | 2 +-
 public/themes/default/header.chunk.php | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/themes/default/footer.chunk.php b/public/themes/default/footer.chunk.php
index 44a72aa..cd42ae3 100644
--- a/public/themes/default/footer.chunk.php
+++ b/public/themes/default/footer.chunk.php
@@ -2,6 +2,6 @@
             <div class="pull-left"><?php echo Chunk::get('footer-links'); ?></div>
             <div class="pull-right"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
     </footer>
-    <?php echo Snippet::get('google-analytics'); ?>
+    <?php echo Snippet::get('google-analytics'); ?>    
   </body>
 </html>
diff --git a/public/themes/default/header.chunk.php b/public/themes/default/header.chunk.php
index 3789597..a08ccce 100644
--- a/public/themes/default/header.chunk.php
+++ b/public/themes/default/header.chunk.php
@@ -29,8 +29,8 @@
     <?php Stylesheet::load(); ?>
 
     <!-- JavaScripts -->
-    <?php Javascript::add('public/assets/js/jquery.js', 'frontend', 1); ?>
-    <?php Javascript::add('public/assets/js/bootstrap.js', 'frontend', 2); ?>
+    <?php Javascript::add('public/assets/js/jquery.min.js', 'frontend', 1); ?>
+    <?php Javascript::add('public/assets/js/bootstrap.min.js', 'frontend', 2); ?>
     <?php Javascript::load(); ?>
 
     <?php Action::run('theme_header'); ?>
@@ -63,10 +63,9 @@
         <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav pull-right">
               <?php echo Menu::get(); ?>
+              <?php Users::getPanel(); ?>
           </ul>
-          <!--<div class="pull-right user-panel">
-            <?php Users::getPanel(); ?>
-          </div>-->
+          <ul>
         </div>
       </div>
     </div>