From 016b21584e5e330f160a380220031e56a33d1e1f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 16 Apr 2014 16:26:23 +0300
Subject: [PATCH] Bug fixes

---
 app/views/invoices/edit.blade.php | 2 +-
 app/views/master.blade.php        | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index dd20e2acfb29..2a95897135d5 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -274,7 +274,7 @@
 	<iframe id="theFrame" style="display:none" frameborder="1" width="100%" height="1180"></iframe>
 	<canvas id="theCanvas" style="display:none;width:100%;border:solid 1px #CCCCCC;"></canvas>
 
-	@if (!Auth::user()->account->isPro())
+	@if (false && !Auth::user()->account->isPro())
 		{{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
 	@endif
 
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 9dc7676cf63a..4e3040bf097d 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -19,7 +19,13 @@
     <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
     <meta name="keywords" content="Invoice Ninja"></meta>    
     
-    <script src="{{ asset('vendor/jquery/jquery.min.js') }}" type="text/javascript"></script>  
+    @if (File::exists('vendor/jquery/jquery.js'))
+      <script src="{{ asset('vendor/jquery/jquery.js') }}" type="text/javascript"></script>  
+    @elseif (File::exists('vendor/jquery/dist/jquery.js'))
+      <script src="{{ asset('vendor/jquery/dist/jquery.js') }}" type="text/javascript"></script>  
+    @else
+      {{ die('Error: Failed to find jQuery') }}
+    @endif
 
     <script type="text/javascript">
     window.onerror = function(e) {