kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Replace icons.

Browse Source
This commit is contained in:
James Cole
2021-06-11 19:50:05 +02:00
parent 460161d9a5
commit e9f2d6b5ea
93 changed files with 547 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/ff/accounts/reconcile.js vendored
View File

@@ -196,7 +196,7 @@ function calculateBalanceDifference() {
function getTransactionsForRange() { function getTransactionsForRange() {
console.log('in getTransactionsForRange()'); console.log('in getTransactionsForRange()');
// clear out the box: // clear out the box:
$('#transactions_holder').empty().append($('<p>').addClass('text-center').html('<i class="fa fa-fw fa-spin fa-spinner"></i>')); $('#transactions_holder').empty().append($('<p>').addClass('text-center').html('<span class="fa fa-fw fa-spin fa-spinner"></span>'));
var uri = transactionsUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val()); var uri = transactionsUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());
var index = indexUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val()); var index = indexUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());
window.history.pushState('object or string', "Reconcile account", index); window.history.pushState('object or string', "Reconcile account", index);

2
public/v1/js/ff/help.js vendored
View File

@@ -33,7 +33,7 @@ function showHelp(e) {
if (typeof specialPage === 'undefined') { if (typeof specialPage === 'undefined') {
specialPage = ''; specialPage = '';
} }
$('#helpBody').html('<i class="fa fa-refresh fa-spin"></i>'); $('#helpBody').html('<span class="fa fa-refresh fa-spin"></span>');
$('#helpModal').modal('show'); $('#helpModal').modal('show');
$('#helpTitle').html(helpPageTitle); $('#helpTitle').html(helpPageTitle);
$.getJSON('help/' + encodeURI(route)).done(function (data) { $.getJSON('help/' + encodeURI(route)).done(function (data) {

28
public/v1/js/ff/install/index.js vendored
View File

@@ -28,7 +28,7 @@ $(function () {
function startRunningCommands() { function startRunningCommands() {
if (0 === index) { if (0 === index) {
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Running first command...'); $('#status-box').html('<span class="fa fa-spin fa-spinner"></span> Running first command...');
} }
runCommand(index); runCommand(index);
} }
@@ -41,7 +41,7 @@ function runCommand(index) {
if(data.hasNextCommand) { if(data.hasNextCommand) {
// inform user // inform user
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Just executed ' + data.previous + '...'); $('#status-box').html('<span class="fa fa-spin fa-spinner"></span> Just executed ' + data.previous + '...');
console.log('Will call next command.'); console.log('Will call next command.');
runCommand(index); runCommand(index);
} else { } else {
@@ -54,7 +54,7 @@ function runCommand(index) {
} }
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> Command failed! See log files :('); $('#status-box').html('<span class="fa fa-warning"></span> Command failed! See log files :(');
}); });
} }
@@ -69,12 +69,12 @@ function startMigration() {
} }
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> Migration failed! See log files :('); $('#status-box').html('<span class="fa fa-warning"></span> Migration failed! See log files :(');
}); });
} }
function startDecryption() { function startDecryption() {
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Setting up DB #2...'); $('#status-box').html('<span class="fa fa-spin fa-spinner"></span> Setting up DB #2...');
$.post(decryptUri, {_token: token}).done(function (data) { $.post(decryptUri, {_token: token}).done(function (data) {
if (data.error === false) { if (data.error === false) {
// move to decrypt routine. // move to decrypt routine.
@@ -84,7 +84,7 @@ function startDecryption() {
} }
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> Migration failed! See log files :('); $('#status-box').html('<span class="fa fa-warning"></span> Migration failed! See log files :(');
}); });
} }
@@ -92,7 +92,7 @@ function startDecryption() {
* *
*/ */
function startPassport() { function startPassport() {
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Setting up OAuth2...'); $('#status-box').html('<span class="fa fa-spin fa-spinner"></span> Setting up OAuth2...');
$.post(keysUri, {_token: token}).done(function (data) { $.post(keysUri, {_token: token}).done(function (data) {
if (data.error === false) { if (data.error === false) {
startUpgrade(); startUpgrade();
@@ -101,7 +101,7 @@ function startPassport() {
} }
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> OAuth2 failed! See log files :('); $('#status-box').html('<span class="fa fa-warning"></span> OAuth2 failed! See log files :(');
}); });
} }
@@ -109,7 +109,7 @@ function startPassport() {
* *
*/ */
function startUpgrade() { function startUpgrade() {
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Upgrading database...'); $('#status-box').html('<span class="fa fa-spin fa-spinner"></span> Upgrading database...');
$.post(upgradeUri, {_token: token}).done(function (data) { $.post(upgradeUri, {_token: token}).done(function (data) {
if (data.error === false) { if (data.error === false) {
startVerify(); startVerify();
@@ -117,7 +117,7 @@ function startUpgrade() {
displaySoftFail(data.message); displaySoftFail(data.message);
} }
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> Upgrade failed! See log files :('); $('#status-box').html('<span class="fa fa-warning"></span> Upgrade failed! See log files :(');
}); });
} }
@@ -125,7 +125,7 @@ function startUpgrade() {
* *
*/ */
function startVerify() { function startVerify() {
$('#status-box').html('<i class="fa fa-spin fa-spinner"></i> Verify database integrity...'); $('#status-box').html('<span class="fa fa-spin fa-spinner"></span> Verify database integrity...');
$.post(verifyUri, {_token: token}).done(function (data) { $.post(verifyUri, {_token: token}).done(function (data) {
if (data.error === false) { if (data.error === false) {
completeDone(); completeDone();
@@ -133,7 +133,7 @@ function startVerify() {
displaySoftFail(data.message); displaySoftFail(data.message);
} }
}).fail(function () { }).fail(function () {
$('#status-box').html('<i class="fa fa-warning"></i> Verification failed! See log files :('); $('#status-box').html('<span class="fa fa-warning"></span> Verification failed! See log files :(');
}); });
} }
@@ -141,14 +141,14 @@ function startVerify() {
* *
*/ */
function completeDone() { function completeDone() {
$('#status-box').html('<i class="fa fa-thumbs-up"></i> Installation + upgrade complete! Wait to be redirected...'); $('#status-box').html('<span class="fa fa-thumbs-up"></span> Installation + upgrade complete! Wait to be redirected...');
setTimeout(function () { setTimeout(function () {
window.location = homeUri; window.location = homeUri;
}, 3000); }, 3000);
} }
function displaySoftFail(message) { function displaySoftFail(message) {
$('#status-box').html('<i class="fa fa-warning"></i> ' + message + '<br /><br />Please read the ' + $('#status-box').html('<span class="fa fa-warning"></span> ' + message + '<br /><br />Please read the ' +
'<a href="https://docs.firefly-iii.org/">' + '<a href="https://docs.firefly-iii.org/">' +
'documentation</a> about this, and upgrade by hand.'); 'documentation</a> about this, and upgrade by hand.');
} }

4
public/v1/js/ff/rules/create-edit.js vendored
View File

@@ -418,7 +418,7 @@ function testRuleTriggers() {
var button = $('.test_rule_triggers'); var button = $('.test_rule_triggers');
// replace with spinner. fa-spin fa-spinner // replace with spinner. fa-spin fa-spinner
button.html('<i class="fa fa-spin fa-spinner"></i> ' + testRuleTriggersText); button.html('<span class="fa fa-spin fa-spinner"></span> ' + testRuleTriggersText);
button.attr('disabled', 'disabled'); button.attr('disabled', 'disabled');
// Serialize all trigger data // Serialize all trigger data
@@ -442,7 +442,7 @@ function testRuleTriggers() {
modal.find(".transaction-warning").hide(); modal.find(".transaction-warning").hide();
} }
button.removeAttr('disabled'); button.removeAttr('disabled');
button.html('<i class="fa fa-flask"></i> ' + testRuleTriggersText); button.html('<span class="fa fa-flask"></span> ' + testRuleTriggersText);
// Show the modal dialog // Show the modal dialog
modal.modal(); modal.modal();
}).fail(function () { }).fail(function () {

2
public/v1/js/ff/rules/index.js vendored
View File

@@ -115,7 +115,7 @@ function testRuleTriggers(e) {
var ruleId = parseInt(obj.data('id')); var ruleId = parseInt(obj.data('id'));
var icon = obj; var icon = obj;
if (obj.prop("tagName") === 'A') { if (obj.prop("tagName") === 'A') {
icon = $('i', obj); icon = $('span', obj);
} }
// change icon: // change icon:
icon.addClass('fa-spinner fa-spin').removeClass('fa-flask'); icon.addClass('fa-spinner fa-spin').removeClass('fa-flask');

2
resources/views/errors/404.twig
View File

@@ -21,7 +21,7 @@
<h2 class="headline text-info">404</h2> <h2 class="headline text-info">404</h2>
<div class="error-content"> <div class="error-content">
<h3><i class="fas fa-question-circle text-info"></i> 404 - Page not found</h3> <h3><span class="fas fa-question-circle text-info"></span> 404 - Page not found</h3>
<p> <p>
{{ trans('errors.404_header') }} {{ trans('errors.404_header') }}
</p> </p>

2
resources/views/errors/500.twig
View File

@@ -21,7 +21,7 @@
<h2 class="headline text-danger">500</h2> <h2 class="headline text-danger">500</h2>
<div class="error-content"> <div class="error-content">
<h3><i class="fas fa-exclamation-triangle text-danger"></i> {{ trans('errors.error_occurred') }}</h3> <h3><span class="fas fa-exclamation-triangle text-danger"></span> {{ trans('errors.error_occurred') }}</h3>
<p> <p>
{{ trans('errors.error_not_recoverable') }} {{ trans('errors.error_not_recoverable') }}

4
resources/views/errors/503.twig
View File

@@ -21,13 +21,13 @@
<h2 class="headline text-info">503</h2> <h2 class="headline text-info">503</h2>
<div class="error-content"> <div class="error-content">
<h3><i class="fas fa-wrench text-info"></i> {{ trans('errors.maintenance_mode') }}</h3> <h3><span class="fas fa-wrench text-info"></span> {{ trans('errors.maintenance_mode') }}</h3>
<p> <p>
{{ trans('errors.check_back') }} {{ trans('errors.check_back') }}
</p> </p>
{% if 'demo.firefly-iii.org' == Request.getHost() %} {% if 'demo.firefly-iii.org' == Request.getHost() %}
<p> <p>
<i class="fas fa-recycle"></i> The Firefly III demo website resets every <strong>four hours</strong>. <span class="fas fa-recycle"></span> The Firefly III demo website resets every <strong>four hours</strong>.
Please wait for this process to finish. It should take less than a minute. Please wait for this process to finish. It should take less than a minute.
</p> </p>
{% endif %} {% endif %}

2
resources/views/errors/FireflyException.twig
View File

@@ -21,7 +21,7 @@
<h2 class="headline text-danger">500</h2> <h2 class="headline text-danger">500</h2>
<div class="error-content"> <div class="error-content">
<h3><i class="fas fa-exclamation-triangle text-danger"></i> {{ trans('errors.error_occurred') }}</h3> <h3><span class="fas fa-exclamation-triangle text-danger"></span> {{ trans('errors.error_occurred') }}</h3>
<p> <p>
{{ trans('errors.error_not_recoverable') }} {{ trans('errors.error_not_recoverable') }}

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

@@ -15,10 +15,10 @@
</h3> </h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('accounts.create', objectType) }}"><i <li><a href="{{ route('accounts.create', objectType) }}"><span
class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }} class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}
</a></li> </a></li>
</ul> </ul>
</div> </div>
@@ -29,15 +29,15 @@
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a> <a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
</div> </div>
{% include 'v1.list.accounts' %} {% include 'v1.list.accounts' %}
</div> </div>
<div class="box-footer"> <div class="box-footer">
<p> <p>
<a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><i <a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><span
class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a> class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
</p> </p>
{% if inactiveCount > 0 %} {% if inactiveCount > 0 %}
<p><small> <p><small>

6
resources/views/v1/accounts/reconcile/index.twig
View File

@@ -39,7 +39,7 @@
<td> <td>
<div class="input-group"> <div class="input-group">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
</div> </div>
<input type="date" value="{{ start.format('Y-m-d') }}" name="start_date" class="form-control"> <input type="date" value="{{ start.format('Y-m-d') }}" name="start_date" class="form-control">
</div> </div>
@@ -53,7 +53,7 @@
<td> <td>
<div class="input-group"> <div class="input-group">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
</div> </div>
<input type="date" value="{{ end.format('Y-m-d') }}" name="end_date" class="form-control"> <input type="date" value="{{ end.format('Y-m-d') }}" name="end_date" class="form-control">
</div> </div>
@@ -98,7 +98,7 @@
<p class="lead" id="difference"></p> <p class="lead" id="difference"></p>
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default store_reconcile" disabled><i class="fa fa-fw fa-check"></i> {{ 'store_reconcile'|_ }}</button> <button class="btn btn-default store_reconcile" disabled><span class="fa fa-fw fa-check"></span> {{ 'store_reconcile'|_ }}</button>
</div> </div>
</div> </div>
</div> </div>

16
resources/views/v1/accounts/reconcile/show.twig
View File

@@ -13,11 +13,11 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i> <button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span>
</button> </button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('transactions.edit',journal.id) }}"><span class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete',journal.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('transactions.delete',journal.id) }}"><span class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -52,8 +52,8 @@
<div class="box-footer"> <div class="box-footer">
<div class="pull-right"> <div class="pull-right">
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a> <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><span class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a>
<a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }} <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><span class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}
</a> </a>
</div> </div>
</div> </div>
@@ -83,13 +83,13 @@
<h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show',tag) }}"> <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show',tag) }}">
{% if tag.tagMode == 'nothing' %} {% if tag.tagMode == 'nothing' %}
<i class="fa fa-fw fa-tag"></i> <span class="fa fa-fw fa-tag"></span>
{% endif %} {% endif %}
{% if tag.tagMode == 'balancingAct' %} {% if tag.tagMode == 'balancingAct' %}
<i class="fa fa-fw fa-refresh"></i> <span class="fa fa-fw fa-refresh"></span>
{% endif %} {% endif %}
{% if tag.tagMode == 'advancePayment' %} {% if tag.tagMode == 'advancePayment' %}
<i class="fa fa-fw fa-sort-numeric-desc"></i> <span class="fa fa-fw fa-sort-numeric-desc"></span>
{% endif %} {% endif %}
{{ tag.tag }}</a> {{ tag.tag }}</a>
</h4> </h4>

24
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-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i></th> <th class="hidden-xs"><span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></span></th>
<th class="hidden-xs"><i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i></th> <th class="hidden-xs"><span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></span></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -61,8 +61,8 @@
<tr data-date="{{ journal.date.format('Y-m-d') }}" data-id="{{ journal.transaction_journal_id }}"> <tr data-date="{{ journal.date.format('Y-m-d') }}" data-id="{{ journal.transaction_journal_id }}">
<td class="hidden-xs"> <td class="hidden-xs">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('transactions.edit', [journal.transaction_group_id]) }}" class="btn btn-xs btn-default"><i <a href="{{ route('transactions.edit', [journal.transaction_group_id]) }}" class="btn btn-xs btn-default"><span
class="fa fa-fw fa-pencil"></i></a> class="fa fa-fw fa-pencil"></span></a>
</div> </div>
</td> </td>
@@ -70,22 +70,22 @@
<!-- icon --> <!-- icon -->
<td class="hidden-xs"> <td class="hidden-xs">
{% if journal.transaction_type_type == 'Withdrawal' %} {% if journal.transaction_type_type == 'Withdrawal' %}
<i class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></i> <span class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Deposit' %} {% if journal.transaction_type_type == 'Deposit' %}
<i class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Transfer' %} {% if journal.transaction_type_type == 'Transfer' %}
<i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %} {% if journal.transaction_type_type == 'Reconciliation' %}
<i class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></i> <span class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Opening balance' %} {% if journal.transaction_type_type == 'Opening balance' %}
<i class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></i> <span class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></span>
{% endif %} {% endif %}
</td> </td>
@@ -93,7 +93,7 @@
<td> <td>
<a href="{{ route('transactions.show', [journal.transaction_group_id]) }}" title="{{ journal.description }}"> <a href="{{ route('transactions.show', [journal.transaction_group_id]) }}" title="{{ journal.description }}">
{% if journal.group_title %} {% if journal.group_title %}
<span class="text-muted"><i class="fa fa-fw fa-share-alt" aria-hidden="true"></i></span> {{ journal.group_title }}: <span class="text-muted"><span class="fa fa-fw fa-share-alt" aria-hidden="true"></span></span> {{ journal.group_title }}:
{% endif %} {% endif %}
{{ journal.description }}</a> {{ journal.description }}</a>
</td> </td>
@@ -110,7 +110,7 @@
<td> <td>
{% if journal.date >= start and journal.date <= end %} {% if journal.date >= start and journal.date <= end %}
{% if journal.reconciled %} {% if journal.reconciled %}
<i class="fa fa-check" aria-hidden="true"></i> <span class="fa fa-check" aria-hidden="true"></span>
<input type="hidden" name="cleared[]" data-younger="{% if journal.date < start %}true{% else %}false{% endif %}" <input type="hidden" name="cleared[]" data-younger="{% if journal.date < start %}true{% else %}false{% endif %}"
data-inrange="{% if journal.date >= start and journal.date <= end %}true{% else %}false"{% endif %}" data-inrange="{% if journal.date >= start and journal.date <= end %}true{% else %}false"{% endif %}"
class="cleared" data-id="{{ journal.transaction_journal_id }}" value="{{ journal.amount }}"> class="cleared" data-id="{{ journal.transaction_journal_id }}" value="{{ journal.amount }}">
@@ -123,7 +123,7 @@
{% else %} {% else %}
<!-- if not in range, just show reconciliation status --> <!-- if not in range, just show reconciliation status -->
{% if journal.reconciled %} {% if journal.reconciled %}
<i class="fa fa-check" aria-hidden="true"></i> <span class="fa fa-check" aria-hidden="true"></span>
{% else %} {% else %}
<!-- TODO include icon --> <!-- TODO include icon -->
{% endif %} {% endif %}

8
resources/views/v1/accounts/show.twig
View File

@@ -17,10 +17,10 @@
</h3> </h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('accounts.edit', account.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('accounts.edit', account.id) }}"><span class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('accounts.delete', account.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('accounts.delete', account.id) }}"><span class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -144,7 +144,7 @@
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
{% if periods|length > 0 %} {% if periods|length > 0 %}
<a href="{{ route('accounts.show.all', [account.id]) }}"> <a href="{{ route('accounts.show.all', [account.id]) }}">
{{ 'show_all_no_filter'|_ }} {{ 'show_all_no_filter'|_ }}

2
resources/views/v1/admin/index.twig
View File

