Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Add custom CSS, fix some views.
James Coleec7c52f97ed0
diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex cc85346a87..bd325252f1 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -82,6 +82,7 @@ final class IndexController extends Controller$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');$pageSize = (int) Preferences::get('listPageSize', 50)->data;$accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);+ $inactiveCount = $this->repository->getInactiveAccountsByType($types)->count();unset($collection);/** @var Carbon $start */@@ -116,6 +117,7 @@ final class IndexController extends Controllerreturn view('accounts.index', ['objectType' => $objectType,'inactivePage' => $inactivePage,+ 'inactiveCount' => $inactiveCount,'subTitleIcon' => $subTitleIcon,'subTitle' => $subTitle,'page' => $page,diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scssindex b9016698b8..5edaebb5c7 100644--- a/resources/assets/v3/sass/app.scss+++ b/resources/assets/v3/sass/app.scss@@ -39,6 +39,32 @@ $success: #64B624;@import 'shepherd.js/dist/css/shepherd.css';++// custom Firefly III CSS+.general-chart-error {+ height: 30px;+ background: url('/v1/images/error.png') no-repeat center center;+}+.piggy-handle {+ cursor: move;+}+.object-handle {+ cursor: move;+}+.rule-handle {+ cursor: move;+}+.bill-handle {+ cursor: move;+}++body.waiting * {+ cursor: progress;+}++++// @import "admin-lte/dist/css/adminlte.min.css";//diff --git a/resources/views/accounts/index.blade.php b/resources/views/accounts/index.blade.phpindex b131bae585..cee82b074f 100644--- a/resources/views/accounts/index.blade.php+++ b/resources/views/accounts/index.blade.php@@ -7,7 +7,7 @@<div class="card-header"><div class="row"><div class="col">- <div class="card-title">{{ trans('firefly.asset_accounts') }}</div>+ <div class="card-title">{{ trans('firefly.'.$objectType.'_accounts') }}</div></div><div class="col text-end"><div class="dropdown">@@ -36,7 +36,7 @@</div></div>- @if($inactiveCount > 0)+ @if($inactiveCount > 0 && !$inactivePage)<p class="m-2"><small><em><a href="{{ route('accounts.inactive.index', $objectType) }}" class="text-muted">diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.phpindex 48ba71200d..ce230b8217 100644--- a/resources/views/components/layout/sidebar.blade.php+++ b/resources/views/components/layout/sidebar.blade.php@@ -146,19 +146,19 @@</a></li><li class="nav-item">- <a href="{{ route('accounts.index', ['expense']) }}" class="nav-link">+ <a href="{{ route('accounts.index', ['expense']) }}" class="nav-link {{ \FireflyIII\Support\Blade\Navigation::menuSubItemActive('accounts.index','expense') }}"><em class="nav-icon bi bi-cart"></em><p>{{trans('firefly.expense_accounts')}}</p></a></li><li class="nav-item">- <a href="{{ route('accounts.index', ['revenue']) }}" class="nav-link">+ <a href="{{ route('accounts.index', ['revenue']) }}" class="nav-link {{ \FireflyIII\Support\Blade\Navigation::menuSubItemActive('accounts.index','revenue') }}"><em class="nav-icon bi bi-box-arrow-down"></em><p>{{ __('firefly.revenue_accounts') }}</p></a></li><li class="nav-item">- <a href="{{ route('accounts.index', ['liabilities']) }}" class="nav-link">+ <a href="{{ route('accounts.index', ['liabilities']) }}" class="nav-link {{ \FireflyIII\Support\Blade\Navigation::menuSubItemActive('accounts.index','liabilities') }}"><em class="nav-icon bi bi-ticket-detailed"></em><p>{{ __('firefly.liabilities_accounts') }}</p></a>