Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-31 15:42:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-04-16 16:26:23 +03:00
parent bdc9f55831
commit 016b21584e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/invoices/edit.blade.php
View File

@ -274,7 +274,7 @@
<iframe id="theFrame" style="display:none" frameborder="1" width="100%" height="1180"></iframe> <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> <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>']) }} {{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
@endif @endif

8
app/views/master.blade.php
View File

@ -19,7 +19,13 @@
<meta property="og:description" content="Simple, Intuitive Invoicing."></meta> <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
<meta name="keywords" content="Invoice Ninja"></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"> <script type="text/javascript">
window.onerror = function(e) { window.onerror = function(e) {