Improve pages to show intro texts.

This commit is contained in:
James Cole
2017-07-22 10:50:30 +02:00
parent f2d388f742
commit 5b69a697e4
13 changed files with 119 additions and 69 deletions

View File

@@ -33,6 +33,9 @@
<script src="js/lib/html5shiv.min.js"></script>
<script src="js/lib/respond.min.js"></script>
<![endif]-->
<script type="text/javascript">
var forceDemoOff = false;
</script>
{# favicons #}
{% include('partials.favicons') %}
@@ -185,7 +188,7 @@
<script type="text/javascript">
var routeForTour = "{{ current_route_name }}";
var routeStepsUri = "{{ route('json.intro', [current_route_name, what|default("")]) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name]) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, what|default("")]) }}";
</script>
<script type="text/javascript" src="lib/intro/intro.min.js"></script>
<script type="text/javascript" src="js/ff/intro/intro.js"></script>

View File

@@ -34,7 +34,7 @@
<td>
<a href="{{ route('piggy-banks.show', piggyBank.id) }}" title="{{ piggyBank.account.name }}">{{ piggyBank.name }}</a>
</td>
<td style="text-align: right;">
<td style="text-align: right;" class="piggySaved">
<span title="Saved so far" style="text-align:right;">{{ piggyBank.savedSoFar|formatAmount }}</span>
</td>
<td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">
@@ -44,7 +44,7 @@
{% endif %}
</td>
<td class="hidden-sm hidden-xs">
<td class="hidden-sm hidden-xs piggyBar">
<div class="progress progress" style="margin-bottom:0;">
<div
{% if piggyBank.percentage == 100 %}

View File

@@ -21,3 +21,6 @@
</div>
</div>
</div>
<script type="text/javascript">
forceDemoOff = true;
</script>

View File

@@ -28,7 +28,7 @@
<h3 class="box-title">{{ 'account_status'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover">
<table class="table table-hover" id="accountStatus">
<thead>
<tr>
<th>{{ 'account'|_ }}</th>

View File

@@ -9,7 +9,7 @@
<!-- options block -->
<div class="row no-print">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box">
<div class="box" id="optionsBox">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>

View File

@@ -88,7 +88,7 @@
</div>
{% endif %}
<div class="col-lg-4 col-md-6">
<div class="box">
<div class="box" id="pieCharts">
<div class="box-header with-border">
<h3 class="box-title">{{ 'expense_per_account'|_ }}</h3>
</div>
@@ -107,7 +107,7 @@
<div class="row">
<div class="col-lg-12">
<div class="box">
<div class="box" id="incomeAndExpensesChart">
<div class="box-header with-border">
<h3 class="box-title">{{ 'income_and_expenses'|_ }}</h3>
</div>

View File

@@ -114,7 +114,7 @@
</div>
</div>
{% endif %}
<div class="col-lg-2 col-md-3">
<div class="col-lg-2 col-md-3" id="pieCharts">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'income_per_account'|_ }}</h3>
@@ -146,7 +146,7 @@
<div class="row">
<div class="col-lg-12">
<div class="box">
<div class="box" id="incomeAndExpensesChart">
<div class="box-header with-border">
<h3 class="box-title">{{ 'income_and_expenses'|_ }}</h3>
</div>

View File

@@ -35,8 +35,8 @@
<div class="form-group">
<label for="inputAccounts" class="col-sm-3 control-label">{{ 'report_included_accounts'|_ }}</label>
<div class="col-sm-9">
<select id="inputAccounts" name="accounts[]" multiple="multiple" class="form-control">
<div class="col-sm-9" id="inputAccountsSelect">
<select id="inputAccounts" name="accounts[]" multiple class="form-control">
{% for account in accounts %}
<option
value="{{ account.id }}"

View File

@@ -47,7 +47,7 @@
</div>
</div>
<div class="col-lg-2 col-md-3">
<div class="box">
<div class="box" id="pieCharts">
<div class="box-header with-border">
<h3 class="box-title">{{ 'income_per_tag'|_ }}</h3>
</div>
@@ -168,7 +168,7 @@
<div class="row">
<div class="col-lg-12">
<div class="box">
<div class="box" id="incomeAndExpensesChart">
<div class="box-header with-border">
<h3 class="box-title">{{ 'income_and_expenses'|_ }}</h3>
</div>