Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 09:04:35 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Razi KAntorp 2014-02-25 19:14:09 +01:00
commit b8a5b9b60c
4 changed files with 760 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/routes.php
View File

@ -168,6 +168,7 @@ HTML::macro('breadcrumbs', function() {
unset($crumbs[$key]);
}
}
$crumbs = array_values($crumbs);
for ($i=0; $i<count($crumbs); $i++) {
$crumb = trim($crumbs[$i]);
if (!$crumb) continue;

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

@ -567,7 +567,12 @@
invoice.imageLogoWidth1 =120;
invoice.imageLogoHeight1 = 40
return invoice;
invoice.imageLogo2 = "{{ HTML::image_data('images/report_logo2.jpg') }}";
invoice.imageLogoWidth2 =325/2;
invoice.imageLogoHeight2 = 81/2;
return invoice;
}
/*

BIN
public/images/report_logo2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

859
public/js/script.js
View File

File diff suppressed because it is too large Load Diff