kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-06 01:45:22 +00:00
Code Issues Projects Releases Wiki Activity

Built a new routine for intro tours.

Browse Source
This commit is contained in:
James Cole
2017-07-16 07:35:08 +02:00
parent 09131e8c36
commit 58bfb35fa6
9 changed files with 185 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
resources/views/index.twig
View File

@@ -56,48 +56,50 @@
{% endif %}
{# TRANSACTIONS #}
{% for data in transactions %}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.show', data[1].id) }}">{{ data[1].name }}</a></h3>
<div id="all_transactions">
{% for data in transactions %}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.show', data[1].id) }}">{{ data[1].name }}</a></h3>
<div class="box-tools pull-right">
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('transactions.create','withdrawal') }}?account_id={{ data[1].id }}"><i
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
<li><a href="{{ route('transactions.create','deposit') }}?account_id={{ data[1].id }}"><i
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
<li><a href="{{ route('transactions.create','transfer') }}?account_from_id={{ data[1].id }}"><i
class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}</a></li>
</ul>
<div class="box-tools pull-right">
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('transactions.create','withdrawal') }}?account_id={{ data[1].id }}"><i
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
<li><a href="{{ route('transactions.create','deposit') }}?account_id={{ data[1].id }}"><i
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
<li><a href="{{ route('transactions.create','transfer') }}?account_from_id={{ data[1].id }}"><i
class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}</a></li>
</ul>
</div>
</div>
</div>
{% if data[0].count > 0 %}
<div class="box-body no-padding">
{% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
</div>
{% else %}
<div class="box-body">
<p>
<em>
{{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
</em>
</p>
</div>
{% endif %}
<div class="box-footer clearfix">
<a class="btn btn-sm btn-default btn-flat pull-right"
href="{{ route('accounts.show',data[1].id) }}">{{ (data[1]|balance)|formatAmountPlain }}</a>
</div>
</div>
{% if data[0].count > 0 %}
<div class="box-body no-padding">
{% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
</div>
{% else %}
<div class="box-body">
<p>
<em>
{{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
</em>
</p>
</div>
{% endif %}
<div class="box-footer clearfix">
<a class="btn btn-sm btn-default btn-flat pull-right"
href="{{ route('accounts.show',data[1].id) }}">{{ (data[1]|balance)|formatAmountPlain }}</a>
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
<div class="row">
@@ -131,8 +133,6 @@
{% block scripts %}
<script type="text/javascript">
var billCount = {{ billCount }};
// uri's of charts:
var accountFrontpageUri = '{{ route('chart.account.frontpage') }}';
var accountRevenueUri = '{{ route('chart.account.revenue') }}';
var accountExpenseUri = '{{ route('chart.account.expense') }}';

4
resources/views/layout/default.twig
View File

@@ -183,7 +183,9 @@
<script type="text/javascript" src="js/ff/help.js"></script>
{% if not shownDemo %}
<script type="text/javascript">
var route_for_tour = "{{ current_route_name }}";
var routeForTour = "{{ current_route_name }}";
var routeStepsUri = "{{ route('json.intro', [current_route_name]) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name]) }}";
</script>
<script type="text/javascript" src="lib/intro/intro.min.js"></script>
<script type="text/javascript" src="js/ff/intro/intro.js"></script>

2
resources/views/partials/boxes.twig
View File

@@ -8,7 +8,7 @@
<!-- Info boxes -->
<div class="row hidden-sm hidden-xs">
<div class="{{ boxClasses }}">
<div class="{{ boxClasses }}" id="box_out_holder">
<div class="info-box">
<span class="info-box-icon bg-red">
<i class="fa fa-upload fa-fw"></i>