Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 02:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1081 from codedge/Self-updater-integration

Browse Source 
Integrate updater in sidebar
This commit is contained in:
Hillel Coren 2016-09-21 20:54:55 +03:00 committed by GitHub
commit 0b54c8408a
10 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SelfUpdateController.php
View File

@ -3,8 +3,6 @@
namespace App\Http\Controllers;
use Codedge\Updater\UpdaterManager;
use App\Http\Requests;
use Redirect;
class SelfUpdateController extends BaseController

1
app/Models/EntityModel.php
View File

@ -263,6 +263,7 @@ class EntityModel extends Eloquent
'expenses' => 'file-image-o',
'vendors' => 'building',
'settings' => 'cog',
'self-update' => 'download',
];
return array_get($icons, $entityType);

17
composer.lock generated
View File

@ -798,7 +798,7 @@
"laravel"
],
"abandoned": "OpenSkill/Datatable",
"time": "2015-04-29 07:00:36"
"time": "2016-07-21 12:52:32"
},
{
"name": "classpreloader/classpreloader",
@ -1029,12 +1029,12 @@
"source": {
"type": "git",
"url": "https://github.com/codedge/laravel-selfupdater.git",
"reference": "ef8f30b8084d6b0c2d2587c0b621011a1515d250"
"reference": "b24b155fe0fcccf0ecfbc926a6c3043911418906"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/ef8f30b8084d6b0c2d2587c0b621011a1515d250",
"reference": "ef8f30b8084d6b0c2d2587c0b621011a1515d250",
"url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/b24b155fe0fcccf0ecfbc926a6c3043911418906",
"reference": "b24b155fe0fcccf0ecfbc926a6c3043911418906",
"shasum": ""
},
"require": {
@ -1077,7 +1077,7 @@
"self-update",
"update"
],
"time": "2016-08-21 16:46:12"
"time": "2016-09-21 12:43:00"
},
{
"name": "collizo4sky/omnipay-wepay",
@ -2183,8 +2183,7 @@
"reference": "origin/master",
"shasum": null
},
"type": "library",
"time": "2016-06-03 12:00:26"
"type": "library"
},
{
"name": "google/apiclient",
@ -4487,7 +4486,7 @@
"payment",
"twocheckout"
],
"time": "2014-09-17 00:35:37"
"time": "2016-03-25 10:39:58"
},
{
"name": "omnipay/authorizenet",
@ -5357,7 +5356,7 @@
"pay",
"payment"
],
"time": "2015-03-03 18:55:42"
"time": "2016-09-14 09:25:40"
},
{
"name": "omnipay/multisafepay",

23
config/self-update.php
View File

@ -45,6 +45,29 @@ return [
],
],
/*
|--------------------------------------------------------------------------
| Exclude folders from update
|--------------------------------------------------------------------------
|
| Specifiy folders which should not be updated and will be skipped during the
| update process.
|
| Here's already a list of good examples to skip. You may want to keep those.
|
*/
'exclude_folders' => [
'node_modules',
'bootstrap/cache',
'bower',
'storage/app',
'storage/framework',
'storage/logs',
'storage/self-update',
'vendor',
],
/*
|--------------------------------------------------------------------------
| Event Logging

2
public/css/built.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/built.css.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/css/sidebar.css vendored
View File

@ -98,6 +98,10 @@
line-height: 40px;
}
#left-sidebar-wrapper .sidebar-nav li span.badge {
text-indent: 0px;
}
#right-sidebar-wrapper .sidebar-nav li {
text-indent: 8px;
font-size: 15px;

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

@ -2086,12 +2086,12 @@ $LANG = array(
'limited_gateways' => 'Note: we support one credit card gateway per company.',
'warning' => 'Warning',
'self-update' => 'Update Invoice Ninja',
'self-update' => 'Update',
'update_invoiceninja_title' => 'Update Invoice Ninja',
'update_invoiceninja_warning' => 'Before start upgrading Invoice Ninja create a backup of your database and files!',
'update_invoiceninja_available' => 'A new version of Invoice Ninja is available.',
'update_invoiceninja_unavailable' => 'No new version of Invoice Ninja available.',
'update_invoiceninja_decide_update_download' => 'You can decide to update directly to :version or to just download the new relase and update later.',
'update_invoiceninja_instructions' => 'Please install the new version <strong>:version</strong> by clicking the <em>Update now</em> button below. Afterwards you\'ll be redirected to the dashboard.',
'update_invoiceninja_update_start' => 'Update now',
'update_invoiceninja_download_start' => 'Download :version',
'create_new' => 'Create New',

6
resources/views/header.blade.php
View File

@ -517,7 +517,8 @@
'tasks',
'expenses',
'vendors',
'settings'
'settings',
'self-update'
] as $option)
<li class="{{ Request::is("{$option}*") ? 'active' : '' }}">
@if ($option == 'settings')
@ -538,6 +539,9 @@
class="{{ Request::is("{$option}*") ? 'active' : '' }}">
<i class="fa fa-{{ \App\Models\EntityModel::getIcon($option) }}" style="width:46px; padding-right:10px"></i>
{{ ($option == 'recurring_invoices') ? trans('texts.recurring') : trans("texts.{$option}") }}
@if ($option == 'self-update' && Updater::source()->isNewVersionAvailable('v'.NINJA_VERSION))
<span class="badge alert-danger">1</span>
@endif
</a>
</li>
@endforeach

5
resources/views/vendor/self-update/self-update.blade.php vendored
View File

@ -22,7 +22,7 @@
{{ trans('texts.update_invoiceninja_available') }}
</strong>
<br/>
{{ trans('texts.update_invoiceninja_decide_update_download', ['version' => $versionAvailable]) }}
{!! trans('texts.update_invoiceninja_instructions', ['version' => $versionAvailable]) !!}
@endif
</div>
</div>
@ -37,9 +37,6 @@
<button type="submit" class="btn btn-primary" id="do-updade">
{{ trans('texts.update_invoiceninja_update_start') }}
</button>
<button type="submit" class="btn btn-default" id="download-update">
{{ trans('texts.update_invoiceninja_download_start', ['version' => $versionAvailable]) }}
</button>
</div>
</form>
</div>