Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity

Updating texts

Browse Source
This commit is contained in:
Hillel Coren 2014-05-11 21:24:30 +03:00
parent 0fcd6bf9fa
commit 113665da1e
13 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/AccountController.php
View File

@ -50,7 +50,7 @@ class AccountController extends \BaseController {
Auth::login($user, true);
Event::fire('user.login');
return Redirect::to('invoices/create');
return Redirect::to('invoices/create');
}
public function enableProPlan()

3
app/lang/de/texts.php
View File

@ -334,5 +334,8 @@ return array(
'archived_product' => 'Produkt erfolgreich archiviert',
'product_library' => 'Produktbibliothek',
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
);

3
app/lang/es/texts.php
View File

@ -332,5 +332,8 @@ return array(
'updated_product' => 'Successfully updated product',
'created_product' => 'Successfully created product',
'archived_product' => 'Successfully archived product',
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
);

3
app/lang/fr/texts.php
View File

@ -333,5 +333,8 @@ return array(
'updated_product' => 'Successfully updated product',
'created_product' => 'Successfully created product',
'archived_product' => 'Successfully archived product',
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
);

3
app/lang/it/texts.php
View File

@ -334,4 +334,7 @@ return array(
'created_product' => 'Successfully created product',
'archived_product' => 'Successfully archived product',
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
);

3
app/lang/nl/texts.php
View File

@ -334,5 +334,8 @@ return array(
'updated_product' => 'Successfully updated product',
'created_product' => 'Successfully created product',
'archived_product' => 'Successfully archived product',
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
);

3
app/lang/pt_BR/texts.php
View File

@ -323,5 +323,8 @@ return array(
'created_product' => 'Successfully created product',
'archived_product' => 'Successfully archived product',
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
);

7
app/views/accounts/payments.blade.php
View File

@ -73,6 +73,11 @@
}
}
function gatewayLink(url) {
//if (url.match('authorize'))
openUrl(url, '/affiliate/' + new URL(url).hostname);
}
$(document).ready(function() {
$('.recommended-gateway').change(
function(){
@ -95,7 +100,7 @@
var contents = $(this).parent().contents();
contents[contents.length - 1].nodeValue = '';
$(this).after('<img src="' +$(this).attr('data-imageUrl') + '" /><br />');
$(this).parent().children().last().after('<a href="#" onclick="openUrl(\'' + $(this).attr('data-siteUrl') + '\')">Create an account</a>');
$(this).parent().children().last().after('<a href="#" onclick="gatewayLink(\'' + $(this).attr('data-siteUrl') + '\')">Create an account</a>');
});

1
app/views/header.blade.php
View File

@ -492,6 +492,7 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
trackUrl('/signed_up');
if (result) {
localStorage.setItem('guest_key', '');
trackUrl('/user/sign_up');
NINJA.isRegistered = true;
$('#signUpButton').hide();
$('#myAccountButton').html(result);

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

@ -51,17 +51,24 @@
<body>
<script>
@if (isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}');
ga('send', 'pageview');
</script>
ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}');
ga('send', 'pageview');
function trackUrl(url) {
url = '/track' + url.replace('http:/', '');
ga('send', 'pageview', url);
}
@else
function trackUrl(url) {}
@endif
</script>
@yield('body')

9
app/views/public/header.blade.php
View File

@ -181,15 +181,10 @@ jQuery(document).ready(function($) {
});
</script>
<script src="{{ asset('/js/retina-1.1.0.min.js') }}" type="text/javascript"></script>
<!--
<script type="text/javascript">
$('.expander').simpleexpand();
</script>
All images in the site need to have retina versions otherwise the log fills up with requests for missing files
<script src="{{ asset('/js/retina-1.1.0.min.js') }}" type="text/javascript"></script>
-->
@stop

9
public/built.js
View File

@ -39444,12 +39444,7 @@ function setDocHexDraw(doc, hex) {
return doc.setDrawColor(r, g, b);
}
function openUrl(url) {
trackUrl(url);
function openUrl(url, track) {
trackUrl(track ? track : url);
window.open(url, '_blank');
}
function trackUrl(url) {
url = '/track' + url.replace('http:/', '');
ga('send', 'pageview', url);
}

9
public/js/script.js
View File

@ -1728,12 +1728,7 @@ function setDocHexDraw(doc, hex) {
return doc.setDrawColor(r, g, b);
}
function openUrl(url) {
trackUrl(url);
function openUrl(url, track) {
trackUrl(track ? track : url);
window.open(url, '_blank');
}
function trackUrl(url) {
url = '/track' + url.replace('http:/', '');
ga('send', 'pageview', url);
}