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

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-26 11:22:29 +03:00
parent 70a4aae352
commit 4e28fe02d1
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

2
resources/assets/js/script.js
View File

@ -9,6 +9,8 @@ var isChromium = isChrome && navigator.userAgent.indexOf('Chromium') >= 0;
var isChrome48 = isChrome && navigator.userAgent.indexOf('Chrome/48') >= 0; var isChrome48 = isChrome && navigator.userAgent.indexOf('Chrome/48') >= 0;
var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6 var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
var isAndroid = /Android/i.test(navigator.userAgent);
var isIPhone = /iPhone|iPad|iPod/i.test(navigator.userAgent);
var refreshTimer; var refreshTimer;
function generatePDF(invoice, javascript, force, cb) { function generatePDF(invoice, javascript, force, cb) {

4
resources/lang/en/texts.php
View File

@ -2460,7 +2460,9 @@ $LANG = array(
'started_task' => 'Successfully started task', 'started_task' => 'Successfully started task',
'create_client' => 'Create Client', 'create_client' => 'Create Client',
'download_desktop_app' => 'Download the desktop app', 'download_desktop_app' => 'Download desktop app',
'download_iphone_app' => 'Download iPhone app',
'download_android_app' => 'Download Android app',
); );

15
resources/views/tasks/time_tracker.blade.php
View File

@ -460,14 +460,25 @@
toastr.options.positionClass = 'toast-bottom-right'; toastr.options.positionClass = 'toast-bottom-right';
if (navigator.userAgent != 'Time Tracker') { if (navigator.userAgent != 'Time Tracker') {
var link = '{{ config('ninja.time_tracker') }}';
var message = "{{ trans('texts.download_desktop_app') }}";
if (isMobile) {
if (isIPhone) {
link = '{{ NINJA_IOS_APP_URL }}';
message = "{{ trans('texts.download_iphone_app') }}";
} else if (isAndroid) {
link = '{{ NINJA_ANDROID_APP_URL }}';
message = "{{ trans('texts.download_android_app') }}";
}
}
var options = { var options = {
timeOut: 10000, timeOut: 10000,
closeButton: true, closeButton: true,
onclick: function() { onclick: function() {
window.open('{{ config('ninja.time_tracker') }}', '_blank'); window.open(link, '_blank');
} }
}; };
toastr.info("{{ trans('texts.download_desktop_app') }}", false, options); toastr.info(message, false, options);
} }
sendKeepAlive(); sendKeepAlive();