@@ -46,7 +46,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn btn-success"> <button type="submit" class="btn btn-success">
<i class="fa fa-envelope"></i> {{ ('send_message')|_ }} <span class="fa fa-envelope"></span> {{ ('send_message')|_ }}
</button> </button>
</div> </div>
</form> </form>

8
resources/views/v1/admin/link/index.twig
View File

@@ -27,10 +27,10 @@
<td> <td>
{% if linkType.editable %} {% if linkType.editable %}
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a class="btn btn-default btn-xs" href="{{ route('admin.links.edit',linkType.id) }}"><i <a class="btn btn-default btn-xs" href="{{ route('admin.links.edit',linkType.id) }}"><span
class="fa fa-fw fa-pencil"></i></a> class="fa fa-fw fa-pencil"></span></a>
<a class="btn btn-danger btn-xs" href="{{ route('admin.links.delete',linkType.id) }}"><i <a class="btn btn-danger btn-xs" href="{{ route('admin.links.delete',linkType.id) }}"><span
class="fa fa-fw fa-trash-o"></i></a> class="fa fa-fw fa-trash-o"></span></a>
</div> </div>
{% endif %} {% endif %}
</td> </td>

6
resources/views/v1/admin/link/show.twig
View File

@@ -27,9 +27,9 @@
<tr> <tr>
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a> <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><span class="fa fa-trash"></span></a>
<a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><i <a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><span
class="fa fa-fw fa-arrows-h"></i></a> class="fa fa-fw fa-arrows-h"></span></a>
</div> </div>
</td> </td>
<td data-value="{{ link.source.description }}"> <td data-value="{{ link.source.description }}">

16
resources/views/v1/admin/users/index.twig
View File

@@ -29,8 +29,8 @@
<tr> <tr>
<td class="hidden-xs" data-value="{{ user.id }}"> <td class="hidden-xs" data-value="{{ user.id }}">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a class="btn btn-default" href="{{ route('admin.users.edit',user.id) }}"><i class="fa fa-pencil"></i></a> <a class="btn btn-default" href="{{ route('admin.users.edit',user.id) }}"><span class="fa fa-pencil"></span></a>
<a class="btn btn-danger" href="{{ route('admin.users.delete',user.id) }}"><i class="fa fa-trash"></i></a> <a class="btn btn-danger" href="{{ route('admin.users.delete',user.id) }}"><span class="fa fa-trash"></span></a>
</div> </div>
</td> </td>
<td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td> <td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td>
@@ -46,23 +46,23 @@
</td> </td>
<td class="hidden-xs" data-value="{% if user.isAdmin %}1{% else %}0{% endif %}"> <td class="hidden-xs" data-value="{% if user.isAdmin %}1{% else %}0{% endif %}">
{% if user.isAdmin %} {% if user.isAdmin %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small> <small class="text-success"><span class="fa fa-fw fa-check"></span></small>
{% else %} {% else %}
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small> <small class="text-danger"><span class="fa fa-fw fa-times"></span></small>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-xs" data-value="{% if user.has2FA %}1{% else %}0{% endif %}"> <td class="hidden-xs" data-value="{% if user.has2FA %}1{% else %}0{% endif %}">
{% if user.has2FA %} {% if user.has2FA %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small> <small class="text-success"><span class="fa fa-fw fa-check"></span></small>
{% else %} {% else %}
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small> <small class="text-danger"><span class="fa fa-fw fa-times"></span></small>
{% endif %} {% endif %}
</td> </td>
<td data-value="{% if user.blocked %}1{% else %}0{% endif %}"> <td data-value="{% if user.blocked %}1{% else %}0{% endif %}">
{% if user.blocked == 1 %} {% if user.blocked == 1 %}
<small class="text-danger"><i class="fa fa-fw fa-check" title="{{ 'yes'|_ }}"></i></small> <small class="text-danger"><span class="fa fa-fw fa-check" title="{{ 'yes'|_ }}"></span></small>
{% else %} {% else %}
<small class="text-success"><i class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></i></small> <small class="text-success"><span class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></span></small>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-xs"> <td class="hidden-xs">

12
resources/views/v1/admin/users/show.twig
View File

@@ -32,9 +32,9 @@
<td>{{ trans('list.is_admin') }}</td> <td>{{ trans('list.is_admin') }}</td>
<td> <td>
{% if information.is_admin %} {% if information.is_admin %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small> {{ 'yes'|_ }} <small class="text-success"><span class="fa fa-fw fa-check"></span></small> {{ 'yes'|_ }}
{% else %} {% else %}
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small> {{ 'no'|_ }} <small class="text-danger"><span class="fa fa-fw fa-times"></span></small> {{ 'no'|_ }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@@ -42,9 +42,9 @@
<td>{{ trans('list.has_two_factor') }}</td> <td>{{ trans('list.has_two_factor') }}</td>
<td> <td>
{% if information.has_2fa %} {% if information.has_2fa %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small> {{ 'yes'|_ }} <small class="text-success"><span class="fa fa-fw fa-check"></span></small> {{ 'yes'|_ }}
{% else %} {% else %}
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small> {{ 'no'|_ }} <small class="text-danger"><span class="fa fa-fw fa-times"></span></small> {{ 'no'|_ }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@@ -52,7 +52,7 @@
<td>{{ trans('list.is_blocked') }}</td> <td>{{ trans('list.is_blocked') }}</td>
<td> <td>
{% if information.blocked %} {% if information.blocked %}
<small class="text-danger"><i class="fa fa-fw fa-check" title="{{ 'yes'|_ }}"></i></small> {{ 'yes'|_ }}: <small class="text-danger"><span class="fa fa-fw fa-check" title="{{ 'yes'|_ }}"></span></small> {{ 'yes'|_ }}:
{% if information.blocked_code == "" %} {% if information.blocked_code == "" %}
<em>~</em> <em>~</em>
@@ -61,7 +61,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<small class="text-success"><i class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></i></small> {{ 'no'|_ }} <small class="text-success"><span class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></span></small> {{ 'no'|_ }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

10
resources/views/v1/attachments/index.twig
View File

@@ -30,9 +30,9 @@
<tr> <tr>
<td data-value="{{ att.id }}"> <td data-value="{{ att.id }}">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('attachments.edit', att.id) }}" class="btn btn-default"><i class="fa fa-pencil"></i></a> <a href="{{ route('attachments.edit', att.id) }}" class="btn btn-default"><span class="fa fa-pencil"></span></a>
<a href="{{ route('attachments.delete', att.id) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a> <a href="{{ route('attachments.delete', att.id) }}" class="btn btn-danger"><span class="fa fa-trash"></span></a>
<a href="{{ route('attachments.download', att.id) }}" class="btn btn-default"><i class="fa fa-download"></i></a> <a href="{{ route('attachments.download', att.id) }}" class="btn btn-default"><span class="fa fa-download"></span></a>
</div> </div>
</td> </td>
<td data-value="{{ att.filename }}"> <td data-value="{{ att.filename }}">
@@ -53,9 +53,9 @@
</td> </td>
<td data-value="{% if att.file_exists %}1{% else %}0{% endif %}"> <td data-value="{% if att.file_exists %}1{% else %}0{% endif %}">
{% if att.file_exists %} {% if att.file_exists %}
<i class="fa fa-check text-success"></i> <span class="fa fa-check text-success"></span>
{% else %} {% else %}
<i class="fa fa-warning text-danger"></i> <span class="fa fa-warning text-danger"></span>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
resources/views/v1/auth/register.twig
View File

@@ -31,7 +31,7 @@
<div class="col-xs-8"> <div class="col-xs-8">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" checked name="verify_password" value="1"> {{ trans('form.verify_password') }} <a data-toggle="modal" data-target="#passwordModal" href="#passwordModal"><i class="fa fa-fw fa-question-circle"></i></a> <input type="checkbox" checked name="verify_password" value="1"> {{ trans('form.verify_password') }} <a data-toggle="modal" data-target="#passwordModal" href="#passwordModal"><span class="fa fa-fw fa-question-circle"></span></a>
</label> </label>
</div> </div>
</div> </div>

8
resources/views/v1/bills/index.twig
View File

@@ -15,21 +15,21 @@
<h3 class="box-title">{{ title }}</h3> <h3 class="box-title">{{ title }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_bill'|_ }}</a></li> <li><a href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_bill'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a class="btn btn-success" href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_bill'|_ }}</a> <a class="btn btn-success" href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_bill'|_ }}</a>
</div> </div>
{% include 'v1.list/bills' %} {% include 'v1.list/bills' %}
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-success" href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_bill'|_ }}</a> <a class="btn btn-success" href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_bill'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

10
resources/views/v1/bills/show.twig
View File

@@ -14,10 +14,10 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('bills.edit', object.data.id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('bills.edit', object.data.id) }}"><span class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('bills.delete', object.data.id) }}"><i class="fa fa-fw fa-trash-o"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('bills.delete', object.data.id) }}"><span class="fa fa-fw fa-trash-o"></span> {{ 'delete'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -37,9 +37,9 @@
<td style="width:50%;">{{ 'bill_is_active'|_ }}</td> <td style="width:50%;">{{ 'bill_is_active'|_ }}</td>
<td> <td>
{% if object.data.active %} {% if object.data.active %}
<i class="fa fa-check fa-fw" title="{{ 'active'|_ }}"></i> {{ 'yes'|_ }} <span class="fa fa-check fa-fw" title="{{ 'active'|_ }}"></span> {{ 'yes'|_ }}
{% else %} {% else %}
<i class="fa fa-times fa-fw" title="{{ 'inactive'|_ }}"></i> {{ 'no'|_ }} <span class="fa fa-times fa-fw" title="{{ 'inactive'|_ }}"></span> {{ 'no'|_ }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

28
resources/views/v1/budgets/index.twig
View File

@@ -77,7 +77,7 @@
: :
<span class="available_amount" data-id="0" data-value="0" data-currency="{{ defaultCurrency.id }}" <span class="available_amount" data-id="0" data-value="0" data-currency="{{ defaultCurrency.id }}"
data-value="0">{{ formatAmountBySymbol(0, defaultCurrency.symbol, defaultCurrency.decimal_places, true) }}</span> data-value="0">{{ formatAmountBySymbol(0, defaultCurrency.symbol, defaultCurrency.decimal_places, true) }}</span>
<a href="#" data-id="0" class="update_ab btn btn-default btn-xs"><i class="fa fa-pencil"></i></a> <a href="#" data-id="0" class="update_ab btn btn-default btn-xs"><span class="fa fa-pencil"></span></a>
</small> </small>
</div> </div>
</div> </div>
@@ -94,7 +94,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<p class="pull-right"> <p class="pull-right">
<a href="#" class="btn btn-light btn-xs create_ab_alt"> <a href="#" class="btn btn-light btn-xs create_ab_alt">
<i class="fa fa-plus-circle"></i> <span class="fa fa-plus-circle"></span>
{{ 'alt_currency_ab_create'|_ }}</a> {{ 'alt_currency_ab_create'|_ }}</a>
</p> </p>
</div> </div>
@@ -136,9 +136,9 @@
: :
<span class="available_amount" data-id="{{ budget.id }}" <span class="available_amount" data-id="{{ budget.id }}"
data-value="{{ budget.amount }}">{{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}</span> data-value="{{ budget.amount }}">{{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}</span>
<a href="#" data-id="{{ budget.id }}" class="update_ab btn btn-default btn-xs"><i class="fa fa-pencil"></i></a> <a href="#" data-id="{{ budget.id }}" class="update_ab btn btn-default btn-xs"><span class="fa fa-pencil"></span></a>
<a href="{{ route('available-budgets.delete', [budget.id]) }}" data-id="{{ budget.id }}" <a href="{{ route('available-budgets.delete', [budget.id]) }}" data-id="{{ budget.id }}"
class="delete_ab btn btn-danger btn-xs"><i class="fa fa-trash"></i></a> class="delete_ab btn btn-danger btn-xs"><span class="fa fa-trash"></span></a>
</small> </small>
</div> </div>
</div> </div>
@@ -195,7 +195,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<p class="pull-right"> <p class="pull-right">
<a href="#" class="btn btn-light btn-xs create_ab_alt"> <a href="#" class="btn btn-light btn-xs create_ab_alt">
<i class="fa fa-plus-circle"></i> <span class="fa fa-plus-circle"></span>
{{ 'alt_currency_ab_create'|_ }}</a> {{ 'alt_currency_ab_create'|_ }}</a>
</p> </p>
</div> </div>
@@ -216,7 +216,7 @@
</div> </div>
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a href="{{ route('budgets.create') }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ 'createBudget'|_ }}</a> <a href="{{ route('budgets.create') }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ 'createBudget'|_ }}</a>
</div> </div>
<table class="table table-bordered sortable-table table-striped sortable" id="budgetList"> <table class="table table-bordered sortable-table table-striped sortable" id="budgetList">
<thead> <thead>
@@ -233,9 +233,9 @@
<tr data-id="{{ budget.id }}"> <tr data-id="{{ budget.id }}">
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="#" class="handle object-handle btn btn-default"><i class="fa fa-fw fa-bars"></i></a> <a href="#" class="handle object-handle btn btn-default"><span class="fa fa-fw fa-bars"></span></a>
<a href="{{ route('budgets.edit', budget.id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a> <a href="{{ route('budgets.edit', budget.id) }}" class="btn btn-xs btn-default"><span class="fa fa-fw fa-pencil"></span></a>
<a href="{{ route('budgets.delete', budget.id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a> <a href="{{ route('budgets.delete', budget.id) }}" class="btn btn-xs btn-danger"><span class="fa fa-fw fa-trash-o"></span></a>
</div> </div>
</td> </td>
<td> <td>
@@ -256,14 +256,14 @@
{% if budget.auto_budget %} {% if budget.auto_budget %}
{% if 1 == budget.auto_budget.auto_budget_type %} {% if 1 == budget.auto_budget.auto_budget_type %}
<i class="fa fa-fw fa-calendar-check-o" title="{{ 'auto_budget_reset_icon'|_ }}"></i> <span class="fa fa-fw fa-calendar-check-o" title="{{ 'auto_budget_reset_icon'|_ }}"></span>
{% endif %} {% endif %}
{% if 2 == budget.auto_budget.auto_budget_type %} {% if 2 == budget.auto_budget.auto_budget_type %}
<i class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_rollover_icon'|_ }}"></i> <span class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_rollover_icon'|_ }}"></span>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if budget.attachments.count() > 0 %} {% if budget.attachments.count() > 0 %}
<i class="fa fa-paperclip"></i> <span class="fa fa-paperclip"></span>
{% endif %} {% endif %}
</td> </td>
<td> <td>
@@ -305,7 +305,7 @@
{% endif %} {% endif %}
{% if budget.budgeted|length < currencies.count() %} {% if budget.budgeted|length < currencies.count() %}
<a href="#" class="btn btn-light btn-xs create_bl" data-id="{{ budget.id }}"> <a href="#" class="btn btn-light btn-xs create_bl" data-id="{{ budget.id }}">
<i class="fa fa-plus-circle"></i> <span class="fa fa-plus-circle"></span>
</a> </a>
{% endif %} {% endif %}
</td> </td>
@@ -391,7 +391,7 @@
</table> </table>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('budgets.create') }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ 'createBudget'|_ }}</a> <a href="{{ route('budgets.create') }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ 'createBudget'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

4
resources/views/v1/budgets/no-budget.twig
View File

@@ -26,13 +26,13 @@
{% if periods|length > 0 %} {% if periods|length > 0 %}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('budgets.no-budget-all') }}">{{ 'show_all_no_filter'|_ }}</a> <a href="{{ route('budgets.no-budget-all') }}">{{ 'show_all_no_filter'|_ }}</a>
</p> </p>
{% else %} {% else %}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('budgets.no-budget') }}">{{ 'show_the_current_period_and_overview'|_ }}</a> <a href="{{ route('budgets.no-budget') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
</p> </p>
{% endif %} {% endif %}

8
resources/views/v1/budgets/show.twig
View File

@@ -18,10 +18,10 @@
</h3> </h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('budgets.edit',budget.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('budgets.edit',budget.id) }}"><span class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('budgets.delete',budget.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('budgets.delete',budget.id) }}"><span class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -131,7 +131,7 @@
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
{% if budgetLimit %} {% if budgetLimit %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('budgets.show', [budget.id]) }}"> <a href="{{ route('budgets.show', [budget.id]) }}">
{{ 'show_all_no_filter'|_ }} {{ 'show_all_no_filter'|_ }}
</a> </a>

8
resources/views/v1/categories/index.twig
View File

@@ -13,9 +13,9 @@
<h3 class="box-title">{{ 'categories'|_ }}</h3> <h3 class="box-title">{{ 'categories'|_ }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a></li> <li><a href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -23,12 +23,12 @@
</div> </div>
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a class="btn btn-success" href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a> <a class="btn btn-success" href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a>
</div> </div>
{% include 'v1.list/categories' %} {% include 'v1.list/categories' %}
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-success" href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a> <a class="btn btn-success" href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a>
</div> </div>
</div> </div>

4
resources/views/v1/categories/no-category.twig
View File

@@ -26,13 +26,13 @@
{% if periods|length > 0 %} {% if periods|length > 0 %}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('categories.no-category.all') }}">{{ 'show_all_no_filter'|_ }}</a> <a href="{{ route('categories.no-category.all') }}">{{ 'show_all_no_filter'|_ }}</a>
</p> </p>
{% else %} {% else %}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('categories.no-category') }}">{{ 'show_the_current_period_and_overview'|_ }}</a> <a href="{{ route('categories.no-category') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
</p> </p>
{% endif %} {% endif %}

4
resources/views/v1/categories/show.twig
View File

@@ -82,7 +82,7 @@
{% if periods|length > 0 %} {% if periods|length > 0 %}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('categories.show.all', [category.id]) }}"> <a href="{{ route('categories.show.all', [category.id]) }}">
{{ 'show_all_no_filter'|_ }} {{ 'show_all_no_filter'|_ }}
</a> </a>
@@ -90,7 +90,7 @@
{% else %} {% else %}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('categories.show', [category.id]) }}"> <a href="{{ route('categories.show', [category.id]) }}">
{{ 'show_the_current_period_and_overview'|_ }} {{ 'show_the_current_period_and_overview'|_ }}
</a> </a>

10
resources/views/v1/currencies/index.twig
View File

