gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to old tour but include code for new tour.

Browse Source
This commit is contained in:
James Cole
2017-07-15 21:40:42 +02:00
parent accbdea942
commit 8a38ce1964
18 changed files with 139 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
resources/lang/en_US/firefly.php
View File

@@ -427,12 +427,6 @@ return [
'attachment_updated' => 'Updated attachment ":name"',
'upload_max_file_size' => 'Maximum file size: :size',
// tour:
'prev' => 'Prev',
'next' => 'Next',
'end-tour' => 'End tour',
'pause' => 'Pause',
// transaction index
'title_expenses' => 'Expenses',
'title_withdrawal' => 'Expenses',
@@ -500,15 +494,6 @@ return [
'make_default_currency' => 'make default',
'default_currency' => 'default',
// new user:
'submit' => 'Submit',
'getting_started' => 'Getting started',
'to_get_started' => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
'savings_balance_text' => 'If you have a savings account, please enter the current balance of your savings account:',
'cc_balance_text' => 'If you have a credit card, please enter your credit card\'s limit.',
'stored_new_account_new_user' => 'Yay! Your new account has been stored.',
'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
// forms:
'mandatoryFields' => 'Mandatory fields',
'optionalFields' => 'Optional fields',
@@ -644,6 +629,12 @@ return [
// new user:
'welcome' => 'Welcome to Firefly!',
'submit' => 'Submit',
'getting_started' => 'Getting started',
'to_get_started' => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
'savings_balance_text' => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
'finish_up_new_user' => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
// home page:
'yourAccounts' => 'Your accounts',

22
resources/views/index.twig
View File

@@ -4,10 +4,6 @@
{{ Breadcrumbs.renderIfExists }}
{% endblock %}
{% block content %}
{% include 'partials.boxes' %}
<div class="row">
@@ -31,7 +27,7 @@
<canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
</div>
<!-- CATEGORIES -->
{# CATEGORIES #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'categories'|_ }}</h3>
@@ -44,7 +40,7 @@
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
{% if billCount > 0 %}
<!-- BILLS -->
{# BILLS #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'bills'|_ }}</h3>
@@ -59,13 +55,12 @@
</div>
{% endif %}
<!-- TRANSACTIONS -->
{# 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>
<!-- ACTIONS MENU -->
<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>
@@ -107,7 +102,7 @@
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<!-- EXPENSE ACCOUNTS -->
{# EXPENSE ACCOUNTS #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'expense_accounts'|_ }}</h3>
@@ -117,7 +112,7 @@
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
</div>
<!-- OPTIONAL REVENUE ACCOUNTS -->
{# OPTIONAL REVENUE ACCOUNTS #}
{% if showDepositsFrontpage %}
<div class="box">
<div class="box-header with-border">
@@ -134,14 +129,7 @@
{% endblock %}
{% block scripts %}
<!-- show tour? -->
<script type="text/javascript">
var showTour;
{% if showTour %}
showTour = true;
{% else %}
showTour = false;
{% endif %}
var billCount = {{ billCount }};
// uri's of charts:

15
resources/views/json/tour.twig
View File

@@ -1,15 +0,0 @@
<div class="popover" role="tooltip">
<div class="arrow"></div>
<h3 class="popover-title"></h3>
<div class="popover-content"></div>
<div class="popover-navigation">
<div class="btn-group">
<button class="btn btn-sm btn-default" data-role="prev">&laquo; {{ 'prev'|_ }}</button>
<button class="btn btn-sm btn-default" data-role="next">{{ 'next'|_ }} &raquo;</button>
<button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="{{ 'pause'|_ }}"
data-resume-text="Resume"> {{ 'pause'|_ }}</button>
</div>
<button class="btn btn-sm btn-default" data-role="end">{{ 'end-tour'|_ }}</button>
</div>
</div>

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

@@ -24,7 +24,9 @@
<link href="lib/adminlte/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css"/>
<link href="css/daterangepicker.css" rel="stylesheet" type="text/css"/>
<link href="css/firefly.css" rel="stylesheet" type="text/css"/>
<link href="css/bootstrap-tour.min.css" rel="stylesheet" type="text/css"/>
{% if not shownDemo %}
<link href="lib/intro/introjs.min.css" rel="stylesheet" type="text/css"/>
{% endif %}
{% block styles %}{% endblock %}
<!--[if lt IE 9]>
@@ -60,8 +62,8 @@
<ul class="nav navbar-nav">
<li class="hidden-sm hidden-xs">
<a href="#" id="help" data-route="{{ Route.getCurrentRoute.getName }}">
<i class="fa fa-question-circle" data-route="{{ Route.getCurrentRoute.getName }}"></i>
<a href="#" id="help" data-route="{{ current_route_name }}">
<i class="fa fa-question-circle" data-route="{{ current_route_name }}"></i>
</a>
</li>
@@ -176,10 +178,16 @@
<script src="js/lib/daterangepicker.js" type="text/javascript"></script>
<script src="lib/adminlte/js/app.min.js" type="text/javascript"></script>
<script type="text/javascript" src="js/lib/accounting.min.js"></script>
<script src="js/lib/bootstrap-tour.min.js" type="text/javascript"></script>
<script src="{{ route('javascript.variables') }}?ext=.js" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/firefly.js"></script>
<script type="text/javascript" src="js/ff/help.js"></script>
{% if not shownDemo %}
<script type="text/javascript">
var route_for_tour = "{{ 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>
{% endif %}
{% block scripts %}{% endblock %}
{% if env('ANALYTICS_ID','') != '' %}
@@ -188,10 +196,10 @@
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)

12
resources/views/new-user/index.twig
View File

@@ -10,13 +10,16 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="row">
<div class="col-lg-6 col-sm-8 col-xs-12">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-xs-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'getting_started'|_ }}</h3>
</div>
<div class="box-body">
<p>
<strong>{{ 'welcome'|_ }}</strong>
</p>
<p>
{{ 'to_get_started'|_ }}
</p>
@@ -28,15 +31,12 @@
{{ 'savings_balance_text'|_ }}
</p>
{{ ExpandedForm.balance('savings_balance') }}
{{ ExpandedForm.balance('savings_balance',0) }}
<p>
{{ 'cc_balance_text'|_ }}
{{ 'finish_up_new_user'|_ }}
</p>
{{ ExpandedForm.balance('credit_card_limit') }}
</div>
<div class="box-footer">
<input type="submit" name="submit" value="{{ 'submit'|_ }}" class="btn btn-success pull-right"/>