IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3323 from lguima/feature/page-icons-update

Browse Source 
Update the pages and blocks icons
This commit is contained in:
James Cole 2020-05-02 17:11:27 +02:00 committed by GitHub
commit d9132bbee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Budget/AvailableBudgetController.php
View File

@ -59,7 +59,7 @@ class AvailableBudgetController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->abRepository = app(AvailableBudgetRepositoryInterface::class); $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->currencyRepos = app(CurrencyRepositoryInterface::class); $this->currencyRepos = app(CurrencyRepositoryInterface::class);

2
app/Http/Controllers/Budget/BudgetLimitController.php
View File

@ -70,7 +70,7 @@ class BudgetLimitController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);
$this->opsRepository = app(OperationsRepositoryInterface::class); $this->opsRepository = app(OperationsRepositoryInterface::class);
$this->blRepository = app(BudgetLimitRepositoryInterface::class); $this->blRepository = app(BudgetLimitRepositoryInterface::class);

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

@ -58,7 +58,7 @@ class CreateController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);

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

@ -54,7 +54,7 @@ class DeleteController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);
return $next($request); return $next($request);

2
app/Http/Controllers/Budget/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.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);

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

@ -72,7 +72,7 @@ class IndexController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);
$this->opsRepository = app(OperationsRepositoryInterface::class); $this->opsRepository = app(OperationsRepositoryInterface::class);
$this->abRepository = app(AvailableBudgetRepositoryInterface::class); $this->abRepository = app(AvailableBudgetRepositoryInterface::class);

2
app/Http/Controllers/Budget/ShowController.php
View File

@ -64,7 +64,7 @@ class ShowController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->journalRepos = app(JournalRepositoryInterface::class); $this->journalRepos = app(JournalRepositoryInterface::class);
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);

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
app/Http/Controllers/Json/BudgetController.php
View File

@ -63,7 +63,7 @@ class BudgetController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets')); app('view')->share('title', (string) trans('firefly.budgets'));
app('view')->share('mainTitleIcon', 'fa-tasks'); app('view')->share('mainTitleIcon', 'fa-pie-chart');
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);
$this->opsRepository = app(OperationsRepositoryInterface::class); $this->opsRepository = app(OperationsRepositoryInterface::class);
$this->abRepository = app(AvailableBudgetRepositoryInterface::class); $this->abRepository = app(AvailableBudgetRepositoryInterface::class);

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

@ -71,7 +71,7 @@ class PiggyBankController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.piggyBanks')); app('view')->share('title', (string) trans('firefly.piggyBanks'));
app('view')->share('mainTitleIcon', 'fa-sort-amount-asc'); app('view')->share('mainTitleIcon', 'fa-bullseye');
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);
$this->piggyRepos = app(PiggyBankRepositoryInterface::class); $this->piggyRepos = app(PiggyBankRepositoryInterface::class);

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

@ -64,7 +64,7 @@ class ReportController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.reports')); app('view')->share('title', (string) trans('firefly.reports'));
app('view')->share('mainTitleIcon', 'fa-line-chart'); app('view')->share('mainTitleIcon', 'fa-bar-chart');
app('view')->share('subTitleIcon', 'fa-calendar'); app('view')->share('subTitleIcon', 'fa-calendar');
$this->helper = app(ReportHelperInterface::class); $this->helper = app(ReportHelperInterface::class);
$this->repository = app(BudgetRepositoryInterface::class); $this->repository = app(BudgetRepositoryInterface::class);

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

@ -60,7 +60,7 @@ class TagController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.tags')); app('view')->share('title', (string) trans('firefly.tags'));
app('view')->share('mainTitleIcon', 'fa-tags'); app('view')->share('mainTitleIcon', 'fa-tag');
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);
$this->repository = app(TagRepositoryInterface::class); $this->repository = app(TagRepositoryInterface::class);

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

@ -8,8 +8,8 @@
<th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th> <th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th>
<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-tasks 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>

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

@ -30,8 +30,10 @@
<canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"><i <a href="{{ route('budgets.index') }}" class="btn btn-default button-sm">
class="fa fa-tasks"></i> {{ 'go_to_budgets'|_ }}</a> <i class="fa fa-pie-chart"></i>
<span>{{ 'go_to_budgets'|_ }}</span>
</a>
</div> </div>
</div> </div>
{# CATEGORIES #} {# CATEGORIES #}
@ -44,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>

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

@ -69,7 +69,7 @@
<li> <li>
<a href="{{ route('budgets.create') }}"> <a href="{{ route('budgets.create') }}">
<i class="menu-icon fa fa-tasks bg-red"></i> <i class="menu-icon fa fa-pie-chart bg-red"></i>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_budget'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_budget'|_ }}</h4>
@ -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>
@ -89,7 +89,7 @@
<li> <li>
<a href="{{ route('piggy-banks.create') }}"> <a href="{{ route('piggy-banks.create') }}">
<i class="menu-icon fa fa-sort-amount-asc bg-teal"></i> <i class="menu-icon fa fa-bullseye bg-teal"></i>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_piggy_bank'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_piggy_bank'|_ }}</h4>

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

@ -11,14 +11,19 @@
{% if not hideDestination %} {% if not hideDestination %}
<th class="hidden-xs">{{ trans('list.to') }}</th> <th class="hidden-xs">{{ trans('list.to') }}</th>
{% endif %} {% endif %}
{# Hide budgets? #} {# Hide budgets? #}
{% if not hideBudget %} {% if not hideBudget %}
<th class="hidden-xs"><i class="fa fa-tasks 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>
{% endif %} {% endif %}
{# 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>

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

@ -14,8 +14,8 @@
<th class="hide-from">{{ trans('list.from') }}</th> <th class="hide-from">{{ trans('list.from') }}</th>
<th class="hide-to">{{ trans('list.to') }}</th> <th class="hide-to">{{ trans('list.to') }}</th>
<th class="hide-budget"><i class="fa fa-tasks 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) #}