@@ -40,8 +40,8 @@
{% if isOwner %} {% if isOwner %}
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a class="btn btn-default" href="{{ route('currencies.edit',currency.id) }}"><i class="fa fa-fw fa-pencil"></i></a> <a class="btn btn-default" href="{{ route('currencies.edit',currency.id) }}"><span class="fa fa-fw fa-pencil"></span></a>
<a class="btn btn-danger" href="{{ route('currencies.delete',currency.id) }}"><i class="fa fa-fw fa-trash"></i></a> <a class="btn btn-danger" href="{{ route('currencies.delete',currency.id) }}"><span class="fa fa-fw fa-trash"></span></a>
</div> </div>
</td> </td>
{% endif %} {% endif %}
@@ -65,19 +65,19 @@
{% if currency.id != defaultCurrency.id %} {% if currency.id != defaultCurrency.id %}
<a class="btn btn-default" <a class="btn btn-default"
href="{{ route('currencies.default',currency.id) }}"> href="{{ route('currencies.default',currency.id) }}">
<i class="fa fa-fw fa-star"></i> <span class="fa fa-fw fa-star"></span>
{{ 'make_default_currency'|_ }}</a> {{ 'make_default_currency'|_ }}</a>
{% endif %} {% endif %}
{% if currency.enabled %} {% if currency.enabled %}
<a class="btn btn-default" <a class="btn btn-default"
href="{{ route('currencies.disable',currency.id) }}"> href="{{ route('currencies.disable',currency.id) }}">
<i class="fa fa-fw fa-square-o"></i> <span class="fa fa-fw fa-square-o"></span>
{{ 'disable_currency'|_ }}</a> {{ 'disable_currency'|_ }}</a>
{% endif %} {% endif %}
{% if not currency.enabled %} {% if not currency.enabled %}
<a class="btn btn-default" <a class="btn btn-default"
href="{{ route('currencies.enable',currency.id) }}"> href="{{ route('currencies.enable',currency.id) }}">
<i class="fa fa-fw fa-check-square-o"></i> <span class="fa fa-fw fa-check-square-o"></span>
{{ 'enable_currency'|_ }}</a> {{ 'enable_currency'|_ }}</a>
{% endif %} {% endif %}
</div> </div>

2
resources/views/v1/export/index.twig
View File

@@ -17,7 +17,7 @@
</p> </p>
<form action="{{ route('export.export') }}" method="post"> <form action="{{ route('export.export') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<button type="submit"><i class="fa fa-fw fa-download"></i> {{ 'export_data_all_transactions'|_ }}</button> <button type="submit"><span class="fa fa-fw fa-download"></span> {{ 'export_data_all_transactions'|_ }}</button>
</form> </form>
<p> <p>
{{ 'export_data_advanced_expl'|_ }} {{ 'export_data_advanced_expl'|_ }}

2
resources/views/v1/form/date.twig
View File

@@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
</div> </div>
{{ Form.input('date', name, value, options) }} {{ Form.input('date', name, value, options) }}
</div> </div>

2
resources/views/v1/form/feedback.twig
View File

@@ -1,4 +1,4 @@
{% if errors.has(name) %} {% if errors.has(name) %}
<span class="form-control-feedback"><i class="fa fa-fw fa-remove"></i></span> <span class="form-control-feedback"><span class="fa fa-fw fa-remove"></span></span>
<p class="text-danger">{{ errors.first(name) }}</p> <p class="text-danger">{{ errors.first(name) }}</p>
{% endif %} {% endif %}

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

@@ -16,8 +16,8 @@
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><i <a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><span
class="fa fa-money"></i> {{ 'go_to_asset_accounts'|_ }}</a> class="fa fa-money"></span> {{ 'go_to_asset_accounts'|_ }}</a>
</div> </div>
</div> </div>
@@ -31,7 +31,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"> <a href="{{ route('budgets.index') }}" class="btn btn-default button-sm">
<i class="fa fa-pie-chart"></i> <span class="fa fa-pie-chart"></span>
<span>{{ 'go_to_budgets'|_ }}</span> <span>{{ 'go_to_budgets'|_ }}</span>
</a> </a>
</div> </div>
@@ -47,7 +47,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm"> <a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
<i class="fa fa-bookmark"></i> <span class="fa fa-bookmark"></span>
<span>{{ 'go_to_categories'|_ }}</span> <span>{{ 'go_to_categories'|_ }}</span>
</a> </a>
</div> </div>
@@ -120,8 +120,8 @@
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><i <a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><span
class="fa fa-calendar"></i> {{ 'go_to_bills'|_ }}</a> class="fa fa-calendar"></span> {{ 'go_to_bills'|_ }}</a>
</div> </div>
</div> </div>
{% endif %} {% endif %}
@@ -145,8 +145,8 @@
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><i <a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><span
class="fa fa-shopping-cart"></i> {{ 'go_to_expense_accounts'|_ }}</a> class="fa fa-shopping-cart"></span> {{ 'go_to_expense_accounts'|_ }}</a>
</div> </div>
</div> </div>
{# OPTIONAL REVENUE ACCOUNTS #} {# OPTIONAL REVENUE ACCOUNTS #}
@@ -160,8 +160,8 @@
<canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><i <a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><span
class="fa fa-download"></i> {{ 'go_to_revenue_accounts'|_ }}</a> class="fa fa-download"></span> {{ 'go_to_revenue_accounts'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/v1/install/index.twig
View File

@@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="status-box" style="border:1px #ddd solid;padding:5px;"> <div id="status-box" style="border:1px #ddd solid;padding:5px;">
<i class="fa fa-spin fa-spinner"></i> Waiting to start... <span class="fa fa-spin fa-spinner"></span> Waiting to start...
</div> </div>
</div> </div>
</div> </div>

4
resources/views/v1/json/piggy-banks.twig
View File

@@ -16,7 +16,7 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('piggy-banks.index') }}" class="btn btn-default button-sm"><i <a href="{{ route('piggy-banks.index') }}" class="btn btn-default button-sm"><span
class="fa fa-download"></i> {{ 'go_to_piggies'|_ }}</a> class="fa fa-download"></span> {{ 'go_to_piggies'|_ }}</a>
</div> </div>
</div> </div>

6
resources/views/v1/layout/default.twig
View File

@@ -74,7 +74,7 @@
<li class="hidden-sm hidden-xs"> <li class="hidden-sm hidden-xs">
<a href="#" id="help" data-route="{{ original_route_name }}" data-extra="{{ objectType|default("") }}"> <a href="#" id="help" data-route="{{ original_route_name }}" data-extra="{{ objectType|default("") }}">
<i class="fa fa-question-circle" data-route="{{ original_route_name }}" data-extra="{{ objectType|default("") }}"></i> <span class="fa fa-question-circle" data-route="{{ original_route_name }}" data-extra="{{ objectType|default("") }}"></span>
</a> </a>
</li> </li>
@@ -90,7 +90,7 @@
</span> </span>
</li> </li>
<li id="sidebar-toggle"> <li id="sidebar-toggle">
<a href="#" data-toggle="control-sidebar"><i class="fa fa-plus-circle"></i></a> <a href="#" data-toggle="control-sidebar"><span class="fa fa-plus-circle"></span></a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -103,7 +103,7 @@
<div class="input-group"> <div class="input-group">
<input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/> <input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
<span class="input-group-btn"> <span class="input-group-btn">
<button type='submit' name='go' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button> <button type='submit' name='go' id='search-btn' class="btn btn-flat"><span class="fa fa-search"></span></button>
</span> </span>
</div> </div>
</form> </form>

16
resources/views/v1/list/accounts.twig
View File

@@ -35,15 +35,15 @@
{% for account in accounts %} {% for account in accounts %}
<tr class="sortable-object" data-id="{{ account.id }}" data-order="{{ account.order }}" data-position="{{ loop.index0 }}"> <tr class="sortable-object" data-id="{{ account.id }}" data-order="{{ account.order }}" data-position="{{ loop.index0 }}">
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
<i class="fa fa-fw fa-bars object-handle"></i> <span class="fa fa-fw fa-bars object-handle"></span>
</td> </td>
<td> <td>
<a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a> <a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a>
{% if account.location %} {% if account.location %}
<i class="fa fa-fw fa-map-marker"></i> <span class="fa fa-fw fa-map-marker"></span>
{% endif %} {% endif %}
{% if account.attachments.count() > 0 %} {% if account.attachments.count() > 0 %}
<i class="fa fa-fw fa-paperclip"></i> <span class="fa fa-fw fa-paperclip"></span>
{% endif %} {% endif %}
</td> </td>
{% if objectType == "asset" %} {% if objectType == "asset" %}
@@ -75,9 +75,9 @@
{% endif %} {% endif %}
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
{% if account.active %} {% if account.active %}
<i class="fa fa-fw fa-check"></i> <span class="fa fa-fw fa-check"></span>
{% else %} {% else %}
<i class="fa fa-fw fa-ban"></i> <span class="fa fa-fw fa-ban"></span>
{% endif %} {% endif %}
</td> </td>
{# hide last activity to make room for other stuff #} {# hide last activity to make room for other stuff #}
@@ -102,10 +102,10 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button> {{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('accounts.edit',account.id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('accounts.edit',account.id) }}"><span class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('accounts.delete',account.id) }}"><i class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('accounts.delete',account.id) }}"><span class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
{% if objectType == 'asset' %} {% if objectType == 'asset' %}
<li><a href="{{ route('accounts.reconcile',account.id) }}"><i class="fa fa-fw fa-check"></i> {{ 'reconcile_this_account'|_ }}</a></li> <li><a href="{{ route('accounts.reconcile',account.id) }}"><span class="fa fa-fw fa-check"></span> {{ 'reconcile_this_account'|_ }}</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

18
resources/views/v1/list/attachments.twig
View File

@@ -3,22 +3,22 @@
<tr> <tr>
<td style="width:120px;"> <td style="width:120px;">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('attachments.edit', attachment.id) }}" class="btn btn-default"><i <a href="{{ route('attachments.edit', attachment.id) }}" class="btn btn-default"><span
class="fa fa-pencil"></i></a> class="fa fa-pencil"></span></a>
<a href="{{ route('attachments.delete', attachment.id) }}" class="btn btn-danger"><i <a href="{{ route('attachments.delete', attachment.id) }}" class="btn btn-danger"><span
class="fa fa-trash"></i></a> class="fa fa-trash"></span></a>
{% if attachment.file_exists %} {% if attachment.file_exists %}
<a href="{{ route('attachments.download', attachment.id) }}" class="btn btn-default"><i <a href="{{ route('attachments.download', attachment.id) }}" class="btn btn-default"><span
class="fa fa-download"></i></a> class="fa fa-download"></span></a>
{% endif %} {% endif %}
{% if not attachment.file_exists %} {% if not attachment.file_exists %}
<a href="#" class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i></a> <a href="#" class="btn btn-danger"><span class="fa fa-exclamation-triangle"></span></a>
{% endif %} {% endif %}
</div> </div>
</td> </td>
<td> <td>
{% if attachment.file_exists %} {% if attachment.file_exists %}
<i class="fa {{ attachment.mime|mimeIcon }}"></i> <span class="fa {{ attachment.mime|mimeIcon }}"></span>
<a href="{{ route('attachments.view', attachment.id) }}" title="{{ attachment.filename }}"> <a href="{{ route('attachments.view', attachment.id) }}" title="{{ attachment.filename }}">
{% if attachment.title %} {% if attachment.title %}
{{ attachment.title }} {{ attachment.title }}
@@ -32,7 +32,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if not attachment.file_exists %} {% if not attachment.file_exists %}
<i class="fa fa-fw fa-exclamation-triangle"></i> <span class="fa fa-fw fa-exclamation-triangle"></span>
{% if attachment.title %} {% if attachment.title %}
{{ attachment.title }} {{ attachment.title }}
{% else %} {% else %}

12
resources/views/v1/list/bills.twig
View File

@@ -25,21 +25,21 @@
{% for entry in objectGroup.bills %} {% for entry in objectGroup.bills %}
<tr class="bill-sortable" data-id="{{ entry.id }}" data-name="{{ entry.name }}" data-order="{{ entry.order }}" data-position="{{ loop.index0 }}"> <tr class="bill-sortable" data-id="{{ entry.id }}" data-name="{{ entry.name }}" data-order="{{ entry.order }}" data-position="{{ loop.index0 }}">
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
<i class="fa fa-fw fa-bars bill-handle"></i> <span class="fa fa-fw fa-bars bill-handle"></span>
</td> </td>
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
<div class="btn-group btn-group-xs edit_tr_buttons"><a href="{{ route('bills.edit',entry.id) }}" class="btn btn-default btn-xs"><i <div class="btn-group btn-group-xs edit_tr_buttons"><a href="{{ route('bills.edit',entry.id) }}" class="btn btn-default btn-xs"><span
class="fa fa-fw fa-pencil"></i></a><a href="{{ route('bills.delete',entry.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-fw fa-pencil"></span></a><a href="{{ route('bills.delete',entry.id) }}" class="btn btn-danger btn-xs"><span
class="fa fa-fw fa-trash-o"></i></a></div> class="fa fa-fw fa-trash-o"></span></a></div>
</td> </td>
<td> <td>
{% if not entry.active %} {% if not entry.active %}
<i class="fa fa-fw fa-ban"></i> <span class="fa fa-fw fa-ban"></span>
{% endif %} {% endif %}
<a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a> <a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
{# count attachments #} {# count attachments #}
{% if entry.attachments.count() > 0 %} {% if entry.attachments.count() > 0 %}
<i class="fa fa-paperclip"></i> <span class="fa fa-paperclip"></span>
{% endif %} {% endif %}
</td> </td>

6
resources/views/v1/list/categories.twig
View File

@@ -19,14 +19,14 @@
<tr> <tr>
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('categories.edit', category.id) }}" class="btn btn-default btn-xs"><i class="fa fa-fw fa-pencil"></i></a> <a href="{{ route('categories.edit', category.id) }}" class="btn btn-default btn-xs"><span class="fa fa-fw fa-pencil"></span></a>
<a href="{{ route('categories.delete', category.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-fw fa-trash-o"></i></a> <a href="{{ route('categories.delete', category.id) }}" class="btn btn-danger btn-xs"><span class="fa fa-fw fa-trash-o"></span></a>
</div> </div>
</td> </td>
<td data-value="{{ category.name }}"> <td data-value="{{ category.name }}">
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a> <a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
{% if category.attachments.count() > 0 %} {% if category.attachments.count() > 0 %}
<i class="fa fa-fw fa-paperclip"></i> <span class="fa fa-fw fa-paperclip"></span>
{% endif %} {% endif %}
</td> </td>
{% if category.lastActivity %} {% if category.lastActivity %}

56
resources/views/v1/list/groups.twig
View File

@@ -14,11 +14,11 @@
{{ 'actions'|_ }} <span class="caret"></span> {{ 'actions'|_ }} <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li><a href="#" class="mass-edit"><i class="fa fa-fw fa-pencil"></i> <li><a href="#" class="mass-edit"><span class="fa fa-fw fa-pencil"></span>
<span>{{ 'mass_edit'|_ }}</span></a></li> <span>{{ 'mass_edit'|_ }}</span></a></li>
<li><a href="#" class="bulk-edit"><i class="fa fa-fw fa-pencil-square-o"></i> <li><a href="#" class="bulk-edit"><span class="fa fa-fw fa-pencil-square-o"></span>
<span>{{ 'bulk_edit'|_ }}</span></a></li> <span>{{ 'bulk_edit'|_ }}</span></a></li>
<li><a href="#" class="mass-delete"><i class="fa fa-fw fa-trash"></i> <li><a href="#" class="mass-delete"><span class="fa fa-fw fa-trash"></span>
<span>{{ 'mass_delete'|_ }}</span></a></li> <span>{{ 'mass_delete'|_ }}</span></a></li>
</ul> </ul>
</div> </div>
@@ -81,12 +81,12 @@
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button> {{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><i <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li> class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [group.id]) }}"><i <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li> class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li><a href="{{ route('transactions.clone', [group.id]) }}"><i <li><a href="{{ route('transactions.clone', [group.id]) }}"><span
class="fa fa-copy fa-fw"></i> {{ 'clone'|_ }}</a></li> class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
</ul> </ul>
</div> </div>
</td> </td>
@@ -101,34 +101,34 @@
<tr data-date="{{ transaction.date.format('Y-m-d') }}" data-count="{{ group.count }}" data-id="{{ group.id }}"> <tr data-date="{{ transaction.date.format('Y-m-d') }}" data-count="{{ group.count }}" data-id="{{ group.id }}">
<td style=" {{ style|raw }}" class="hidden-xs"> <td style=" {{ style|raw }}" class="hidden-xs">
{% if transaction.transaction_type_type == 'Withdrawal' %} {% if transaction.transaction_type_type == 'Withdrawal' %}
<i class="object-handle fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></i> <span class="object-handle fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Deposit' %} {% if transaction.transaction_type_type == 'Deposit' %}
<i class="object-handle fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="object-handle fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Transfer' %} {% if transaction.transaction_type_type == 'Transfer' %}
<i class="object-handle fa fa-exchange fa-fw" title="{{ trans('firefly.Transfer') }}"></i> <span class="object-handle fa fa-exchange fa-fw" title="{{ trans('firefly.Transfer') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Reconciliation' %} {% if transaction.transaction_type_type == 'Reconciliation' %}
<i class="object-handle fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></i> <span class="object-handle fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Opening balance' %} {% if transaction.transaction_type_type == 'Opening balance' %}
<i class="object-handle fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></i> <span class="object-handle fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Liability credit' %} {% if transaction.transaction_type_type == 'Liability credit' %}
<i class="object-handle fa-fw fa fa-star-o" title="{{ trans('firefly.Liability credit') }}"></i> <span class="object-handle fa-fw fa fa-star-o" title="{{ trans('firefly.Liability credit') }}"></span>
{% endif %} {% endif %}
</td> </td>
<td style=" {{ style|raw }}"> <td style=" {{ style|raw }}">
{% if transaction.reconciled %} {% if transaction.reconciled %}
<i class="fa fa-check"></i> <span class="fa fa-check"></span>
{% endif %} {% endif %}
{% if transaction.attachments|length > 0 %} {% if transaction.attachments|length > 0 %}
<i class="fa fa-paperclip"></i> <span class="fa fa-paperclip"></span>
{% endif %} {% endif %}
{% if group.count == 1 %} {% if group.count == 1 %}
<a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}"> <a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">
@@ -245,15 +245,15 @@
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button> {{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><i <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li> class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [group.id]) }}"><i <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li> class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li><a href="{{ route('transactions.clone', [group.id]) }}"><i <li><a href="{{ route('transactions.clone', [group.id]) }}"><span
class="fa fa-copy fa-fw"></i> {{ 'clone'|_ }}</a></li> class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
<li> <li>
<a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><i <a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><span
class="fa fa-fw fa-random"></i> {{ 'create_rule_from_transaction'|_ }} class="fa fa-fw fa-random"></span> {{ 'create_rule_from_transaction'|_ }}
</a></li> </a></li>
</ul> </ul>
</div> </div>
@@ -289,11 +289,11 @@
{{ 'actions'|_ }} <span class="caret"></span> {{ 'actions'|_ }} <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu btn-group-xs dropdown-menu-right"> <ul class="dropdown-menu btn-group-xs dropdown-menu-right">
<li><a href="#" class="mass-edit"><i class="fa fa-fw fa-pencil"></i> <li><a href="#" class="mass-edit"><span class="fa fa-fw fa-pencil"></span>
<span>{{ 'mass_edit'|_ }}</span></a></li> <span>{{ 'mass_edit'|_ }}</span></a></li>
<li><a href="#" class="bulk-edit"><i class="fa fa-fw fa-pencil-square-o"></i> <li><a href="#" class="bulk-edit"><span class="fa fa-fw fa-pencil-square-o"></span>
<span>{{ 'bulk_edit'|_ }}</span></a></li> <span>{{ 'bulk_edit'|_ }}</span></a></li>
<li><a href="#" class="mass-delete"><i class="fa fa-fw fa-trash"></i> <li><a href="#" class="mass-delete"><span class="fa fa-fw fa-trash"></span>
<span>{{ 'mass_delete'|_ }}</span></a></li> <span>{{ 'mass_delete'|_ }}</span></a></li>
</ul> </ul>
</div> </div>

