mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Clean up views and pages for v2
This commit is contained in:
James Cole
@@ -1,6 +1,7 @@
|
||||
{% set bcArgs = [objectType] %}
|
||||
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div id="accounts"></div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{% set bcArgs = [[objectType], [1,2,3]] %}
|
||||
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div id="accounts"></div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
<ol class="breadcrumb float-sm-right">
|
||||
<li class="breadcrumb-item"><a href="#">Home</a></li>
|
||||
<li class="breadcrumb-item active">Bread crumbs v1</li>
|
||||
</ol>
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
19
resources/views/v2/object-groups/index.twig
Normal file
19
resources/views/v2/object-groups/index.twig
Normal file
@@ -0,0 +1,19 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
<!-- Main row -->
|
||||
<div id="no-page">Hello, I am empty page.</div>
|
||||
<!-- /.row (main row) -->
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
|
||||
{% endblock %}
|
||||
14
resources/views/v2/partials/layout/breadcrumbs.twig
Normal file
14
resources/views/v2/partials/layout/breadcrumbs.twig
Normal file
@@ -0,0 +1,14 @@
|
||||
{% if breadcrumbs|length > 0 %}
|
||||
<ol class="breadcrumb float-sm-right">
|
||||
{% for breadcrumb in breadcrumbs %}
|
||||
{% if breadcrumb.url and not loop.last %}
|
||||
<li class="breadcrumb-item"><a href="{{ breadcrumb.url }}">{{ breadcrumb.title }}</a></li>
|
||||
{% else %}
|
||||
<li class="breadcrumb-item active">{{ breadcrumb.title }}</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ol>
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
@@ -22,88 +22,41 @@
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<!-- Messages Dropdown Menu -->
|
||||
{# calendar thing, removed #}
|
||||
{#
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" data-toggle="dropdown" href="#">
|
||||
<i class="far fa-calendar-alt"></i>
|
||||
<i class="fas fa-cogs"></i>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
|
||||
<a href="#" class="dropdown-item">
|
||||
<!-- Message Start -->
|
||||
<div class="media">
|
||||
<img src="v2/dist/img/user1-128x128.jpg" alt="User Avatar" class="img-size-50 mr-3 img-circle">
|
||||
<div class="media-body">
|
||||
<h3 class="dropdown-item-title">
|
||||
Brad Diesel
|
||||
<span class="float-right text-sm text-danger"><i class="fas fa-star"></i></span>
|
||||
</h3>
|
||||
<p class="text-sm">Call me whenever you can...</p>
|
||||
<p class="text-sm text-muted"><i class="far fa-clock mr-1"></i> 4 Hours Ago</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Message End -->
|
||||
<a href="{{ route('preferences.index') }}" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-cogs mr-2"></i> {{ 'preferences'|_ }}
|
||||
</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item">
|
||||
<!-- Message Start -->
|
||||
<div class="media">
|
||||
<img src="v2/dist/img/user8-128x128.jpg" alt="User Avatar" class="img-size-50 img-circle mr-3">
|
||||
<div class="media-body">
|
||||
<h3 class="dropdown-item-title">
|
||||
John Pierce
|
||||
<span class="float-right text-sm text-muted"><i class="fas fa-star"></i></span>
|
||||
</h3>
|
||||
<p class="text-sm">I got your message bro</p>
|
||||
<p class="text-sm text-muted"><i class="far fa-clock mr-1"></i> 4 Hours Ago</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Message End -->
|
||||
<a href="{{ route('currencies.index') }}" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-euro-sign mr-2"></i> {{ 'currencies'|_ }}
|
||||
</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item">
|
||||
<!-- Message Start -->
|
||||
<div class="media">
|
||||
<img src="v2/dist/img/user3-128x128.jpg" alt="User Avatar" class="img-size-50 img-circle mr-3">
|
||||
<div class="media-body">
|
||||
<h3 class="dropdown-item-title">
|
||||
Nora Silvester
|
||||
<span class="float-right text-sm text-warning"><i class="fas fa-star"></i></span>
|
||||
</h3>
|
||||
<p class="text-sm">The subject goes here</p>
|
||||
<p class="text-sm text-muted"><i class="far fa-clock mr-1"></i> 4 Hours Ago</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Message End -->
|
||||
<a href="{{ route('admin.index') }}" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-envelope mr-2"></i> {{ 'administration'|_ }}
|
||||
</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item dropdown-footer">See All Messages</a>
|
||||
</div>
|
||||
</li>
|
||||
#}
|
||||
<!-- Notifications Dropdown Menu -->
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" data-toggle="dropdown" href="#">
|
||||
<i class="far fa-user"></i>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
|
||||
<span class="dropdown-item dropdown-header">15 Notifications</span>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item">
|
||||
<i class="fas fa-envelope mr-2"></i> 4 new messages
|
||||
<span class="float-right text-muted text-sm">3 mins</span>
|
||||
<a href="{{ route('profile.index') }}" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-user mr-2"></i> {{ 'profile'|_ }}
|
||||
</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item">
|
||||
<i class="fas fa-users mr-2"></i> 8 friend requests
|
||||
<span class="float-right text-muted text-sm">12 hours</span>
|
||||
<a href="{{ route('preferences.index') }}" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-cogs mr-2"></i> {{ 'preferences'|_ }}
|
||||
</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item">
|
||||
<i class="fas fa-file mr-2"></i> 3 new reports
|
||||
<span class="float-right text-muted text-sm">2 days</span>
|
||||
<a href="{{ route('logout') }}" class="dropdown-item">
|
||||
<i class="fas fa-sign-out-alt mr-2"></i> {{ 'logout'|_ }}
|
||||
</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item dropdown-footer">See All Notifications</a>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<li class="nav-header text-uppercase">{{ 'financial_control'|_ }}</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('budgets.index') }}" class="nav-link">
|
||||
<a href="{{ route('budgets.index') }}" class="nav-link {{ activeRoutePartial('budgets') }}">
|
||||
<i class="nav-icon fas fa-chart-pie"></i>
|
||||
<p>
|
||||
{{ 'budgets'|_ }}
|
||||
@@ -46,7 +46,7 @@
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('bills.index') }}" class="nav-link">
|
||||
<a href="{{ route('bills.index') }}" class="nav-link {{ activeRoutePartial('bills') }}">
|
||||
<i class="nav-icon far fa-calendar-alt"></i>
|
||||
<p>
|
||||
{{ 'bills'|_ }}
|
||||
@@ -55,7 +55,7 @@
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('piggy-banks.index') }}" class="nav-link">
|
||||
<a href="{{ route('piggy-banks.index') }}" class="nav-link {{ activeRoutePartial('piggy-banks') }}">
|
||||
<i class="nav-icon fas fa-bullseye"></i>
|
||||
<p>
|
||||
{{ 'piggyBanks'|_ }}
|
||||
@@ -65,7 +65,7 @@
|
||||
|
||||
<li class="nav-header text-uppercase">{{ 'accounting'|_ }}</li>
|
||||
|
||||
<li class="nav-item has-treeview">
|
||||
<li class="nav-item has-treeview {{ menuOpenRoutePartial('transactions') }}">
|
||||
<a href="#" class="nav-link">
|
||||
<i class="nav-icon fas fa-exchange-alt"></i>
|
||||
<p>
|
||||
@@ -75,19 +75,19 @@
|
||||
</a>
|
||||
<ul class="nav nav-treeview">
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('transactions.index', 'withdrawal') }}" class="nav-link">
|
||||
<a href="{{ route('transactions.index', 'withdrawal') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
|
||||
<i class="fas fa-long-arrow-alt-left nav-icon"></i>
|
||||
<p>{{ 'expenses'|_ }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('transactions.index', 'deposit') }}" class="nav-link">
|
||||
<a href="{{ route('transactions.index', 'deposit') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'deposit') }}">
|
||||
<i class="fas fa-long-arrow-alt-right nav-icon"></i>
|
||||
<p>{{ 'income'|_ }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('transactions.index', 'transfers') }}" class="nav-link">
|
||||
<a href="{{ route('transactions.index', 'transfers') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'transfers') }}">
|
||||
<i class="fas fa-exchange-alt nav-icon"></i>
|
||||
<p>{{ 'transfers'|_ }}</p>
|
||||
</a>
|
||||
@@ -95,7 +95,7 @@
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="nav-item has-treeview">
|
||||
<li class="nav-item has-treeview {{ menuOpenRoutePartial('rules') }} {{ menuOpenRoutePartial('recurring') }}">
|
||||
<a href="#" class="nav-link">
|
||||
<i class="nav-icon fas fa-microchip"></i>
|
||||
<p>
|
||||
@@ -105,13 +105,13 @@
|
||||
</a>
|
||||
<ul class="nav nav-treeview">
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('rules.index') }}" class="nav-link">
|
||||
<a href="{{ route('rules.index') }}" class="nav-link {{ activeRoutePartial('rules') }}">
|
||||
<i class="fas fa-random nav-icon"></i>
|
||||
<p>{{ 'rules'|_ }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('recurring.index') }}" class="nav-link">
|
||||
<a href="{{ route('recurring.index') }}" class="nav-link {{ activeRoutePartial('recurring') }}">
|
||||
<i class="fas fa-magic nav-icon"></i>
|
||||
<p>{{ 'recurrences'|_ }}</p>
|
||||
</a>
|
||||
@@ -131,7 +131,6 @@
|
||||
</a>
|
||||
<ul class="nav nav-treeview">
|
||||
<li class="nav-item">
|
||||
<!-- dingflofbips "{{ activeRoutePartialObjectType('accounts', 'asset') }}" -->
|
||||
<a href="{{ route('accounts.index','asset') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'asset') }}">
|
||||
<i class="far fa-money-bill-alt nav-icon"></i>
|
||||
<p>{{ 'asset_accounts'|_ }}</p>
|
||||
@@ -158,7 +157,7 @@
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="nav-item has-treeview">
|
||||
<li class="nav-item has-treeview {{ menuOpenRoutePartial('tags') }} {{ menuOpenRoutePartial('categories') }} {{ menuOpenRoutePartial('object-groups') }}">
|
||||
<a href="#" class="nav-link">
|
||||
<i class="nav-icon fas fa-tags"></i>
|
||||
<p>
|
||||
@@ -168,19 +167,19 @@
|
||||
</a>
|
||||
<ul class="nav nav-treeview">
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('categories.index') }}" class="nav-link">
|
||||
<a href="{{ route('categories.index') }}" class="nav-link {{ activeRoutePartial('categories') }}">
|
||||
<i class="fas fa-bookmark nav-icon"></i>
|
||||
<p>{{ 'categories'|_ }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('tags.index') }}" class="nav-link">
|
||||
<a href="{{ route('tags.index') }}" class="nav-link {{ activeRoutePartial('tags') }}">
|
||||
<i class="fas fa-tags nav-icon"></i>
|
||||
<p>{{ 'tags'|_ }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('object-groups.index') }}" class="nav-link">
|
||||
<a href="{{ route('object-groups.index') }}" class="nav-link {{ activeRoutePartial('object-groups') }}">
|
||||
<i class="far fa-envelope nav-icon"></i>
|
||||
<p>{{ 'object_groups_menu_bar'|_ }}</p>
|
||||
</a>
|
||||
@@ -189,7 +188,7 @@
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('reports.index') }}" class="nav-link">
|
||||
<a href="{{ route('reports.index') }}" class="nav-link {{ activeRoutePartial('reports') }}">
|
||||
<i class="nav-icon far fa-chart-bar"></i>
|
||||
<p>
|
||||
{{ 'reports'|_ }}
|
||||
@@ -198,7 +197,7 @@
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('export.index') }}" class="nav-link">
|
||||
<a href="{{ route('export.index') }}" class="nav-link {{ activeRoutePartial('export') }}">
|
||||
<i class="nav-icon fas fa-upload"></i>
|
||||
<p>
|
||||
{{ 'export_data_menu'|_ }}
|
||||
@@ -206,7 +205,8 @@
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item has-treeview">
|
||||
{#
|
||||
<li class="nav-item has-treeview {{ menuOpenRoutePartial('currencies') }}">
|
||||
<a href="#" class="nav-link">
|
||||
<i class="nav-icon fas fa-sliders-h"></i>
|
||||
<p>
|
||||
@@ -232,11 +232,12 @@
|
||||
</li>
|
||||
-->
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('currencies.index') }}" class="nav-link">
|
||||
<a href="{{ route('currencies.index') }}" class="nav-link {{ activeRoutePartial('currencies') }}">
|
||||
<i class="fas fa-euro-sign nav-icon"></i>
|
||||
<p>{{ 'currencies'|_ }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<!--
|
||||
{% if hasRole('owner') %}
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('admin.index') }}" class="nav-link">
|
||||
@@ -245,9 +246,11 @@
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
-->
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
#}
|
||||
{#
|
||||
<li class="nav-item">
|
||||
<a href="{{ route('logout') }}" class="nav-link">
|
||||
<i class="nav-icon fas fa-sign-out-alt"></i>
|
||||
@@ -256,7 +259,7 @@
|
||||
</p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
#}
|
||||
</ul>
|
||||
</nav>
|
||||
<!-- /.sidebar-menu -->
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
19
resources/views/v2/preferences/index.twig
Normal file
19
resources/views/v2/preferences/index.twig
Normal file
@@ -0,0 +1,19 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
<!-- Main row -->
|
||||
<div id="no-page">Hello, I am empty page.</div>
|
||||
<!-- /.row (main row) -->
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
|
||||
{% endblock %}
|
||||
19
resources/views/v2/profile/index.twig
Normal file
19
resources/views/v2/profile/index.twig
Normal file
@@ -0,0 +1,19 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
<!-- Main row -->
|
||||
<div id="no-page">Hello, I am empty page.</div>
|
||||
<!-- /.row (main row) -->
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
|
||||
{% endblock %}
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<!-- Small boxes (Stat box) -->
|
||||
|
||||
|
||||
Reference in New Issue
Block a user