IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-30 20:54:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update the Categories icon around the site

Browse Source
This commit is contained in:
Lucas Guima 2020-05-01 18:54:08 -03:00
parent 722cf9b4fe
commit c2733e2a8f
11 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Category/CreateController.php
View File

@ -57,7 +57,7 @@ class CreateController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.categories')); 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->repository = app(CategoryRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);

2
app/Http/Controllers/Category/DeleteController.php
View File

@ -53,7 +53,7 @@ class DeleteController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.categories')); 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->repository = app(CategoryRepositoryInterface::class);
return $next($request); return $next($request);

2
app/Http/Controllers/Category/EditController.php
View File

@ -59,7 +59,7 @@ class EditController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.categories')); 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->repository = app(CategoryRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);

2
app/Http/Controllers/Category/IndexController.php
View File

@ -53,7 +53,7 @@ class IndexController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.categories')); 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->repository = app(CategoryRepositoryInterface::class);
return $next($request); return $next($request);

2
app/Http/Controllers/Category/NoCategoryController.php
View File

@ -59,7 +59,7 @@ class NoCategoryController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.categories')); 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); $this->journalRepos = app(JournalRepositoryInterface::class);
return $next($request); return $next($request);

6
app/Http/Controllers/Category/ShowController.php
View File

@ -58,7 +58,7 @@ class ShowController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.categories')); 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->repository = app(CategoryRepositoryInterface::class);
return $next($request); return $next($request);
@ -84,7 +84,7 @@ class ShowController extends Controller
$start = $start ?? session('start', Carbon::now()->startOfMonth()); $start = $start ?? session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = $end ?? session('end', Carbon::now()->endOfMonth()); $end = $end ?? session('end', Carbon::now()->endOfMonth());
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bookmark';
$page = (int) $request->get('page'); $page = (int) $request->get('page');
$attachments = $this->repository->getAttachments($category); $attachments = $this->repository->getAttachments($category);
$pageSize = (int) app('preferences')->get('listPageSize', 50)->data; $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
@ -122,7 +122,7 @@ class ShowController extends Controller
public function showAll(Request $request, Category $category) public function showAll(Request $request, Category $category)
{ {
// default values: // default values:
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bookmark';
$page = (int) $request->get('page'); $page = (int) $request->get('page');
$pageSize = (int) app('preferences')->get('listPageSize', 50)->data; $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
$start = null; $start = null;

2
resources/views/v1/accounts/reconcile/transactions.twig
View File

@ -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.from') }}</th>
<th class="hidden-xs hidden-sm hidden-md">{{ trans('list.to') }}</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-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> </tr>
</thead> </thead>
<tbody> <tbody>

6
resources/views/v1/index.twig
View File

@ -46,8 +46,10 @@
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i <a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a> <i class="fa fa-bookmark"></i>
<span>{{ 'go_to_categories'|_ }}</span>
</a>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/v1/partials/control-bar.twig
View File

@ -79,7 +79,7 @@
<li> <li>
<a href="{{ route('categories.create') }}"> <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"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_category'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_category'|_ }}</h4>

4
resources/views/v1/popup/list/journals.twig
View File

@ -21,7 +21,9 @@
{# Hide categories? #} {# Hide categories? #}
{% if not hideCategory %} {% 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 %} {% endif %}
</tr> </tr>
</thead> </thead>

2
resources/views/v1/reports/partials/journals-audit.twig
View File

@ -15,7 +15,7 @@
<th class="hide-to">{{ trans('list.to') }}</th> <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-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> <th class="hide-bill">{{ trans('list.bill') }}</th>
{# more optional fields (2x) #} {# more optional fields (2x) #}