18
resources/views/v1/list/piggy-banks.twig
View File

@@ -25,24 +25,24 @@
</td> </td>
<td class="visible-xs visible-sm hidden-md hidden-lg"> <td class="visible-xs visible-sm hidden-md hidden-lg">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('piggy-banks.remove-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-minus"></i></a> <a href="{{ route('piggy-banks.remove-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><span class="fa fa-minus"></span></a>
<a href="{{ route('piggy-banks.add-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a> <a href="{{ route('piggy-banks.add-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><span class="fa fa-plus"></span></a>
</div> </div>
</td> </td>
<td style="width:60px;" class="hidden-sm hidden-xs"> <td style="width:60px;" class="hidden-sm hidden-xs">
<i class="fa fa-fw fa-bars piggy-handle"></i> <span class="fa fa-fw fa-bars piggy-handle"></span>
<i class="loadSpin"></i> <span class="loadSpin"></span>
</td> </td>
<td style="width:100px;" class="hidden-sm hidden-xs"> <td style="width:100px;" class="hidden-sm hidden-xs">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('piggy-banks.edit', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-pencil fa-fw"></i></a> <a href="{{ route('piggy-banks.edit', piggy.id) }}" class="btn btn-default btn-xs"><span class="fa fa-pencil fa-fw"></span></a>
<a href="{{ route('piggy-banks.delete', piggy.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-trash fa-fw"></i></a> <a href="{{ route('piggy-banks.delete', piggy.id) }}" class="btn btn-danger btn-xs"><span class="fa fa-trash fa-fw"></span></a>
</div> </div>
</td> </td>
<td> <td>
<a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a> <a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a>
{% if piggy.attachments.count() > 0 %} {% if piggy.attachments.count() > 0 %}
<i class="fa fa-fw fa-paperclip"></i> <span class="fa fa-fw fa-paperclip"></span>
{% endif %} {% endif %}
</td> </td>
<td style="text-align: right;" class="piggySaved"> <td style="text-align: right;" class="piggySaved">
@@ -52,7 +52,7 @@
<td class="hidden-sm hidden-xs" style="text-align:right;width:40px;"> <td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">
{% if piggy.current_amount > 0 %} {% if piggy.current_amount > 0 %}
<a href="{{ route('piggy-banks.remove-money', piggy.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggy.id }}"> <a href="{{ route('piggy-banks.remove-money', piggy.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggy.id }}">
<i data-id="{{ piggy.id }}" class="fa fa-minus"></i></a> <i data-id="{{ piggy.id }}" class="fa fa-minus"></span></a>
{% endif %} {% endif %}
</td> </td>
@@ -77,7 +77,7 @@
<td class="hidden-sm hidden-xs" style="width:40px;"> <td class="hidden-sm hidden-xs" style="width:40px;">
{% if piggy.left_to_save > 0 %} {% if piggy.left_to_save > 0 %}
<a href="{{ route('piggy-banks.add-money', piggy.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggy.id }}"> <a href="{{ route('piggy-banks.add-money', piggy.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggy.id }}">
<i data-id="{{ piggy.id }}" class="fa fa-plus"></i></a> <i data-id="{{ piggy.id }}" class="fa fa-plus"></span></a>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">

6
resources/views/v1/object-groups/index.twig
View File

@@ -38,7 +38,7 @@
<tbody> <tbody>
{% for objectGroup in objectGroups %} {% for objectGroup in objectGroups %}
<tr class="group-sortable" data-id="{{ objectGroup.id }}" data-name="{{ objectGroup.title|escape('html') }}" data-order="{{ objectGroup.order }}"> <tr class="group-sortable" data-id="{{ objectGroup.id }}" data-name="{{ objectGroup.title|escape('html') }}" data-order="{{ objectGroup.order }}">
<td><i class="fa fa-fw fa-bars group-handle"></i></td> <td><span class="fa fa-fw fa-bars group-handle"></span></td>
<td> <td>
<strong>{{ objectGroup.title }}</strong><br /> <strong>{{ objectGroup.title }}</strong><br />
@@ -52,10 +52,10 @@
<td> <td>
<div class="btn-group btn-group-sm"> <div class="btn-group btn-group-sm">
<a class="btn btn-default" href="{{ route('object-groups.edit', [objectGroup.id]) }}"> <a class="btn btn-default" href="{{ route('object-groups.edit', [objectGroup.id]) }}">
<i class="fa fa-pencil"></i> <span class="fa fa-pencil"></span>
</a> </a>
<a class="btn btn-danger" href="{{ route('object-groups.delete', [objectGroup.id]) }}"> <a class="btn btn-danger" href="{{ route('object-groups.delete', [objectGroup.id]) }}">
<i class="fa fa-trash"></i> <span class="fa fa-trash"></span>
</a> </a>
</div> </div>
</td> </td>

6
resources/views/v1/partials/boxes.twig
View File

@@ -22,7 +22,7 @@
{# box for bills #} {# box for bills #}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-teal-gradient"> <div class="info-box bg-teal-gradient">
<span class="info-box-icon"><i class="fa fa-calendar-o"></i></span> <span class="info-box-icon"><span class="fa fa-calendar-o"></span></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text"><a href="{{ route('bills.index') }}">{{ 'bills_to_pay'|_ }}</a></span> <span class="info-box-text"><a href="{{ route('bills.index') }}">{{ 'bills_to_pay'|_ }}</a></span>
@@ -42,7 +42,7 @@
{# available to spend total / per day #} {# available to spend total / per day #}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-green-gradient" id="box-left-to-spend-box"> <div class="info-box bg-green-gradient" id="box-left-to-spend-box">
<span class="info-box-icon"><i class="fa fa-money"></i></span> <span class="info-box-icon"><span class="fa fa-money"></span></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text"><a id="box-left-to-spend-text" href="{{ route('budgets.index') }}">{{ 'left_to_spend'|_ }}</a></span> <span class="info-box-text"><a id="box-left-to-spend-text" href="{{ route('budgets.index') }}">{{ 'left_to_spend'|_ }}</a></span>
<span class="info-box-number" id="box-left-to-spend"></span> <span class="info-box-number" id="box-left-to-spend"></span>
@@ -61,7 +61,7 @@
{# net worth #} {# net worth #}
<div class="col-lg-3 col-md-6 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-6 col-sm-6 col-xs-12">
<div class="info-box bg-blue-gradient"> <div class="info-box bg-blue-gradient">
<span class="info-box-icon"><i class="fa fa-line-chart"></i></span> <span class="info-box-icon"><span class="fa fa-line-chart"></span></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text"> <span class="info-box-text">

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

@@ -5,7 +5,7 @@
<ul class='control-sidebar-menu'> <ul class='control-sidebar-menu'>
<li> <li>
<a href="{{ route('transactions.create', 'withdrawal') }}"> <a href="{{ route('transactions.create', 'withdrawal') }}">
<i class="menu-icon fa fa-long-arrow-left bg-red"></i> <span class="menu-icon fa fa-long-arrow-left bg-red"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_withdrawal'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_withdrawal'|_ }}</h4>
@@ -14,7 +14,7 @@
</li> </li>
<li> <li>
<a href="{{ route('transactions.create', 'deposit') }}"> <a href="{{ route('transactions.create', 'deposit') }}">
<i class="menu-icon fa fa-long-arrow-right bg-green"></i> <span class="menu-icon fa fa-long-arrow-right bg-green"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_deposit'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_deposit'|_ }}</h4>
@@ -23,7 +23,7 @@
</li> </li>
<li> <li>
<a href="{{ route('transactions.create', 'transfer') }}"> <a href="{{ route('transactions.create', 'transfer') }}">
<i class="menu-icon fa fa-exchange bg-blue"></i> <span class="menu-icon fa fa-exchange bg-blue"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_transfer'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_transfer'|_ }}</h4>
@@ -32,7 +32,7 @@
</li> </li>
<li> <li>
<a href="{{ route('accounts.create', 'asset') }}"> <a href="{{ route('accounts.create', 'asset') }}">
<i class="menu-icon fa fa-money bg-maroon"></i> <span class="menu-icon fa fa-money bg-maroon"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_asset_account'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_asset_account'|_ }}</h4>
@@ -41,7 +41,7 @@
</li> </li>
<li> <li>
<a href="{{ route('accounts.create', 'expense') }}"> <a href="{{ route('accounts.create', 'expense') }}">
<i class="menu-icon fa fa-shopping-cart bg-maroon"></i> <span class="menu-icon fa fa-shopping-cart bg-maroon"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_expense_account'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_expense_account'|_ }}</h4>
@@ -50,7 +50,7 @@
</li> </li>
<li> <li>
<a href="{{ route('accounts.create', 'revenue') }}"> <a href="{{ route('accounts.create', 'revenue') }}">
<i class="menu-icon fa fa-download bg-maroon"></i> <span class="menu-icon fa fa-download bg-maroon"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_revenue_account'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_revenue_account'|_ }}</h4>
@@ -59,7 +59,7 @@
</li> </li>
<li> <li>
<a href="{{ route('accounts.create', 'liabilities') }}"> <a href="{{ route('accounts.create', 'liabilities') }}">
<i class="menu-icon fa fa-ticket bg-maroon"></i> <span class="menu-icon fa fa-ticket bg-maroon"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_liabilities_account'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_liabilities_account'|_ }}</h4>
@@ -69,7 +69,7 @@
<li> <li>
<a href="{{ route('budgets.create') }}"> <a href="{{ route('budgets.create') }}">
<i class="menu-icon fa fa-pie-chart bg-red"></i> <span class="menu-icon fa fa-pie-chart bg-red"></span>
<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-bookmark bg-red"></i> <span class="menu-icon fa fa-bookmark bg-red"></span>
<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-bullseye bg-teal"></i> <span class="menu-icon fa fa-bullseye bg-teal"></span>
<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>
@@ -98,7 +98,7 @@
</li> </li>
<li> <li>
<a href="{{ route('bills.create') }}"> <a href="{{ route('bills.create') }}">
<i class="menu-icon fa fa-calendar-o bg-purple"></i> <span class="menu-icon fa fa-calendar-o bg-purple"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_bill'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_bill'|_ }}</h4>
@@ -107,7 +107,7 @@
</li> </li>
<li> <li>
<a href="{{ route('rules.create') }}"> <a href="{{ route('rules.create') }}">
<i class="menu-icon fa fa-random bg-red"></i> <span class="menu-icon fa fa-random bg-red"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_rule'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_rule'|_ }}</h4>
@@ -116,7 +116,7 @@
</li> </li>
<li> <li>
<a href="{{ route('recurring.create') }}"> <a href="{{ route('recurring.create') }}">
<i class="menu-icon fa fa-paint-brush bg-teal"></i> <span class="menu-icon fa fa-paint-brush bg-teal"></span>
<div class="menu-info"> <div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_recurring_transaction'|_ }}</h4> <h4 class="control-sidebar-subheading">{{ 'new_recurring_transaction'|_ }}</h4>

4
resources/views/v1/partials/flashes.twig
View File

@@ -4,14 +4,14 @@
<button type="button" class="close" data-dismiss="alert"> <button type="button" class="close" data-dismiss="alert">
<span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span> <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
</button> </button>
<strong>{{ 'invalid_server_configuration'|_ }}:</strong> <i class="fa fa-money"></i> {{ 'invalid_locale_settings'|_ }} <strong>{{ 'invalid_server_configuration'|_ }}:</strong> <span class="fa fa-money"></span> {{ 'invalid_locale_settings'|_ }}
</div> </div>
{% endif %} {% endif %}
{# MANDATORY UPDATE MESSAGE #} {# MANDATORY UPDATE MESSAGE #}
{% if upgrade_security_message and upgrade_security_level %} {% if upgrade_security_message and upgrade_security_level %}
<div class="alert alert-{{ upgrade_security_level }} alert-dismissible" role="alert"> <div class="alert alert-{{ upgrade_security_level }} alert-dismissible" role="alert">
<strong>{{ ('flash_'~upgrade_security_level)|_ }}</strong> <i class="fa fa-exclamation-triangle"></i> {{ upgrade_security_message }} <strong>{{ ('flash_'~upgrade_security_level)|_ }}</strong> <span class="fa fa-exclamation-triangle"></span> {{ upgrade_security_message }}
</div> </div>
{% endif %} {% endif %}

68
resources/views/v1/partials/menu-sidebar.twig
View File

@@ -1,7 +1,7 @@
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<li class="{{ activeRouteStrict('index') }}"> <li class="{{ activeRouteStrict('index') }}">
<a href="{{ route('index') }}"> <a href="{{ route('index') }}">
<i class="fa fa-dashboard fa-fw"></i> <span class="fa fa-dashboard fa-fw"></span>
<span>{{ 'dashboard'|_ }}</span> <span>{{ 'dashboard'|_ }}</span>
</a> </a>
</li> </li>
@@ -10,21 +10,21 @@
<li class="{{ activeRoutePartial('budgets') }}" id="budget-menu"> <li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
<a href="{{ route('budgets.index') }}"> <a href="{{ route('budgets.index') }}">
<i class="fa fa-pie-chart fa-fw"></i> <span class="fa fa-pie-chart fa-fw"></span>
<span>{{ 'budgets'|_ }}</span> <span>{{ 'budgets'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('bills') }}"> <li class="{{ activeRoutePartial('bills') }}">
<a href="{{ route('bills.index') }}"> <a href="{{ route('bills.index') }}">
<i class="fa fa-calendar-o fa-fw"></i> <span class="fa fa-calendar-o fa-fw"></span>
<span>{{ 'bills'|_ }}</span> <span>{{ 'bills'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('piggy-banks') }}"> <li class="{{ activeRoutePartial('piggy-banks') }}">
<a href="{{ route('piggy-banks.index') }}"> <a href="{{ route('piggy-banks.index') }}">
<i class="fa fa-bullseye fa-fw"></i> <span class="fa fa-bullseye fa-fw"></span>
<span>{{ 'piggyBanks'|_ }}</span> <span>{{ 'piggyBanks'|_ }}</span>
</a> </a>
</li> </li>
@@ -33,29 +33,29 @@
<li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu"> <li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu">
<a href="#"> <a href="#">
<i class="fa fa-exchange fa-fw"></i> <span class="fa fa-exchange fa-fw"></span>
<span>{{ 'transactions'|_ }}</span> <span>{{ 'transactions'|_ }}</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <span class="fa fa-angle-left pull-right"></span>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
<a href="{{ route('transactions.index', 'withdrawal') }}"> <a href="{{ route('transactions.index', 'withdrawal') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'expenses'|_ }}</span> <span>{{ 'expenses'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}">
<a href="{{ route('transactions.index', 'deposit') }}"> <a href="{{ route('transactions.index', 'deposit') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'income'|_ }}</span> <span>{{ 'income'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}">
<a href="{{ route('transactions.index', 'transfers') }}"> <a href="{{ route('transactions.index', 'transfers') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'transfers'|_ }}</span> <span>{{ 'transfers'|_ }}</span>
</a> </a>
</li> </li>
@@ -64,23 +64,23 @@
<li class="{{ activeRoutePartial('recurring') }} {{ activeRoutePartial('rules') }} treeview"> <li class="{{ activeRoutePartial('recurring') }} {{ activeRoutePartial('rules') }} treeview">
<a href="#"> <a href="#">
<i class="fa fa-microchip fa-fw"></i> <span class="fa fa-microchip fa-fw"></span>
<span>{{ 'automation'|_ }}</span> <span>{{ 'automation'|_ }}</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <span class="fa fa-angle-left pull-right"></span>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('rules') }}"> <li class="{{ activeRoutePartial('rules') }}">
<a href="{{ route('rules.index') }}"> <a href="{{ route('rules.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'rules'|_ }}</span> <span>{{ 'rules'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('recurring') }}"> <li class="{{ activeRoutePartial('recurring') }}">
<a href="{{ route('recurring.index') }}"> <a href="{{ route('recurring.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'recurrences'|_ }}</span> <span>{{ 'recurrences'|_ }}</span>
</a> </a>
</li> </li>
@@ -91,35 +91,35 @@
<li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu"> <li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu">
<a href="#"> <a href="#">
<i class="fa fa-credit-card fa-fw"></i> <span class="fa fa-credit-card fa-fw"></span>
<span>{{ 'accounts'|_ }}</span> <span>{{ 'accounts'|_ }}</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <span class="fa fa-angle-left pull-right"></span>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}">
<a href="{{ route('accounts.index', 'asset') }}"> <a href="{{ route('accounts.index', 'asset') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'asset_accounts'|_ }}</span> <span>{{ 'asset_accounts'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}">
<a href="{{ route('accounts.index', 'expense') }}"> <a href="{{ route('accounts.index', 'expense') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'expense_accounts'|_ }}</span> <span>{{ 'expense_accounts'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}">
<a href="{{ route('accounts.index', 'revenue') }}"> <a href="{{ route('accounts.index', 'revenue') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'revenue_accounts'|_ }}</span> <span>{{ 'revenue_accounts'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}">
<a href="{{ route('accounts.index', 'liabilities') }}"> <a href="{{ route('accounts.index', 'liabilities') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'liabilities_accounts'|_ }}</span> <span>{{ 'liabilities_accounts'|_ }}</span>
</a> </a>
</li> </li>
@@ -128,29 +128,29 @@
<li class="{{ activeRoutePartial('categories') }} {{ activeRoutePartial('tags') }} {{ activeRoutePartial('groups') }} treeview"> <li class="{{ activeRoutePartial('categories') }} {{ activeRoutePartial('tags') }} {{ activeRoutePartial('groups') }} treeview">
<a href="#"> <a href="#">
<i class="fa fa-tags fa-fw"></i> <span class="fa fa-tags fa-fw"></span>
<span>{{ 'classification'|_ }}</span> <span>{{ 'classification'|_ }}</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <span class="fa fa-angle-left pull-right"></span>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('categories') }}"> <li class="{{ activeRoutePartial('categories') }}">
<a href="{{ route('categories.index') }}"> <a href="{{ route('categories.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'categories'|_ }}</span> <span>{{ 'categories'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('tags') }}"> <li class="{{ activeRoutePartial('tags') }}">
<a href="{{ route('tags.index') }}"> <a href="{{ route('tags.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'tags'|_ }}</span> <span>{{ 'tags'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('object-groups') }}"> <li class="{{ activeRoutePartial('object-groups') }}">
<a href="{{ route('object-groups.index') }}"> <a href="{{ route('object-groups.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'object_groups_menu_bar'|_ }}</span> <span>{{ 'object_groups_menu_bar'|_ }}</span>
</a> </a>
</li> </li>
@@ -159,7 +159,7 @@
<li class="{{ activeRoutePartial('reports') }}" id="report-menu"> <li class="{{ activeRoutePartial('reports') }}" id="report-menu">
<a href="{{ route('reports.index') }}"> <a href="{{ route('reports.index') }}">
<i class="fa fa-bar-chart fa-fw"></i> <span class="fa fa-bar-chart fa-fw"></span>
<span>{{ 'reports'|_ }}</span> <span>{{ 'reports'|_ }}</span>
</a> </a>
</li> </li>
@@ -168,7 +168,7 @@
{% if config('firefly.feature_flags.export') %} {% if config('firefly.feature_flags.export') %}
<li class="{{ activeRoutePartial('export') }}" id="report-menu"> <li class="{{ activeRoutePartial('export') }}" id="report-menu">
<a href="{{ route('export.index') }}"> <a href="{{ route('export.index') }}">
<i class="fa fa-upload fa-fw"></i> <span class="fa fa-upload fa-fw"></span>
<span>{{ 'export_data_menu'|_ }}</span> <span>{{ 'export_data_menu'|_ }}</span>
</a> </a>
</li> </li>
@@ -177,36 +177,36 @@
<li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview" <li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview"
id="option-menu"> id="option-menu">
<a href="#"> <a href="#">
<i class="fa fa-sliders fa-fw"></i> <span class="fa fa-sliders fa-fw"></span>
<span>{{ 'options'|_ }}</span> <span>{{ 'options'|_ }}</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <span class="fa fa-angle-left pull-right"></span>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('profile') }}"> <li class="{{ activeRoutePartial('profile') }}">
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"> <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'profile'|_ }}</span> <span>{{ 'profile'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('preferences') }}"> <li class="{{ activeRoutePartial('preferences') }}">
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"> <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'preferences'|_ }}</span> <span>{{ 'preferences'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('currencies') }}"> <li class="{{ activeRoutePartial('currencies') }}">
<a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}"> <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'currencies'|_ }}</span> <span>{{ 'currencies'|_ }}</span>
</a> </a>
</li> </li>
{% if true == featuringWebhooks %} {% if true == featuringWebhooks %}
<li class="{{ activeRoutePartial('webhooks') }}"> <li class="{{ activeRoutePartial('webhooks') }}">
<a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index') }}"> <a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'webhooks'|_ }}</span> <span>{{ 'webhooks'|_ }}</span>
</a> </a>
</li> </li>
@@ -214,7 +214,7 @@
{% if hasRole('owner') %} {% if hasRole('owner') %}
<li class="{{ activeRoutePartial('admin') }}"> <li class="{{ activeRoutePartial('admin') }}">
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"> <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'administration'|_ }}</span> <span>{{ 'administration'|_ }}</span>
</a> </a>
</li> </li>
@@ -224,7 +224,7 @@
{% if 'remote_user_guard' != authGuard or '' != logoutUri %} {% if 'remote_user_guard' != authGuard or '' != logoutUri %}
<li> <li>
<a href="{{ route('logout') }}"> <a href="{{ route('logout') }}">
<i class="fa fa-sign-out fa-fw"></i> <span class="fa fa-sign-out fa-fw"></span>
<span>{{ 'logout'|_ }}</span> <span>{{ 'logout'|_ }}</span>
</a> </a>
</li> </li>

