From e36e5b4247d33a34f019d1b1b36f701f31544ac4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 6 Apr 2014 12:41:35 +0300
Subject: [PATCH] Bug fixes

---
 app/controllers/AccountController.php |  2 +-
 app/views/public/contact_us.blade.php |  1 +
 app/views/public/header.blade.php     | 14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 39015a4fa4d1..6a7c52d688a8 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -604,7 +604,7 @@ class AccountController extends \BaseController {
 			{
 				$path = Input::file('logo')->getRealPath();
 				File::delete('logo/' . $account->account_key . '.jpg');				
-				Image::make($path)->resize(null, 120, true, false)->save('logo/' . $account->account_key . '.jpg');				
+				Image::make($path)->resize(200, 120, true, false)->save('logo/' . $account->account_key . '.jpg');				
 			}
 
 			Event::fire('user.refresh');
diff --git a/app/views/public/contact_us.blade.php b/app/views/public/contact_us.blade.php
index a044bd199df1..c8615aa85c3b 100644
--- a/app/views/public/contact_us.blade.php
+++ b/app/views/public/contact_us.blade.php
@@ -115,6 +115,7 @@ var contactForm = {
           <h2>Other ways to reach us</h2>
           <p><span class="glyphicon glyphicon-send"></span><a href="mailto:contact@invoiceninja.com">contact@invoiceninja.com</a></p>
           <p><span class="glyphicon glyphicon-earphone"></span>+1-800-763-1948</p>
+          <p><span class="glyphicon glyphicon-comment"></span><a href="http://www.invoiceninja.org" target="_blank">Google Group</a></p>        
           <p><span class="github"></span><div style="padding-top:10px"> &nbsp;&nbsp;<a href="https://github.com/hillelcoren/invoice-ninja" target="_blank">GitHub Project</a></div></p>
 
         </div>
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index e216afa55d4b..bcd91205936d 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -64,8 +64,9 @@
       <a class="brand" href="/"><img src=
         "images/invoiceninja-logo.png"></a>
         <ul class="navbar-list">
-          <li>{{ link_to('features', 'Features' ) }}</li>
-          <li>{{ link_to('faq', 'FAQ' ) }}</li>
+          <!-- <li>{{ link_to('features', 'Features' ) }}</li> -->
+          <!-- <li>{{ link_to('faq', 'FAQ' ) }}</li> -->
+          <li>{{ link_to('about', 'About Us' ) }}</li>
           <li>{{ link_to('contact', 'Contact Us' ) }}</li>
           <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
         </ul>
@@ -121,8 +122,9 @@
 
 <div class="navbar-inner">
   <ul class="navbar-list">
-    <li>{{ link_to('features', 'Features' ) }}</li>
-    <li>{{ link_to('faq', 'FAQ' ) }}</li>
+    <!-- <li>{{ link_to('features', 'Features' ) }}</li> -->
+    <!-- <li>{{ link_to('faq', 'FAQ' ) }}</li> -->
+    <li>{{ link_to('about', 'About Us' ) }}</li>
     <li>{{ link_to('contact', 'Contact Us' ) }}</li>
     <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
   </ul>
@@ -138,7 +140,9 @@
 </div>
 </div>
 </div>
-</footer><script src="{{ asset('/js/retina-1.1.0.min.js') }}" type="text/javascript"></script>
+</footer>
+
+<script src="{{ asset('/js/retina-1.1.0.min.js') }}" type="text/javascript"></script>
 <script type="text/javascript">
     $('.expander').simpleexpand();
 </script>