From c2733e2a8f7fc094199a4ca508b355744a09fbdd Mon Sep 17 00:00:00 2001 From: Lucas Guima Date: Fri, 1 May 2020 18:54:08 -0300 Subject: [PATCH] Update the Categories icon around the site --- app/Http/Controllers/Category/CreateController.php | 2 +- app/Http/Controllers/Category/DeleteController.php | 2 +- app/Http/Controllers/Category/EditController.php | 2 +- app/Http/Controllers/Category/IndexController.php | 2 +- app/Http/Controllers/Category/NoCategoryController.php | 2 +- app/Http/Controllers/Category/ShowController.php | 6 +++--- resources/views/v1/accounts/reconcile/transactions.twig | 2 +- resources/views/v1/index.twig | 6 ++++-- resources/views/v1/partials/control-bar.twig | 2 +- resources/views/v1/popup/list/journals.twig | 4 +++- resources/views/v1/reports/partials/journals-audit.twig | 2 +- 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php index 7e019fc43f..fa19ddfcd1 100644 --- a/app/Http/Controllers/Category/CreateController.php +++ b/app/Http/Controllers/Category/CreateController.php @@ -57,7 +57,7 @@ class CreateController extends Controller $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.categories')); - app('view')->share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('mainTitleIcon', 'fa-bookmark'); $this->repository = app(CategoryRepositoryInterface::class); $this->attachments = app(AttachmentHelperInterface::class); diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php index 6856243e14..59a2a19ecc 100644 --- a/app/Http/Controllers/Category/DeleteController.php +++ b/app/Http/Controllers/Category/DeleteController.php @@ -53,7 +53,7 @@ class DeleteController extends Controller $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.categories')); - app('view')->share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('mainTitleIcon', 'fa-bookmark'); $this->repository = app(CategoryRepositoryInterface::class); return $next($request); diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php index 632fa5a2ef..f5050899ce 100644 --- a/app/Http/Controllers/Category/EditController.php +++ b/app/Http/Controllers/Category/EditController.php @@ -59,7 +59,7 @@ class EditController extends Controller $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.categories')); - app('view')->share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('mainTitleIcon', 'fa-bookmark'); $this->repository = app(CategoryRepositoryInterface::class); $this->attachments = app(AttachmentHelperInterface::class); diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php index 063d9e6cec..633bf11cd0 100644 --- a/app/Http/Controllers/Category/IndexController.php +++ b/app/Http/Controllers/Category/IndexController.php @@ -53,7 +53,7 @@ class IndexController extends Controller $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.categories')); - app('view')->share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('mainTitleIcon', 'fa-bookmark'); $this->repository = app(CategoryRepositoryInterface::class); return $next($request); diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index e4ff1bef55..8f7f5904f3 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -59,7 +59,7 @@ class NoCategoryController extends Controller $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.categories')); - app('view')->share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('mainTitleIcon', 'fa-bookmark'); $this->journalRepos = app(JournalRepositoryInterface::class); return $next($request); diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 707fb39ffa..aa64ccdf36 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -58,7 +58,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { app('view')->share('title', (string) trans('firefly.categories')); - app('view')->share('mainTitleIcon', 'fa-bar-chart'); + app('view')->share('mainTitleIcon', 'fa-bookmark'); $this->repository = app(CategoryRepositoryInterface::class); return $next($request); @@ -84,7 +84,7 @@ class ShowController extends Controller $start = $start ?? session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ $end = $end ?? session('end', Carbon::now()->endOfMonth()); - $subTitleIcon = 'fa-bar-chart'; + $subTitleIcon = 'fa-bookmark'; $page = (int) $request->get('page'); $attachments = $this->repository->getAttachments($category); $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; @@ -122,7 +122,7 @@ class ShowController extends Controller public function showAll(Request $request, Category $category) { // default values: - $subTitleIcon = 'fa-bar-chart'; + $subTitleIcon = 'fa-bookmark'; $page = (int) $request->get('page'); $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; $start = null; diff --git a/resources/views/v1/accounts/reconcile/transactions.twig b/resources/views/v1/accounts/reconcile/transactions.twig index baae6399bc..73944ce267 100644 --- a/resources/views/v1/accounts/reconcile/transactions.twig +++ b/resources/views/v1/accounts/reconcile/transactions.twig @@ -9,7 +9,7 @@ {{ trans('list.from') }} {{ trans('list.to') }} - + diff --git a/resources/views/v1/index.twig b/resources/views/v1/index.twig index 0209d3352f..480041b5da 100644 --- a/resources/views/v1/index.twig +++ b/resources/views/v1/index.twig @@ -46,8 +46,10 @@
- {{ 'go_to_categories'|_ }} + + + {{ 'go_to_categories'|_ }} +
diff --git a/resources/views/v1/partials/control-bar.twig b/resources/views/v1/partials/control-bar.twig index 395ffc403d..ae6cca0c5c 100644 --- a/resources/views/v1/partials/control-bar.twig +++ b/resources/views/v1/partials/control-bar.twig @@ -79,7 +79,7 @@
  • - +

    {{ 'new_category'|_ }}

    diff --git a/resources/views/v1/popup/list/journals.twig b/resources/views/v1/popup/list/journals.twig index 2b3447edfe..50d557a7ab 100644 --- a/resources/views/v1/popup/list/journals.twig +++ b/resources/views/v1/popup/list/journals.twig @@ -21,7 +21,9 @@ {# Hide categories? #} {% if not hideCategory %} - + + + {% endif %} diff --git a/resources/views/v1/reports/partials/journals-audit.twig b/resources/views/v1/reports/partials/journals-audit.twig index 35c511cf84..d2838af694 100644 --- a/resources/views/v1/reports/partials/journals-audit.twig +++ b/resources/views/v1/reports/partials/journals-audit.twig @@ -15,7 +15,7 @@ {{ trans('list.to') }} - + {{ trans('list.bill') }} {# more optional fields (2x) #}