4
resources/views/v1/partials/page-header.twig
View File

@@ -1,12 +1,12 @@
<h1> <h1>
{% if mainTitleIcon %} {% if mainTitleIcon %}
<i class="hidden-xs fa {{ mainTitleIcon }}"></i> <span class="hidden-xs fa {{ mainTitleIcon }}"></span>
{% endif %} {% endif %}
{{ title }} {{ title }}
{% if subTitle %} {% if subTitle %}
<small id="subTitle"> <small id="subTitle">
{% if subTitleIcon %} {% if subTitleIcon %}
<i class="hidden-xs fa {{ subTitleIcon }}"></i> <span class="hidden-xs fa {{ subTitleIcon }}"></span>
{% endif %} {% endif %}
{{ subTitle }} {{ subTitle }}
</small> </small>

4
resources/views/v1/piggy-banks/index.twig
View File

@@ -16,12 +16,12 @@
</div> </div>
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_piggy_bank'|_ }}</a> <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
</div> </div>
{% include 'v1.list/piggy-banks' %} {% include 'v1.list/piggy-banks' %}
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_piggy_bank'|_ }}</a> <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

6
resources/views/v1/piggy-banks/show.twig
View File

@@ -22,10 +22,10 @@
<h3 class="box-title">{{ 'details'|_ }}</h3> <h3 class="box-title">{{ 'details'|_ }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('piggy-banks.edit', piggy.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('piggy-banks.edit', piggy.id) }}"><span class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('piggy-banks.delete', piggy.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('piggy-banks.delete', piggy.id) }}"><span class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>

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

@@ -15,14 +15,14 @@
{# Hide budgets? #} {# Hide budgets? #}
{% if not hideBudget %} {% if not hideBudget %}
<th class="hidden-xs"> <th class="hidden-xs">
<i class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i> <span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></span>
</th> </th>
{% endif %} {% endif %}
{# Hide categories? #} {# Hide categories? #}
{% if not hideCategory %} {% if not hideCategory %}
<th class="hidden-xs"> <th class="hidden-xs">
<i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i> <span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@@ -39,15 +39,15 @@
<tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}"> <tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}">
<td class="hidden-xs"> <td class="hidden-xs">
{% if transaction.transaction_type_type == 'Withdrawal' %} {% if transaction.transaction_type_type == 'Withdrawal' %}
<i class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></i> <span class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Deposit' %} {% if transaction.transaction_type_type == 'Deposit' %}
<i class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Transfer' %} {% if transaction.transaction_type_type == 'Transfer' %}
<i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if transaction.transaction_type_type == 'Reconciliation' %} {% if transaction.transaction_type_type == 'Reconciliation' %}

82
resources/views/v1/profile/index.twig
View File

@@ -86,8 +86,8 @@
<p> <p>
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<button type="submit" class="btn btn-danger btn-xs"><i <button type="submit" class="btn btn-danger btn-xs"><span
class="fa fa-refresh"></i> {{ 'regenerate_command_line_token'|_ }} class="fa fa-refresh"></span> {{ 'regenerate_command_line_token'|_ }}
</button> </button>
</p> </p>
</form> </form>
@@ -113,21 +113,21 @@
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-info" href="{{ route('profile.code') }}"> <a class="btn btn-info" href="{{ route('profile.code') }}">
<i class="fa fa-recycle"></i> <span class="fa fa-recycle"></span>
{{ 'pref_two_factor_auth_reset_code'|_ }}</a> {{ 'pref_two_factor_auth_reset_code'|_ }}</a>
<a class="btn btn-default" href="{{ route('profile.new-backup-codes') }}"> <a class="btn btn-default" href="{{ route('profile.new-backup-codes') }}">
<i class="fa fa-star"></i> <span class="fa fa-star"></span>
{{ 'pref_two_factor_new_backup_codes'|_ }}</a> {{ 'pref_two_factor_new_backup_codes'|_ }}</a>
<a class="btn btn-danger" href="{{ route('profile.delete-code') }}"> <a class="btn btn-danger" href="{{ route('profile.delete-code') }}">
<i class="fa fa-trash"></i> <span class="fa fa-trash"></span>
{{ 'pref_two_factor_auth_disable_2fa'|_ }}</a> {{ 'pref_two_factor_auth_disable_2fa'|_ }}</a>
</div> </div>
{% else %} {% else %}
<p> <p>
<form action="{{ route('profile.enable2FA') }}" method="post"> <form action="{{ route('profile.enable2FA') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<button type="submit" class="btn btn-info"><i <button type="submit" class="btn btn-info"><span
class="fa fa-lock"></i> {{ 'pref_enable_two_factor_auth'|_ }}</button> class="fa fa-lock"></span> {{ 'pref_enable_two_factor_auth'|_ }}</button>
</form> </form>
</p> </p>
{% endif %} {% endif %}
@@ -148,48 +148,48 @@
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_budgets')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_budgets')|escape('html') }}"
data-type="budgets" class="confirm btn btn-danger btn-sm"><i data-type="budgets" class="confirm btn btn-danger btn-sm"><span
class="fa fa-pie-chart"></i> {{ 'delete_all_budgets'|_ }}</button> class="fa fa-pie-chart"></span> {{ 'delete_all_budgets'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_bills')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_bills')|escape('html') }}"
data-type="bills" class="confirm btn btn-danger btn-sm"><i data-type="bills" class="confirm btn btn-danger btn-sm"><span
class="fa fa-calendar-o"></i> {{ 'delete_all_bills'|_ }}</button> class="fa fa-calendar-o"></span> {{ 'delete_all_bills'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_piggy_banks')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_piggy_banks')|escape('html') }}"
data-type="piggy_banks" class="confirm btn btn-danger btn-sm"><i data-type="piggy_banks" class="confirm btn btn-danger btn-sm"><span
class="fa fa-bullseye"></i> {{ 'delete_all_piggy_banks'|_ }}</button> class="fa fa-bullseye"></span> {{ 'delete_all_piggy_banks'|_ }}</button>
</p> </p>
<h4>{{ 'automation'|_ }}</h4> <h4>{{ 'automation'|_ }}</h4>
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_rules')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_rules')|escape('html') }}"
data-type="rules" class="confirm btn btn-danger btn-sm"><i data-type="rules" class="confirm btn btn-danger btn-sm"><span
class="fa fa-random"></i> {{ 'delete_all_rules'|_ }}</button> class="fa fa-random"></span> {{ 'delete_all_rules'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_recurring')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_recurring')|escape('html') }}"
data-type="recurring" class="confirm btn btn-danger btn-sm"><i data-type="recurring" class="confirm btn btn-danger btn-sm"><span
class="fa fa-paint-brush"></i> {{ 'delete_all_recurring'|_ }}</button> class="fa fa-paint-brush"></span> {{ 'delete_all_recurring'|_ }}</button>
</p> </p>
<h4>{{ 'classification'|_ }}</h4> <h4>{{ 'classification'|_ }}</h4>
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_categories')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_categories')|escape('html') }}"
data-type="categories" class="confirm btn btn-danger btn-sm"><i data-type="categories" class="confirm btn btn-danger btn-sm"><span
class="fa fa-bookmark"></i> {{ 'delete_all_categories'|_ }}</button> class="fa fa-bookmark"></span> {{ 'delete_all_categories'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_tags')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_tags')|escape('html') }}"
data-type="tags" class="confirm btn btn-danger btn-sm"><i data-type="tags" class="confirm btn btn-danger btn-sm"><span
class="fa fa-tag"></i> {{ 'delete_all_tags'|_ }}</button> class="fa fa-tag"></span> {{ 'delete_all_tags'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_object_groups')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_object_groups')|escape('html') }}"
data-type="object_groups" class="confirm btn btn-danger btn-sm"><i data-type="object_groups" class="confirm btn btn-danger btn-sm"><span
class="fa fa-envelope-o"></i> {{ 'delete_all_object_groups'|_ }}</button> class="fa fa-envelope-o"></span> {{ 'delete_all_object_groups'|_ }}</button>
</p> </p>
<h4>{{ 'accounts'|_ }}</h4> <h4>{{ 'accounts'|_ }}</h4>
@@ -199,54 +199,54 @@
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_accounts')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_accounts')|escape('html') }}"
data-type="accounts" class="confirm btn btn-danger btn-sm"><i data-type="accounts" class="confirm btn btn-danger btn-sm"><span
class="fa fa-credit-card"></i> {{ 'delete_all_accounts'|_ }}</button> class="fa fa-credit-card"></span> {{ 'delete_all_accounts'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_asset_accounts')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_asset_accounts')|escape('html') }}"
data-type="asset_accounts" class="confirm btn btn-danger btn-sm"><i data-type="asset_accounts" class="confirm btn btn-danger btn-sm"><span
class="fa fa-money"></i> {{ 'delete_all_asset_accounts'|_ }}</button> class="fa fa-money"></span> {{ 'delete_all_asset_accounts'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_expense_accounts')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_expense_accounts')|escape('html') }}"
data-type="expense_accounts" class="confirm btn btn-danger btn-sm"><i data-type="expense_accounts" class="confirm btn btn-danger btn-sm"><span
class="fa fa-shopping-cart"></i> {{ 'delete_all_expense_accounts'|_ }}</button> class="fa fa-shopping-cart"></span> {{ 'delete_all_expense_accounts'|_ }}</button>
</p> </p>
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_revenue_accounts')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_revenue_accounts')|escape('html') }}"
data-type="revenue_accounts" class="confirm btn btn-danger btn-sm"><i data-type="revenue_accounts" class="confirm btn btn-danger btn-sm"><span
class="fa fa-download"></i> {{ 'delete_all_revenue_accounts'|_ }}</button> class="fa fa-download"></span> {{ 'delete_all_revenue_accounts'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_liabilities')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_liabilities')|escape('html') }}"
data-type="liabilities" class="confirm btn btn-danger btn-sm"><i data-type="liabilities" class="confirm btn btn-danger btn-sm"><span
class="fa fa-ticket"></i> {{ 'delete_all_liabilities'|_ }}</button> class="fa fa-ticket"></span> {{ 'delete_all_liabilities'|_ }}</button>
</p> </p>
<h4>{{ 'transactions'|_ }}</h4> <h4>{{ 'transactions'|_ }}</h4>
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_transactions')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_transactions')|escape('html') }}"
data-type="transactions" class="confirm btn btn-danger btn-sm"><i data-type="transactions" class="confirm btn btn-danger btn-sm"><span
class="fa fa-exchange"></i> {{ 'delete_all_transactions'|_ }}</button> class="fa fa-exchange"></span> {{ 'delete_all_transactions'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_withdrawals')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_withdrawals')|escape('html') }}"
data-type="withdrawals" class="confirm btn btn-danger btn-sm"><i data-type="withdrawals" class="confirm btn btn-danger btn-sm"><span
class="fa fa-long-arrow-left"></i> {{ 'delete_all_withdrawals'|_ }}</button> class="fa fa-long-arrow-left"></span> {{ 'delete_all_withdrawals'|_ }}</button>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_deposits')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_deposits')|escape('html') }}"
data-type="deposits" class="confirm btn btn-danger btn-sm"><i data-type="deposits" class="confirm btn btn-danger btn-sm"><span
class="fa fa-long-arrow-right"></i> {{ 'delete_all_deposits'|_ }}</button> class="fa fa-long-arrow-right"></span> {{ 'delete_all_deposits'|_ }}</button>
</p> </p>
<p> <p>
<button type="button" <button type="button"
data-success="{{ trans('firefly.deleted_all_transfers')|escape('html') }}" data-success="{{ trans('firefly.deleted_all_transfers')|escape('html') }}"
data-type="transfers" class="confirm btn btn-danger btn-sm"><i data-type="transfers" class="confirm btn btn-danger btn-sm"><span
class="fa fa-exchange"></i> {{ 'delete_all_transfers'|_ }}</button> class="fa fa-exchange"></span> {{ 'delete_all_transfers'|_ }}</button>
</p> </p>
</div> </div>
</div> </div>

18
resources/views/v1/recurring/index.twig
View File

@@ -16,9 +16,9 @@
</h3> </h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('recurring.create') }}"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_recurring')|_ }}</a></li> <li><a href="{{ route('recurring.create') }}"><span class="fa fa-plus fa-fw"></span> {{ ('make_new_recurring')|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -26,7 +26,7 @@
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a href="{{ route('recurring.create') }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_recurring')|_ }} <a href="{{ route('recurring.create') }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ ('make_new_recurring')|_ }}
</a> </a>
</div> </div>
@@ -49,15 +49,15 @@
<tr> <tr>
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
<div class="btn-group btn-group-xs edit_tr_buttons"> <div class="btn-group btn-group-xs edit_tr_buttons">
<a class="btn btn-default btn-xs" title="{{ 'edit'|_ }}" href="{{ route('recurring.edit',rt.id) }}"><i <a class="btn btn-default btn-xs" title="{{ 'edit'|_ }}" href="{{ route('recurring.edit',rt.id) }}"><span
class="fa fa-fw fa-pencil"></i></a><a class="btn btn-danger btn-xs" title="{{ 'delete'|_ }}" class="fa fa-fw fa-pencil"></span></a><a class="btn btn-danger btn-xs" title="{{ 'delete'|_ }}"
href="{{ route('recurring.delete',rt.id) }}"><i href="{{ route('recurring.delete',rt.id) }}"><span
class="fa fa-fw fa-trash-o"></i></a> class="fa fa-fw fa-trash-o"></span></a>
</div> </div>
</td> </td>
<td data-value="{{ rt.title }}"> <td data-value="{{ rt.title }}">
{% if rt.attachments > 0 %} {% if rt.attachments > 0 %}
<i class="fa fa-fw fa-paperclip"></i> <span class="fa fa-fw fa-paperclip"></span>
{% endif %} {% endif %}
{% if rt.active == false %}<s>{% endif %} {% if rt.active == false %}<s>{% endif %}
{{ rt.type|_ }}: {{ rt.type|_ }}:
@@ -146,7 +146,7 @@
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('recurring.create') }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_recurring')|_ }}</a> <a href="{{ route('recurring.create') }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ ('make_new_recurring')|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

4
resources/views/v1/recurring/show.twig
View File

@@ -37,8 +37,8 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<div class="btn-group"> <div class="btn-group">
<a href="{{ route('recurring.edit', [array.id]) }}" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> {{ 'edit'|_ }}</a> <a href="{{ route('recurring.edit', [array.id]) }}" class="btn btn-sm btn-default"><span class="fa fa-pencil"></span> {{ 'edit'|_ }}</a>
<a href="{{ route('recurring.delete', [array.id]) }}" class="btn btn-sm btn-danger">{{ 'delete'|_ }} <i class="fa fa-trash"></i></a> <a href="{{ route('recurring.delete', [array.id]) }}" class="btn btn-sm btn-danger">{{ 'delete'|_ }} <span class="fa fa-trash"></span></a>
</div> </div>
</div> </div>
</div> </div>

