Skip to content

Commit

Permalink
Update the Categories icon around the site
Browse files Browse the repository at this point in the history
  • Loading branch information
lguima committed May 1, 2020
1 parent 722cf9b commit c2733e2
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/Category/CreateController.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function __construct()
$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);

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Category/DeleteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function __construct()
$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);
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Category/EditController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct()
$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);

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Category/IndexController.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function __construct()
$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);
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Category/NoCategoryController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct()
$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);
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/Category/ShowController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct()
$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);
Expand All @@ -84,7 +84,7 @@ public function show(Request $request, Category $category, Carbon $start = null,
$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;
Expand Down Expand Up @@ -122,7 +122,7 @@ public function show(Request $request, Category $category, Carbon $start = null,
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;
Expand Down
2 changes: 1 addition & 1 deletion resources/views/v1/accounts/reconcile/transactions.twig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<th class="hidden-xs hidden-sm hidden-md">{{ trans('list.from') }}</th>
<th class="hidden-xs hidden-sm hidden-md">{{ trans('list.to') }}</th>
<th class="hidden-xs"><i class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i></th>
<th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
<th class="hidden-xs"><i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i></th>
</tr>
</thead>
<tbody>
Expand Down
6 changes: 4 additions & 2 deletions resources/views/v1/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
<div class="box-footer">
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i
class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a>
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
<i class="fa fa-bookmark"></i>
<span>{{ 'go_to_categories'|_ }}</span>
</a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/v1/partials/control-bar.twig
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

<li>
<a href="{{ route('categories.create') }}">
<i class="menu-icon fa fa-bar-chart bg-red"></i>
<i class="menu-icon fa fa-bookmark bg-red"></i>

<div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_category'|_ }}</h4>
Expand Down
4 changes: 3 additions & 1 deletion resources/views/v1/popup/list/journals.twig
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

{# Hide categories? #}
{% if not hideCategory %}
<th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
<th class="hidden-xs">
<i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i>
</th>
{% endif %}
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/v1/reports/partials/journals-audit.twig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<th class="hide-to">{{ trans('list.to') }}</th>

<th class="hide-budget"><i class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i></th>
<th class="hide-category"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
<th class="hide-category"><i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i></th>
<th class="hide-bill">{{ trans('list.bill') }}</th>

{# more optional fields (2x) #}
Expand Down

0 comments on commit c2733e2

Please sign in to comment.