10
resources/views/v1/reports/budget/month.twig
View File

@@ -16,7 +16,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -29,7 +29,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -126,7 +126,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -140,7 +140,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

14
resources/views/v1/reports/category/month.twig
View File

@@ -16,7 +16,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -29,7 +29,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -164,7 +164,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -177,7 +177,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -192,7 +192,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -205,7 +205,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

16
resources/views/v1/reports/default/month.twig
View File

@@ -31,7 +31,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -61,7 +61,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -74,7 +74,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -91,7 +91,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
@@ -105,7 +105,7 @@
<div class="box-body table-responsive no-padding" id="categoryReport"></div> <div class="box-body table-responsive no-padding" id="categoryReport"></div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -120,7 +120,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
@@ -135,7 +135,7 @@
<div class="box-body table-responsive no-padding" id="billReport"></div> <div class="box-body table-responsive no-padding" id="billReport"></div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

14
resources/views/v1/reports/default/multi-year.twig
View File

@@ -31,7 +31,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -61,7 +61,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -75,7 +75,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -112,7 +112,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -145,7 +145,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -162,7 +162,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

14
resources/views/v1/reports/default/year.twig
View File

@@ -31,7 +31,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -61,7 +61,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -74,7 +74,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -110,7 +110,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -143,7 +143,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -160,7 +160,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

12
resources/views/v1/reports/double/report.twig
View File

@@ -15,7 +15,7 @@
<div class="box-body table-responsive no-padding" id="opsAccounts"> <div class="box-body table-responsive no-padding" id="opsAccounts">
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -29,7 +29,7 @@
<div class="box-body table-responsive no-padding" id="opsAccountsAsset"> <div class="box-body table-responsive no-padding" id="opsAccountsAsset">
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -139,7 +139,7 @@
<div class="box-body table-responsive no-padding" id="topExpensesHolder"> <div class="box-body table-responsive no-padding" id="topExpensesHolder">
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -153,7 +153,7 @@
<div class="box-body table-responsive no-padding" id="topIncomeHolder"> <div class="box-body table-responsive no-padding" id="topIncomeHolder">
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -170,7 +170,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -183,7 +183,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/v1/reports/index.twig
View File

@@ -96,7 +96,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>

4
resources/views/v1/reports/partials/balance.twig
View File

@@ -27,7 +27,7 @@
data-budget-id="{{ budget.budget_id }}" data-budget-id="{{ budget.budget_id }}"
data-account-id="{{ account.id }}" data-account-id="{{ account.id }}"
data-currency-id="{{ budget.spent[account.id].currency_id }}" data-currency-id="{{ budget.spent[account.id].currency_id }}"
class="fa fa-fw fa-info-circle text-muted firefly-info-button"></i> class="fa fa-fw fa-info-circle text-muted firefly-info-button"></span>
</td> </td>
{% else %} {% else %}
{% if report.accounts[account.id].sum != 0 %} {% if report.accounts[account.id].sum != 0 %}
@@ -38,7 +38,7 @@
{% endfor %} {% endfor %}
<td style="text-align: right;"> <td style="text-align: right;">
{% for sum in report.sums[budget.budget_id] %} {% for sum in report.sums[budget.budget_id] %}
{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }} <i class="fa fa-fw fa-info-circle text-muted"></i> {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }} <span class="fa fa-fw fa-info-circle text-muted"></span>
<br/> <br/>
{% endfor %} {% endfor %}
</td> </td>

4
resources/views/v1/reports/partials/budget-period.twig
View File

@@ -14,9 +14,9 @@
<tr> <tr>
<td data-value="{{ info.name }}"> <td data-value="{{ info.name }}">
{% if info.id != 0 %} {% if info.id != 0 %}
<a class="btn btn-default btn-xs" href="{{ route('budgets.show', [info.id]) }}"><i class="fa fa-external-link"></i></a> <a class="btn btn-default btn-xs" href="{{ route('budgets.show', [info.id]) }}"><span class="fa fa-external-link"></span></a>
{% else %} {% else %}
<a class="btn btn-default btn-xs" href="{{ route('budgets.no-budget') }}"><i class="fa fa-external-link"></i></a> <a class="btn btn-default btn-xs" href="{{ route('budgets.no-budget') }}"><span class="fa fa-external-link"></span></a>
{% endif %} {% endif %}
</td> </td>
<td data-value="{{ info.name }}"> <td data-value="{{ info.name }}">

4
resources/views/v1/reports/partials/budgets.twig
View File

@@ -60,8 +60,8 @@
<!-- info button, not visible on mobile --> <!-- info button, not visible on mobile -->
<td class="hidden-xs"> <td class="hidden-xs">
{% if budget_limit.spent != 0 %} {% if budget_limit.spent != 0 %}
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" <span class="fa fa-fw text-muted fa-info-circle firefly-info-button"
data-location="budget-spent-amount" data-currency-id="{{ budget_limit.currency_id }}" data-budget-id="{{ budget.budget_id }}"></i> data-location="budget-spent-amount" data-currency-id="{{ budget_limit.currency_id }}" data-budget-id="{{ budget.budget_id }}"></span>
{% endif %} {% endif %}
</td> </td>

4
resources/views/v1/reports/partials/categories.twig
View File

@@ -22,8 +22,8 @@
<td data-value="{{ category.earned }}" style="text-align: right;">{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td> <td data-value="{{ category.earned }}" style="text-align: right;">{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td>
<td data-value="{{ category.sum }}" style="text-align: right;">{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td> <td data-value="{{ category.sum }}" style="text-align: right;">{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td>
<td style="width:20px;"> <td style="width:20px;">
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button" data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}" <span class="fa fa-fw fa-info-circle text-muted firefly-info-button" data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}"
></i> ></span>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

4
resources/views/v1/reports/partials/category-period.twig
View File

@@ -13,9 +13,9 @@
<tr> <tr>
<td data-value="{{ info.title }}"> <td data-value="{{ info.title }}">
{% if info.id != 0 %} {% if info.id != 0 %}
<a class="btn btn-default btn-xs" href="{{ route('categories.show', [info.id]) }}"><i class="fa fa-external-link"></i></a> <a class="btn btn-default btn-xs" href="{{ route('categories.show', [info.id]) }}"><span class="fa fa-external-link"></span></a>
{% else %} {% else %}
<a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link"></i></a> <a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><span class="fa fa-external-link"></span></a>
{% endif %} {% endif %}
</td> </td>
<td data-value="{{ info.title }}"> <td data-value="{{ info.title }}">

4
resources/views/v1/reports/partials/income-expenses.twig
View File

@@ -34,8 +34,8 @@
{% endif %} {% endif %}
</td> </td>
<td> <td>
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="{{ type }}" <span class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="{{ type }}"
data-account-id="{{ account.id }}" data-currency-id="{{ account.currency_id }}"></i> data-account-id="{{ account.id }}" data-currency-id="{{ account.currency_id }}"></span>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

18
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-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i></th> <th class="hide-budget"><span class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></span></th>
<th class="hide-category"><i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i></th> <th class="hide-category"><span class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></span></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) #}
@@ -38,30 +38,30 @@
<td class="hide-buttons"> <td class="hide-buttons">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('transactions.edit',journal.transaction_group_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a> <a href="{{ route('transactions.edit',journal.transaction_group_id) }}" class="btn btn-xs btn-default"><span class="fa fa-fw fa-pencil"></span></a>
<a href="{{ route('transactions.delete',journal.transaction_group_id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a> <a href="{{ route('transactions.delete',journal.transaction_group_id) }}" class="btn btn-xs btn-danger"><span class="fa fa-fw fa-trash-o"></span></a>
</div> </div>
</td> </td>
<td class="hide-icon"> <td class="hide-icon">
{% if journal.transaction_type_type == 'Withdrawal' %} {% if journal.transaction_type_type == 'Withdrawal' %}
<i class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></i> <span class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Deposit' %} {% if journal.transaction_type_type == 'Deposit' %}
<i class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Transfer' %} {% if journal.transaction_type_type == 'Transfer' %}
<i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %} {% if journal.transaction_type_type == 'Reconciliation' %}
<i class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></i> <span class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Opening balance' %} {% if journal.transaction_type_type == 'Opening balance' %}
<i class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></i> <span class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></span>
{% endif %} {% endif %}
</td> </td>

14
resources/views/v1/reports/tag/month.twig
View File

@@ -16,7 +16,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -29,7 +29,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -195,7 +195,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -208,7 +208,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -223,7 +223,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>
@@ -236,7 +236,7 @@
</div> </div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
</div> </div>
</div> </div>

36
resources/views/v1/rules/index.twig
View File

@@ -34,23 +34,23 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i> <button type="button" class="btn btn-box-tool" data-widget="collapse"><span class="fa fa-minus"></span>
</button> </button>
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
class="fa fa-ellipsis-v"></i></button> class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><span class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><i class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><span class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li><a href="{{ route('rule-groups.select-transactions',ruleGroup.id) }}"><i <li><a href="{{ route('rule-groups.select-transactions',ruleGroup.id) }}"><span
class="fa fa-fw fa-power-off"></i> {{ trans('firefly.apply_rule_group_selection', {title: ruleGroup.title}) }} class="fa fa-fw fa-power-off"></span> {{ trans('firefly.apply_rule_group_selection', {title: ruleGroup.title}) }}
</a></li> </a></li>
{% if ruleGroup.order > 1 %} {% if ruleGroup.order > 1 %}
<li><a href="{{ route('rule-groups.up',ruleGroup.id) }}"><i <li><a href="{{ route('rule-groups.up',ruleGroup.id) }}"><span
class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a></li> class="fa fa-fw fa-arrow-up"></span> {{ 'move_rule_group_up'|_ }}</a></li>
{% endif %} {% endif %}
{% if ruleGroup.order < ruleGroups|length %} {% if ruleGroup.order < ruleGroups|length %}
<li><a href="{{ route('rule-groups.down',ruleGroup.id) }}"><i <li><a href="{{ route('rule-groups.down',ruleGroup.id) }}"><span
class="fa fa-fw fa-arrow-down"></i> {{ 'move_rule_group_down'|_ }} class="fa fa-fw fa-arrow-down"></span> {{ 'move_rule_group_down'|_ }}
</a></li> </a></li>
{% endif %} {% endif %}
</ul> </ul>
@@ -80,7 +80,7 @@
<tr class="single-rule" data-order="{{ rule.order }}" data-id="{{ rule.id }}" data-group-id="{{ ruleGroup.id }}" data-position="{{ loop.index0 }}"> <tr class="single-rule" data-order="{{ rule.order }}" data-id="{{ rule.id }}" data-group-id="{{ ruleGroup.id }}" data-position="{{ loop.index0 }}">
<td> <td>
<div class="btn-group btn-group-xs prio_buttons"> <div class="btn-group btn-group-xs prio_buttons">
<i class="fa fa-fw fa-bars rule-handle"></i> <span class="fa fa-fw fa-bars rule-handle"></span>
</div> </div>
</td> </td>
<td> <td>
@@ -98,14 +98,14 @@
<div class="btn-group btn-group-xs test_buttons"> <div class="btn-group btn-group-xs test_buttons">
{% if rule.active %} {% if rule.active %}
{# show which transactions would match #} {# show which transactions would match #}
<a href="{{ route('rules.search',rule.id) }}" class="btn btn-default {% if false == rule.strict %}test_rule_triggers{% endif %}" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><i data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></i></a> <a href="{{ route('rules.search',rule.id) }}" class="btn btn-default {% if false == rule.strict %}test_rule_triggers{% endif %}" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><i data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></span></a>
{# actually execute rule #} {# actually execute rule #}
<a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"><i class="fa fa-fw fa-power-off "></i></a> <a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"><span class="fa fa-fw fa-power-off "></span></a>
{% endif %} {% endif %}
{# duplicate rule #} {# duplicate rule #}
<a href="{{ route('rules.duplicate',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.duplicate_rule', {title: rule.title}) }}"><i class="fa fa-fw fa-copy"></i></a> <a href="{{ route('rules.duplicate',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.duplicate_rule', {title: rule.title}) }}"><span class="fa fa-fw fa-copy"></span></a>
</div> </div>
</td> </td>
<td class="markdown"> <td class="markdown">
@@ -115,7 +115,7 @@
<s>{{ rule.title }}</s> ({{ 'inactive'|_|lower }}) <s>{{ rule.title }}</s> ({{ 'inactive'|_|lower }})
{% endif %} {% endif %}
{% if rule.stop_processing %} {% if rule.stop_processing %}
<i class="fa fa-stop-circle-o"></i> <span class="fa fa-stop-circle-o"></span>
{% endif %} {% endif %}
{% if rule.description != "" %} {% if rule.description != "" %}
@@ -140,7 +140,7 @@
{{ trans(('firefly.rule_trigger_' ~ getRootSearchOperator(trigger.trigger_type)), {trigger_value: trigger.trigger_value}) }} {{ trans(('firefly.rule_trigger_' ~ getRootSearchOperator(trigger.trigger_type)), {trigger_value: trigger.trigger_value}) }}
{% if trigger.stop_processing %} {% if trigger.stop_processing %}
<i class="fa fa-stop-circle-o"></i> <span class="fa fa-stop-circle-o"></span>
{% endif %} {% endif %}
</li> </li>
{% endif %} {% endif %}
@@ -158,7 +158,7 @@
{% endif %} {% endif %}
data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }} data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}
{% if action.stop_processing %} {% if action.stop_processing %}
<i class="fa fa-stop-circle-o"></i> <span class="fa fa-stop-circle-o"></span>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}

2
resources/views/v1/rules/partials/action.twig
View File

@@ -1,6 +1,6 @@
<tr data-count="{{ count }}" class="rule-action-holder"> <tr data-count="{{ count }}" class="rule-action-holder">
<td style="width:40px;"> <td style="width:40px;">
<a href="#" class="btn btn-danger btn-sm remove-action"><i class="fa fa-trash"></i></a> <a href="#" class="btn btn-danger btn-sm remove-action"><span class="fa fa-trash"></span></a>
</td> </td>
<td style="width:30%;"> <td style="width:30%;">
{# todo error when invalid name. #} {# todo error when invalid name. #}

2
resources/views/v1/rules/partials/test-trigger-modal.twig
View File

@@ -7,7 +7,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="transaction-warning alert alert-warning"> <div class="transaction-warning alert alert-warning">
<h4><i class="icon fa fa-warning"></i> {{ 'flash_warning'|_ }}</h4> <h4><span class="icon fa fa-warning"></span> {{ 'flash_warning'|_ }}</h4>
<span class="warning-contents"></span> <span class="warning-contents"></span>
</div> </div>
<div class="transactions-list"> <div class="transactions-list">

2
resources/views/v1/rules/partials/trigger.twig
View File

@@ -1,6 +1,6 @@
<tr data-count="{{ count }}" class="rule-trigger-holder"> <tr data-count="{{ count }}" class="rule-trigger-holder">
<td style="width:40px;"> <td style="width:40px;">
<a href="#" class="btn btn-danger btn-sm remove-trigger"><i class="fa fa-trash"></i></a> <a href="#" class="btn btn-danger btn-sm remove-trigger"><span class="fa fa-trash"></span></a>
</td> </td>
<td style="width:30%;"> <td style="width:30%;">
<select name="triggers[{{ count }}][type]" class="form-control"> <select name="triggers[{{ count }}][type]" class="form-control">

2
resources/views/v1/rules/rule/create.twig
View File

@@ -83,7 +83,7 @@
<p> <p>
<br/> <br/>
<button type="button" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</button> <button type="button" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</button>
<a href="#" class="btn btn-default test_rule_triggers"><i class="fa fa-flask"></i> {{ 'test_rule_triggers'|_ }}</a> <a href="#" class="btn btn-default test_rule_triggers"><span class="fa fa-flask"></span> {{ 'test_rule_triggers'|_ }}</a>
</p> </p>
</div> </div>
</div> </div>

2
resources/views/v1/rules/rule/edit.twig
View File

@@ -65,7 +65,7 @@
<p> <p>
<br/> <br/>
<a href="#" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</a> <a href="#" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</a>
<a href="#" class="btn btn-default test_rule_triggers"><i class="fa fa-flask"></i> {{ 'test_rule_triggers'|_ }}</a> <a href="#" class="btn btn-default test_rule_triggers"><span class="fa fa-flask"></span> {{ 'test_rule_triggers'|_ }}</a>
</p> </p>
</div> </div>
</div> </div>

14
resources/views/v1/search/index.twig
View File

@@ -26,7 +26,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-1 col-sm-10"> <div class="col-sm-offset-1 col-sm-10">
<button type="submit" class="btn btn-info"><i class="fa fa-search"></i> {{ 'search'|_ }}</button> <button type="submit" class="btn btn-info"><span class="fa fa-search"></span> {{ 'search'|_ }}</button>
{% if ruleId > 0 and ruleChanged %} {% if ruleId > 0 and ruleChanged %}
<a href="{{ route('rules.edit', [ruleId]) }}?from_query={{ fullQuery }}" class="btn btn-default">{{ trans('firefly.update_rule_from_query', {rule: rule.title}) }}</a> <a href="{{ route('rules.edit', [ruleId]) }}?from_query={{ fullQuery }}" class="btn btn-default">{{ trans('firefly.update_rule_from_query', {rule: rule.title}) }}</a>
{% endif %} {% endif %}
@@ -68,23 +68,23 @@
<div class="search_results" style="display: none;"></div> <div class="search_results" style="display: none;"></div>
{# loading indicator #} {# loading indicator #}
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <span class="fa fa-refresh fa-spin"></span>
</div> </div>
<div class="row mass_edit_all hidden-xs" style="display: none;"> <div class="row mass_edit_all hidden-xs" style="display: none;">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="mass_button_options btn-group btn-group" style="display:none;"> <div class="mass_button_options btn-group btn-group" style="display:none;">
<a href="#" class="btn btn-default mass_edit"><i class="fa fa-fw fa-pencil"></i> <span>{{ 'edit_selected'|_ }}</span></a> <a href="#" class="btn btn-default mass_edit"><span class="fa fa-fw fa-pencil"></span> <span>{{ 'edit_selected'|_ }}</span></a>
<a href="#" class="btn btn-default bulk_edit"><span>{{ 'bulk_edit'|_ }}</span></a> <a href="#" class="btn btn-default bulk_edit"><span>{{ 'bulk_edit'|_ }}</span></a>
<a href="#" class="btn btn-danger mass_delete"><i class="fa fa-fw fa-trash"></i> <span>{{ 'delete_selected'|_ }}</span></a> <a href="#" class="btn btn-danger mass_delete"><span class="fa fa-fw fa-trash"></span> <span>{{ 'delete_selected'|_ }}</span></a>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 hidden-xs"> <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 hidden-xs">
<div class="mass_buttons btn-group btn-group pull-right"> <div class="mass_buttons btn-group btn-group pull-right">
<a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a> <a href="#" class="btn btn-default mass_select"><span class="fa fa-fw fa-check-square-o"></span> {{ 'select_transactions'|_ }}</a>
<a href="#" class="btn btn-default mass_stop_select" style="display:none;"><i class="fa faw-fw fa-square-o" <a href="#" class="btn btn-default mass_stop_select" style="display:none;"><span class="fa faw-fw fa-square-o"
></i> {{ 'stop_selection'|_ }}</a> ></span> {{ 'stop_selection'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

8
resources/views/v1/tags/index.twig
View File

@@ -11,7 +11,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p> <p>
<a class="btn btn-success" href="{{ route('tags.create') }}"><i class="fa fa-plus fa-fw"></i> {{ ('no_tags_create_default')|_ }}</a> <a class="btn btn-success" href="{{ route('tags.create') }}"><span class="fa fa-plus fa-fw"></span> {{ ('no_tags_create_default')|_ }}</a>
</p> </p>
</div> </div>
</div> </div>
@@ -37,7 +37,7 @@
style="font-weight: normal;font-size:0.9em;" style="font-weight: normal;font-size:0.9em;"
title="{{ tagInfo.created_at.formatLocalized(monthAndDayFormat) }}" title="{{ tagInfo.created_at.formatLocalized(monthAndDayFormat) }}"
href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<i class="fa fa-fw fa-map-marker"></i>{% endif %}<i class="fa fa-fw fa-tag"></i>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<i class="fa fa-fw fa-paperclip"></i>{% endif %}</a></div> href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="fa fa-fw fa-paperclip"></span>{% endif %}</a></div>
{% endfor %} {% endfor %}
</div> </div>
@@ -60,9 +60,9 @@
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p> <p>
<a class="btn btn-success" href="{{ route('tags.create') }}"><i class="fa fa-plus fa-fw"></i> {{ ('no_tags_create_default')|_ }}</a> <a class="btn btn-success" href="{{ route('tags.create') }}"><span class="fa fa-plus fa-fw"></span> {{ ('no_tags_create_default')|_ }}</a>
<button type="submit" class="btn pull-right btn-danger" onclick="return confirm('{{ 'are_you_sure'|_|escape('js') }}');"> <button type="submit" class="btn pull-right btn-danger" onclick="return confirm('{{ 'are_you_sure'|_|escape('js') }}');">
<i class="fa fa-fw fa-trash"></i> {{ 'delete_all_selected_tags'|_ }} <span class="fa fa-fw fa-trash"></span> {{ 'delete_all_selected_tags'|_ }}
</button> </button>
</p> </p>
</div> </div>

48
resources/views/v1/tags/show.twig
View File

@@ -14,14 +14,14 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
class="fa fa-ellipsis-v"></i></button> class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('tags.edit',tag.id) }}"><i <li><a href="{{ route('tags.edit',tag.id) }}"><span
class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }} class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
</a></li> </a></li>
<li><a href="{{ route('tags.delete',tag.id) }}"><i <li><a href="{{ route('tags.delete',tag.id) }}"><span
class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }} class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
</a></li> </a></li>
</ul> </ul>
</div> </div>
@@ -163,10 +163,10 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<div class="btn-group btn-group-sm"> <div class="btn-group btn-group-sm">
<a href="{{ route('tags.edit',tag.id) }}" class="btn btn-default"><i <a href="{{ route('tags.edit',tag.id) }}" class="btn btn-default"><span
class="fa fa-pencil fa-fw"></i></a> class="fa fa-pencil fa-fw"></span></a>
<a href="{{ route('tags.delete',tag.id) }}" class="btn btn-danger"><i <a href="{{ route('tags.delete',tag.id) }}" class="btn btn-danger"><span
class="fa fa-trash fa-fw"></i></a> class="fa fa-trash fa-fw"></span></a>
</div> </div>
<p class="text-muted"> <p class="text-muted">
<small>{{ 'sums_apply_to_range'|_ }}</small> <small>{{ 'sums_apply_to_range'|_ }}</small>
@@ -180,14 +180,14 @@
<h3 class="box-title">{{ 'location'|_ }}</h3> <h3 class="box-title">{{ 'location'|_ }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
class="fa fa-ellipsis-v"></i></button> class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('tags.edit',tag.id) }}"><i <li><a href="{{ route('tags.edit',tag.id) }}"><span
class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }} class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
</a></li> </a></li>
<li><a href="{{ route('tags.delete',tag.id) }}"><i <li><a href="{{ route('tags.delete',tag.id) }}"><span
class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }} class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
</a></li> </a></li>
</ul> </ul>
</div> </div>
@@ -237,14 +237,14 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
class="fa fa-ellipsis-v"></i></button> class="fa fa-ellipsis-v"></span></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('tags.edit',tag.id) }}"><i <li><a href="{{ route('tags.edit',tag.id) }}"><span
class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }} class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
</a></li> </a></li>
<li><a href="{{ route('tags.delete',tag.id) }}"><i <li><a href="{{ route('tags.delete',tag.id) }}"><span
class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }} class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
</a></li> </a></li>
</ul> </ul>
</div> </div>
@@ -255,14 +255,14 @@
{% if periods|length > 0 %} {% if periods|length > 0 %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('tags.show', [tag.id,'all']) }}"> <a href="{{ route('tags.show', [tag.id,'all']) }}">
{{ 'show_all_no_filter'|_ }} {{ 'show_all_no_filter'|_ }}
</a> </a>
</p> </p>
{% else %} {% else %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('tags.show', [tag.id]) }}"> <a href="{{ route('tags.show', [tag.id]) }}">
{{ 'show_the_current_period_and_overview'|_ }} {{ 'show_the_current_period_and_overview'|_ }}
</a> </a>

4
resources/views/v1/transactions/bulk/edit.twig
View File

@@ -78,7 +78,7 @@
{% for tag in journal.tags %} {% for tag in journal.tags %}
{% if 0 != tag.id %} {% if 0 != tag.id %}
<span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}"> <span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
<i class="fa fa-fw fa-tag"></i> <span class="fa fa-fw fa-tag"></span>
{{ tag.name }}</a> {{ tag.name }}</a>
</span> </span>
{% endif %} {% endif %}
@@ -86,7 +86,7 @@
</td> </td>
<td> <td>
{% if journal.journals_in_group > 1 %} {% if journal.journals_in_group > 1 %}
<i title="{{ 'part_of_split'|_ }}" class="text-danger fa fa-fw fa-exclamation-triangle"></i> <i title="{{ 'part_of_split'|_ }}" class="text-danger fa fa-fw fa-exclamation-triangle"></span>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

6
resources/views/v1/transactions/index.twig
View File

@@ -78,7 +78,7 @@
</div> </div>
<div class="box-body no-padding"> <div class="box-body no-padding">
<div style="padding:8px;"> <div style="padding:8px;">
<a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_transaction'|_ }}</a> <a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_transaction'|_ }}</a>
</div> </div>
{# actual list #} {# actual list #}
{% include 'v1.list.groups' %} {% include 'v1.list.groups' %}
@@ -87,12 +87,12 @@
{# links for other views #} {# links for other views #}
{% if periods|length > 0 %} {% if periods|length > 0 %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('transactions.index.all', [objectType]) }}">{{ 'show_all_no_filter'|_ }}</a> <a href="{{ route('transactions.index.all', [objectType]) }}">{{ 'show_all_no_filter'|_ }}</a>
</p> </p>
{% else %} {% else %}
<p> <p>
<i class="fa fa-calendar"></i> <span class="fa fa-calendar"></span>
<a href="{{ route('transactions.index', [objectType]) }}">{{ 'show_the_current_period_and_overview'|_ }}</a> <a href="{{ route('transactions.index', [objectType]) }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
</p> </p>
{% endif %} {% endif %}

10
resources/views/v1/transactions/mass/delete.twig
View File

@@ -41,22 +41,22 @@
</td> </td>
<td> <td>
{% if journal.transaction_type_type == 'Withdrawal' %} {% if journal.transaction_type_type == 'Withdrawal' %}
<i class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></i> <span class="fa fa-long-arrow-left fa-fw" title="{{ trans('firefly.Withdrawal') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Deposit' %} {% if journal.transaction_type_type == 'Deposit' %}
<i class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-long-arrow-right fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Transfer' %} {% if journal.transaction_type_type == 'Transfer' %}
<i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></i> <span class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %} {% if journal.transaction_type_type == 'Reconciliation' %}
<i class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></i> <span class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></span>
{% endif %} {% endif %}
{% if journal.transaction_type_type == 'Opening balance' %} {% if journal.transaction_type_type == 'Opening balance' %}
<i class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></i> <span class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></span>
{% endif %} {% endif %}
</td> </td>
<td> <td>

4
resources/views/v1/transactions/mass/edit.twig
View File

@@ -35,8 +35,8 @@
<tr> <tr>
<td> <td>
{# LINK TO EDIT FORM #} {# LINK TO EDIT FORM #}
<a href="{{ route('transactions.edit', journal.transaction_group_id) }}" class="btn btn-xs btn-default"><i <a href="{{ route('transactions.edit', journal.transaction_group_id) }}" class="btn btn-xs btn-default"><span
class="fa fa-fw fa-pencil"></i></a> class="fa fa-fw fa-pencil"></span></a>
<input type="hidden" name="journals[]" value="{{ journal.transaction_journal_id }}"/> <input type="hidden" name="journals[]" value="{{ journal.transaction_journal_id }}"/>
</td> </td>
<td> <td>

40
resources/views/v1/transactions/show.twig
View File

@@ -16,28 +16,28 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{# edit + delete #} {# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><i class="fa fa-pencil"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><i class="fa fa-trash"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
{# convert to different type #} {# convert to different type #}
{% if groupArray.transactions[0].type != 'withdrawal' %} {% if groupArray.transactions[0].type != 'withdrawal' %}
<li><a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><i class="fa fa-exchange"></i> {{ 'convert_to_withdrawal'|_ }}</a></li> <li><a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><span class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
{% endif %} {% endif %}
{% if groupArray.transactions[0].type != 'deposit' %} {% if groupArray.transactions[0].type != 'deposit' %}
<li><a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><i class="fa fa-exchange"></i> {{ 'convert_to_deposit'|_ }}</a></li> <li><a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><span class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
{% endif %} {% endif %}
{% if groupArray.transactions[0].type != 'transfer' %} {% if groupArray.transactions[0].type != 'transfer' %}
<li><a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><i class="fa fa-exchange"></i> {{ 'convert_to_transfer'|_ }}</a></li> <li><a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><span class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
{% endif %} {% endif %}
{# clone #} {# clone #}
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %} {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
<!-- since 5.1.0 --> <!-- since 5.1.0 -->
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="{{ route('transactions.clone', [transactionGroup.id]) }}"><i class="fa fa-copy"></i> {{ 'clone'|_ }}</a></li> <li><a href="{{ route('transactions.clone', [transactionGroup.id]) }}"><span class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
{% endif %} {% endif %}
</ul> </ul>
@@ -173,7 +173,7 @@
<h3 class="box-title"> <h3 class="box-title">
{{ journal.description }} {{ journal.description }}
{% if journal.reconciled %} {% if journal.reconciled %}
<i class="fa fa-check"></i> <span class="fa fa-check"></span>
{% endif %} {% endif %}
{% if splits > 1 %} {% if splits > 1 %}
<small> <small>
@@ -189,34 +189,34 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{# edit + delete #} {# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><i class="fa fa-pencil"></i> {{ 'edit'|_ }}</a></li> <li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><i class="fa fa-trash"></i> {{ 'delete'|_ }}</a></li> <li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
{# convert to different type #} {# convert to different type #}
{% if groupArray.transactions[0].type != 'withdrawal' %} {% if groupArray.transactions[0].type != 'withdrawal' %}
<li><a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><i class="fa fa-exchange"></i> {{ 'convert_to_withdrawal'|_ }}</a></li> <li><a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><span class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
{% endif %} {% endif %}
{% if groupArray.transactions[0].type != 'deposit' %} {% if groupArray.transactions[0].type != 'deposit' %}
<li><a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><i class="fa fa-exchange"></i> {{ 'convert_to_deposit'|_ }}</a></li> <li><a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><span class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
{% endif %} {% endif %}
{% if groupArray.transactions[0].type != 'transfer' %} {% if groupArray.transactions[0].type != 'transfer' %}
<li><a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><i class="fa fa-exchange"></i> {{ 'convert_to_transfer'|_ }}</a></li> <li><a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><span class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
{% endif %} {% endif %}
{# clone #} {# clone #}
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %} {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
<!-- since 5.1.0 --> <!-- since 5.1.0 -->
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="{{ route('transactions.clone', [transactionGroup.id]) }}"><i class="fa fa-copy"></i> {{ 'clone'|_ }}</a></li> <li><a href="{{ route('transactions.clone', [transactionGroup.id]) }}"><span class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
{% endif %} {% endif %}
<li><a href="#" class="link-modal" data-journal="{{ journal.transaction_journal_id }}"><i class="fa fa-fw fa-link"></i>{{ 'link_transaction'|_ }}</a></li> <li><a href="#" class="link-modal" data-journal="{{ journal.transaction_journal_id }}"><span class="fa fa-fw fa-link"></span>{{ 'link_transaction'|_ }}</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="{{ route('rules.create-from-journal', [journal.transaction_journal_id]) }}"><i class="fa fa-fw fa-random"></i>{{ 'create_rule_from_transaction'|_ }}</a></li> <li><a href="{{ route('rules.create-from-journal', [journal.transaction_journal_id]) }}"><span class="fa fa-fw fa-random"></span>{{ 'create_rule_from_transaction'|_ }}</a></li>
<li><a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><i class="fa fa-fw fa-paint-brush"></i>{{ 'create_recurring_from_transaction'|_ }}</a></li> <li><a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><span class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}</a></li>
</ul> </ul>
</div> </div>
@@ -336,7 +336,7 @@
<td> <td>
{% for tag in journal.tags %} {% for tag in journal.tags %}
<h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag.id) }}"> <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag.id) }}">
<i class="fa fa-fw fa-tag"></i>{{ tag.tag }}</a> <span class="fa fa-fw fa-tag"></span>{{ tag.tag }}</a>
</h4> </h4>
{% endfor %} {% endfor %}
</td> </td>
@@ -360,9 +360,9 @@
<tr> <tr>
<td style="width:120px;"> <td style="width:120px;">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><i <a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><span
class="fa fa-fw fa-arrows-h"></i></a> class="fa fa-fw fa-arrows-h"></span></a>
<a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a> <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><span class="fa fa-trash"></span></a>
</div> </div>
</td> </td>
<td>{{ trans('firefly.'~link.link) }} "<a href="{{ route('transactions.show', link.group) }}" <td>{{ trans('firefly.'~link.link) }} "<a href="{{ route('transactions.show', link.group) }}"

6
resources/views/v2/auth/login.twig
View File

@@ -5,7 +5,7 @@
<div class="row"> <div class="row">
<div class="alert alert-danger alert-dismissible"> <div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5> <h5><span class="icon fas fa-ban"></span> {{ 'flash_error'|_ }}</h5>
{{ errors.get('email')[0] }} {{ errors.get('email')[0] }}
</div> </div>
</div> </div>
@@ -16,7 +16,7 @@
<div class="row"> <div class="row">
<div class="alert alert-info alert-dismissible"> <div class="alert alert-info alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-info"></i> <h5><span class="icon fas fa-info"></span>
{{ session('logoutMessage') }} {{ session('logoutMessage') }}
</div> </div>
</div> </div>
@@ -31,7 +31,7 @@
{# demo site info #} {# demo site info #}
{% if IS_DEMO_SITE %} {% if IS_DEMO_SITE %}
<div class="callout callout-success"> <div class="callout callout-success">
<h5><i class="fas fa-info"></i> Firefly III demonstration website</h5> <h5><span class="fas fa-info"></span> Firefly III demonstration website</h5>
To log in, please use email address <code>{{ DEMO_USERNAME }}</code> and password <code>{{ DEMO_PASSWORD }}</code> To log in, please use email address <code>{{ DEMO_USERNAME }}</code> and password <code>{{ DEMO_PASSWORD }}</code>
</div> </div>
{% endif %} {% endif %}

2
resources/views/v2/auth/mfa.twig
View File

@@ -5,7 +5,7 @@
<div class="row"> <div class="row">
<div class="alert alert-danger alert-dismissible"> <div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5> <h5><span class="icon fas fa-ban"></span> {{ 'flash_error'|_ }}</h5>
{{ session('error') }} {{ session('error') }}
</div> </div>
</div> </div>

2
resources/views/v2/auth/passwords/email.twig
View File

@@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="alert alert-danger alert-dismissible"> <div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5> <h5><span class="icon fas fa-ban"></span> {{ 'flash_error'|_ }}</h5>
<p> <p>
{{ 'problems_with_input'|_ }} {{ 'problems_with_input'|_ }}
</p> </p>

2
resources/views/v2/auth/passwords/reset.twig
View File

@@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="alert alert-danger alert-dismissible"> <div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5> <h5><span class="icon fas fa-ban"></span> {{ 'flash_error'|_ }}</h5>
<p> <p>
{{ 'problems_with_input'|_ }} {{ 'problems_with_input'|_ }}
</p> </p>

2
resources/views/v2/auth/register.twig
View File

@@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="alert alert-info alert-dismissible"> <div class="alert alert-info alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-info"></i> {{ 'problems_with_input'|_ }}</h5> <h5><span class="icon fas fa-info"></span> {{ 'problems_with_input'|_ }}</h5>
<ul class="list-unstyled"> <ul class="list-unstyled">
{% for error in errors.all %} {% for error in errors.all %}
<li>{{ error }}</li> <li>{{ error }}</li>

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

@@ -46,9 +46,9 @@
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-6"> <div class="col-sm-6">
<h1 class="m-0 text-dark"> <h1 class="m-0 text-dark">
{% if mainTitleIcon|default(false) %}<i class="fa fas {{ mainTitleIcon }}"></i>{% endif %} {% if mainTitleIcon|default(false) %}<span class="fa fas {{ mainTitleIcon }}"></span>{% endif %}
{{ title }} <small class="text-muted"> {{ title }} <small class="text-muted">
{% if subTitleIcon|default(false) %}<i class="fa fas {{ subTitleIcon }}"></i>{% endif %} {% if subTitleIcon|default(false) %}<span class="fa fas {{ subTitleIcon }}"></span>{% endif %}
{{ subTitle|default('') }}</small></h1> {{ subTitle|default('') }}</small></h1>
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-sm-6"> <div class="col-sm-6">

4
resources/views/v2/partials/layout/flashes.twig
View File

@@ -5,7 +5,7 @@
<!-- alert from URL --> <!-- alert from URL -->
<div class="alert alert-success alert-dismissible"> <div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-thumbs-up"></i> {{ 'flash_success'|_ }}</h5> <h5><span class="icon fas fa-thumbs-up"></span> {{ 'flash_success'|_ }}</h5>
<span> <span>
{% if session_has('success_url') %} {% if session_has('success_url') %}
<a href="{{ session('success_url') }}"> <a href="{{ session('success_url') }}">
@@ -26,7 +26,7 @@
<!-- alert from URL --> <!-- alert from URL -->
<div class="alert alert-warning alert-dismissible"> <div class="alert alert-warning alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-exclamation-triangle"></i> {{ 'flash_warning'|_ }}</h5> <h5><span class="icon fas fa-exclamation-triangle"></span> {{ 'flash_warning'|_ }}</h5>
<span> <span>
{% if session_has('warning_url') %} {% if session_has('warning_url') %}
<a href="{{ session('warning_url') }}" style="color:rgb(31, 45, 61);"> <a href="{{ session('warning_url') }}" style="color:rgb(31, 45, 61);">

48
resources/views/v2/partials/layout/navbar.twig
View File

@@ -2,7 +2,7 @@
<!-- Left navbar links --> <!-- Left navbar links -->
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a> <a class="nav-link" data-widget="pushmenu" href="#" role="button"><span class="fas fa-bars"></span></a>
</li> </li>
</ul> </ul>
@@ -12,7 +12,7 @@
<input class="form-control form-control-navbar" name="search" type="search" placeholder="Search" aria-label="Search"> <input class="form-control form-control-navbar" name="search" type="search" placeholder="Search" aria-label="Search">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-navbar" type="submit"> <button class="btn btn-navbar" type="submit">
<i class="fas fa-search"></i> <span class="fas fa-search"></span>
</button> </button>
</div> </div>
</div> </div>
@@ -24,96 +24,96 @@
{# calendar thing, removed #} {# calendar thing, removed #}
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#"> <a class="nav-link" data-toggle="dropdown" href="#">
<i class="fas fa-cogs"></i> <span class="fas fa-cogs"></span>
</a> </a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<a href="{{ route('preferences.index') }}" class="dropdown-item"> <a href="{{ route('preferences.index') }}" class="dropdown-item">
<i class="fas fa-fw fa-cogs mr-2"></i> {{ 'preferences'|_ }} <span class="fas fa-fw fa-cogs mr-2"></span> {{ 'preferences'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('currencies.index') }}" class="dropdown-item"> <a href="{{ route('currencies.index') }}" class="dropdown-item">
<i class="fas fa-fw fa-euro-sign mr-2"></i> {{ 'currencies'|_ }} <span class="fas fa-fw fa-euro-sign mr-2"></span> {{ 'currencies'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('admin.index') }}" class="dropdown-item"> <a href="{{ route('admin.index') }}" class="dropdown-item">
<i class="fas fa-fw fa-envelope mr-2"></i> {{ 'administration'|_ }} <span class="fas fa-fw fa-envelope mr-2"></span> {{ 'administration'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="#" class="dropdown-item"> <a href="#" class="dropdown-item">
<i class="fas fa-fw fa-globe mr-2"></i> {{ 'webhooks'|_ }} <span class="fas fa-fw fa-globe mr-2"></span> {{ 'webhooks'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('export.index') }}" class="dropdown-item"> <a href="{{ route('export.index') }}" class="dropdown-item">
<i class="fas fa-fw fa-upload mr-2"></i> {{ 'export_data_menu'|_ }} <span class="fas fa-fw fa-upload mr-2"></span> {{ 'export_data_menu'|_ }}
</a> </a>
</div> </div>
</li> </li>
<!-- Notifications Dropdown Menu --> <!-- Notifications Dropdown Menu -->
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#"> <a class="nav-link" data-toggle="dropdown" href="#">
<i class="far fa-user"></i> <span class="far fa-user"></span>
</a> </a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<a href="{{ route('profile.index') }}" class="dropdown-item"> <a href="{{ route('profile.index') }}" class="dropdown-item">
<i class="fas fa-fw fa-user mr-2"></i> {{ 'profile'|_ }} <span class="fas fa-fw fa-user mr-2"></span> {{ 'profile'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('preferences.index') }}" class="dropdown-item"> <a href="{{ route('preferences.index') }}" class="dropdown-item">
<i class="fas fa-fw fa-cogs mr-2"></i> {{ 'preferences'|_ }} <span class="fas fa-fw fa-cogs mr-2"></span> {{ 'preferences'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('logout') }}" class="dropdown-item"> <a href="{{ route('logout') }}" class="dropdown-item">
<i class="fas fa-sign-out-alt mr-2"></i> {{ 'logout'|_ }} <span class="fas fa-sign-out-alt mr-2"></span> {{ 'logout'|_ }}
</a> </a>
</div> </div>
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#"> <a class="nav-link" data-toggle="dropdown" href="#">
<i class="far fa-plus-square"></i> <span class="far fa-plus-square"></span>
</a> </a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<a href="{{ route('transactions.create', 'withdrawal') }}" class="dropdown-item"> <a href="{{ route('transactions.create', 'withdrawal') }}" class="dropdown-item">
<i class="fas fa-long-arrow-alt-left nav-icon"></i> {{ 'new_withdrawal'|_ }} <span class="fas fa-long-arrow-alt-left nav-icon"></span> {{ 'new_withdrawal'|_ }}
</a> </a>
<a href="{{ route('transactions.create', 'deposit') }}" class="dropdown-item"> <a href="{{ route('transactions.create', 'deposit') }}" class="dropdown-item">
<i class="fas fa-long-arrow-alt-right nav-icon"></i> {{ 'new_deposit'|_ }} <span class="fas fa-long-arrow-alt-right nav-icon"></span> {{ 'new_deposit'|_ }}
</a> </a>
<a href="{{ route('transactions.create', 'transfer') }}" class="dropdown-item"> <a href="{{ route('transactions.create', 'transfer') }}" class="dropdown-item">
<i class="fas fa-exchange-alt nav-icon"></i> {{ 'new_transfer'|_ }} <span class="fas fa-exchange-alt nav-icon"></span> {{ 'new_transfer'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('budgets.create') }}" class="dropdown-item"> <a href="{{ route('budgets.create') }}" class="dropdown-item">
<i class="nav-icon fas fa-chart-pie"></i> {{ 'new_budget'|_ }} <span class="nav-icon fas fa-chart-pie"></span> {{ 'new_budget'|_ }}
</a> </a>
<a href="{{ route('bills.create') }}" class="dropdown-item"> <a href="{{ route('bills.create') }}" class="dropdown-item">
<i class="nav-icon far fa-calendar-alt"></i> {{ 'new_bill'|_ }} <span class="nav-icon far fa-calendar-alt"></span> {{ 'new_bill'|_ }}
</a> </a>
<a href="{{ route('piggy-banks.create') }}" class="dropdown-item"> <a href="{{ route('piggy-banks.create') }}" class="dropdown-item">
<i class="nav-icon fas fa-piggy-bank"></i> {{ 'new_piggy_bank'|_ }} <span class="nav-icon fas fa-piggy-bank"></span> {{ 'new_piggy_bank'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('rules.create') }}" class="dropdown-item"> <a href="{{ route('rules.create') }}" class="dropdown-item">
<i class="fas fa-random nav-icon"></i> {{ 'new_rule'|_ }} <span class="fas fa-random nav-icon"></span> {{ 'new_rule'|_ }}
</a> </a>
<a href="{{ route('recurring.create') }}" class="dropdown-item"> <a href="{{ route('recurring.create') }}" class="dropdown-item">
<i class="fas fa-magic nav-icon"></i> {{ 'new_recurring_transaction'|_ }} <span class="fas fa-magic nav-icon"></span> {{ 'new_recurring_transaction'|_ }}
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{ route('accounts.create', 'asset') }}" class="dropdown-item"> <a href="{{ route('accounts.create', 'asset') }}" class="dropdown-item">
<i class="far fa-money-bill-alt nav-icon"></i> {{ 'new_asset_account'|_ }} <span class="far fa-money-bill-alt nav-icon"></span> {{ 'new_asset_account'|_ }}
</a> </a>
<a href="{{ route('accounts.create', 'liabilities') }}" class="dropdown-item"> <a href="{{ route('accounts.create', 'liabilities') }}" class="dropdown-item">
<i class="fas fa-funnel-dollar nav-icon"></i> {{ 'new_liabilities_account'|_ }} <span class="fas fa-funnel-dollar nav-icon"></span> {{ 'new_liabilities_account'|_ }}
</a> </a>
</div> </div>
</li> </li>
<!-- here be dragons --> <!-- here be dragons -->
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button" title="{{ 'here_be_dragons'|_ }}"> <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button" title="{{ 'here_be_dragons'|_ }}">
<i class="fas fa-dragon"></i> <span class="fas fa-dragon"></span>
</a> </a>
</li> </li>
</ul> </ul>

50
resources/views/v2/partials/layout/sidebar.twig
View File

@@ -27,7 +27,7 @@
with font-awesome or any other icon font library --> with font-awesome or any other icon font library -->
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('index') }}" class="nav-link {{ activeRouteStrict('index') }}"> <a href="{{ route('index') }}" class="nav-link {{ activeRouteStrict('index') }}">
<i class="nav-icon fas fa-tachometer-alt"></i> <span class="nav-icon fas fa-tachometer-alt"></span>
<p> <p>
{{ 'dashboard'|_ }} {{ 'dashboard'|_ }}
</p> </p>
@@ -38,7 +38,7 @@
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('budgets.index') }}" class="nav-link {{ activeRoutePartial('budgets') }}"> <a href="{{ route('budgets.index') }}" class="nav-link {{ activeRoutePartial('budgets') }}">
<i class="nav-icon fas fa-chart-pie"></i> <span class="nav-icon fas fa-chart-pie"></span>
<p> <p>
{{ 'budgets'|_ }} {{ 'budgets'|_ }}
</p> </p>
@@ -47,7 +47,7 @@
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('bills.index') }}" class="nav-link {{ activeRoutePartial('bills') }}"> <a href="{{ route('bills.index') }}" class="nav-link {{ activeRoutePartial('bills') }}">
<i class="nav-icon far fa-calendar-alt"></i> <span class="nav-icon far fa-calendar-alt"></span>
<p> <p>
{{ 'bills'|_ }} {{ 'bills'|_ }}
</p> </p>
@@ -56,7 +56,7 @@
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('piggy-banks.index') }}" class="nav-link {{ activeRoutePartial('piggy-banks') }}"> <a href="{{ route('piggy-banks.index') }}" class="nav-link {{ activeRoutePartial('piggy-banks') }}">
<i class="nav-icon fas fa-piggy-bank"></i> <span class="nav-icon fas fa-piggy-bank"></span>
<p> <p>
{{ 'piggyBanks'|_ }} {{ 'piggyBanks'|_ }}
</p> </p>
@@ -67,28 +67,28 @@
<li class="nav-item has-treeview {{ menuOpenRoutePartial('transactions') }}"> <li class="nav-item has-treeview {{ menuOpenRoutePartial('transactions') }}">
<a href="#" class="nav-link"> <a href="#" class="nav-link">
<i class="nav-icon fas fa-exchange-alt"></i> <span class="nav-icon fas fa-exchange-alt"></span>
<p> <p>
{{ 'transactions'|_ }} {{ 'transactions'|_ }}
<i class="right fas fa-angle-left"></i> <span class="right fas fa-angle-left"></span>
</p> </p>
</a> </a>
<ul class="nav nav-treeview"> <ul class="nav nav-treeview">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('transactions.index', 'withdrawal') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'withdrawal') }}"> <a href="{{ route('transactions.index', 'withdrawal') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
<i class="fas fa-long-arrow-alt-left nav-icon"></i> <span class="fas fa-long-arrow-alt-left nav-icon"></span>
<p>{{ 'expenses'|_ }}</p> <p>{{ 'expenses'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('transactions.index', 'deposit') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'deposit') }}"> <a href="{{ route('transactions.index', 'deposit') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'deposit') }}">
<i class="fas fa-long-arrow-alt-right nav-icon"></i> <span class="fas fa-long-arrow-alt-right nav-icon"></span>
<p>{{ 'income'|_ }}</p> <p>{{ 'income'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('transactions.index', 'transfers') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'transfers') }}"> <a href="{{ route('transactions.index', 'transfers') }}" class="nav-link {{ activeRoutePartialObjectType('transactions', 'transfers') }}">
<i class="fas fa-exchange-alt nav-icon"></i> <span class="fas fa-exchange-alt nav-icon"></span>
<p>{{ 'transfers'|_ }}</p> <p>{{ 'transfers'|_ }}</p>
</a> </a>
</li> </li>
@@ -97,22 +97,22 @@
<li class="nav-item has-treeview {{ menuOpenRoutePartial('rules') }} {{ menuOpenRoutePartial('recurring') }}"> <li class="nav-item has-treeview {{ menuOpenRoutePartial('rules') }} {{ menuOpenRoutePartial('recurring') }}">
<a href="#" class="nav-link"> <a href="#" class="nav-link">
<i class="nav-icon fas fa-microchip"></i> <span class="nav-icon fas fa-microchip"></span>
<p> <p>
{{ 'automation'|_ }} {{ 'automation'|_ }}
<i class="right fas fa-angle-left"></i> <span class="right fas fa-angle-left"></span>
</p> </p>
</a> </a>
<ul class="nav nav-treeview"> <ul class="nav nav-treeview">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('rules.index') }}" class="nav-link {{ activeRoutePartial('rules') }}"> <a href="{{ route('rules.index') }}" class="nav-link {{ activeRoutePartial('rules') }}">
<i class="fas fa-random nav-icon"></i> <span class="fas fa-random nav-icon"></span>
<p>{{ 'rules'|_ }}</p> <p>{{ 'rules'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('recurring.index') }}" class="nav-link {{ activeRoutePartial('recurring') }}"> <a href="{{ route('recurring.index') }}" class="nav-link {{ activeRoutePartial('recurring') }}">
<i class="fas fa-magic nav-icon"></i> <span class="fas fa-magic nav-icon"></span>
<p>{{ 'recurrences'|_ }}</p> <p>{{ 'recurrences'|_ }}</p>
</a> </a>
</li> </li>
@@ -123,34 +123,34 @@
<li class="nav-item has-treeview {{ menuOpenRoutePartial('accounts') }}"> <li class="nav-item has-treeview {{ menuOpenRoutePartial('accounts') }}">
<a href="#" class="nav-link {{ activeRoutePartial('accounts') }}"> <a href="#" class="nav-link {{ activeRoutePartial('accounts') }}">
<i class="nav-icon fas fa-credit-card"></i> <span class="nav-icon fas fa-credit-card"></span>
<p> <p>
{{ 'accounts'|_ }} {{ 'accounts'|_ }}
<i class="right fas fa-angle-left"></i> <span class="right fas fa-angle-left"></span>
</p> </p>
</a> </a>
<ul class="nav nav-treeview"> <ul class="nav nav-treeview">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('accounts.index','asset') }}" class="nav-link {{ 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> <span class="far fa-money-bill-alt nav-icon"></span>
<p>{{ 'asset_accounts'|_ }}</p> <p>{{ 'asset_accounts'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('accounts.index','expense') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'expense') }}"> <a href="{{ route('accounts.index','expense') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'expense') }}">
<i class="fas fa-shopping-cart nav-icon"></i> <span class="fas fa-shopping-cart nav-icon"></span>
<p>{{ 'expense_accounts'|_ }}</p> <p>{{ 'expense_accounts'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('accounts.index','revenue') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'revenue') }}"> <a href="{{ route('accounts.index','revenue') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'revenue') }}">
<i class="fas fa-briefcase nav-icon"></i> <span class="fas fa-briefcase nav-icon"></span>
<p>{{ 'revenue_accounts'|_ }}</p> <p>{{ 'revenue_accounts'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('accounts.index','liabilities') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'liabilities') }}"> <a href="{{ route('accounts.index','liabilities') }}" class="nav-link {{ activeRoutePartialObjectType('accounts', 'liabilities') }}">
<i class="fas fa-funnel-dollar nav-icon"></i> <span class="fas fa-funnel-dollar nav-icon"></span>
<p>{{ 'liabilities_accounts'|_ }}</p> <p>{{ 'liabilities_accounts'|_ }}</p>
</a> </a>
</li> </li>
@@ -159,28 +159,28 @@
<li class="nav-item has-treeview {{ menuOpenRoutePartial('tags') }} {{ menuOpenRoutePartial('categories') }} {{ menuOpenRoutePartial('object-groups') }}"> <li class="nav-item has-treeview {{ menuOpenRoutePartial('tags') }} {{ menuOpenRoutePartial('categories') }} {{ menuOpenRoutePartial('object-groups') }}">
<a href="#" class="nav-link"> <a href="#" class="nav-link">
<i class="nav-icon fas fa-tags"></i> <span class="nav-icon fas fa-tags"></span>
<p> <p>
{{ 'classification'|_ }} {{ 'classification'|_ }}
<i class="right fas fa-angle-left"></i> <span class="right fas fa-angle-left"></span>
</p> </p>
</a> </a>
<ul class="nav nav-treeview"> <ul class="nav nav-treeview">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('categories.index') }}" class="nav-link {{ activeRoutePartial('categories') }}"> <a href="{{ route('categories.index') }}" class="nav-link {{ activeRoutePartial('categories') }}">
<i class="fas fa-bookmark nav-icon"></i> <span class="fas fa-bookmark nav-icon"></span>
<p>{{ 'categories'|_ }}</p> <p>{{ 'categories'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('tags.index') }}" class="nav-link {{ activeRoutePartial('tags') }}"> <a href="{{ route('tags.index') }}" class="nav-link {{ activeRoutePartial('tags') }}">
<i class="fas fa-tags nav-icon"></i> <span class="fas fa-tags nav-icon"></span>
<p>{{ 'tags'|_ }}</p> <p>{{ 'tags'|_ }}</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('object-groups.index') }}" class="nav-link {{ activeRoutePartial('object-groups') }}"> <a href="{{ route('object-groups.index') }}" class="nav-link {{ activeRoutePartial('object-groups') }}">
<i class="far fa-envelope nav-icon"></i> <span class="far fa-envelope nav-icon"></span>
<p>{{ 'object_groups_menu_bar'|_ }}</p> <p>{{ 'object_groups_menu_bar'|_ }}</p>
</a> </a>
</li> </li>
@@ -189,7 +189,7 @@
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('reports.index') }}" class="nav-link {{ activeRoutePartial('reports') }}"> <a href="{{ route('reports.index') }}" class="nav-link {{ activeRoutePartial('reports') }}">
<i class="nav-icon far fa-chart-bar"></i> <span class="nav-icon far fa-chart-bar"></span>
<p> <p>
{{ 'reports'|_ }} {{ 'reports'|_ }}
</p> </p>