kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-03 20:55:05 +00:00
Code Issues Projects Releases Wiki Activity

File reformatting.

Browse Source
This commit is contained in:
James Cole
2015-12-18 16:37:45 +01:00
parent e7562781f7
commit 813fb679a7
16 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/twig/auth/register.twig
View File

@@ -26,10 +26,10 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"> <input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="email" name="email" class="form-control" placeholder="Email" /> <input type="email" name="email" class="form-control" placeholder="Email"/>
{% if host == 'geld.nder.be' or host == 'firefly.app' %} {% if host == 'geld.nder.be' or host == 'firefly.app' %}
<p class="help-block">You will receive an email from Firefly III. If your email address <p class="help-block">You will receive an email from Firefly III. If your email address
is incorrect, your account may not work.</p> is incorrect, your account may not work.</p>
{% endif %} {% endif %}
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">

3
resources/twig/budgets/index.twig
View File

@@ -24,7 +24,8 @@
</div> </div>
<div class="col-lg-6 col-md-4 col-sm-3" style="text-align:right;"> <div class="col-lg-6 col-md-4 col-sm-3" style="text-align:right;">
<small>{{ trans('firefly.availableIn',{date : period }) }}: <small>{{ trans('firefly.availableIn',{date : period }) }}:
<a href="#" class="updateIncome"><span id="budgetIncomeTotal" data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a> <a href="#" class="updateIncome"><span id="budgetIncomeTotal"
data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a>
</small> </small>
</div> </div>
</div> </div>

10
resources/twig/budgets/show.twig
View File

@@ -45,7 +45,7 @@
{% for limit in limits %} {% for limit in limits %}
{% for rep in limit.limitRepetitions %} {% for rep in limit.limitRepetitions %}
{% set spentInRep = spentInRepetition(rep) %} {% set spentInRep = spentInRepetition(rep) %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('budgets.show',[budget.id,rep.id]) }}">{{ rep.startdate.formatLocalized(monthFormat) }}</a> <h3 class="box-title"><a href="{{ route('budgets.show',[budget.id,rep.id]) }}">{{ rep.startdate.formatLocalized(monthFormat) }}</a>
@@ -97,12 +97,12 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var budgetID = {{budget.id}}; var budgetID = {{ budget.id }};
{% if repetition.id %} {% if repetition.id %}
var repetitionID = {{repetition.id}}; var repetitionID = {{ repetition.id }};
var year = {{repetition.startdate.format('Y')}}; var year = {{ repetition.startdate.format('Y') }};
{% else %} {% else %}
var year = {{Session.get('start').format('Y')}}; var year = {{ Session.get('start').format('Y') }};
{% endif %} {% endif %}
</script> </script>

1
resources/twig/emails/registered-html.twig
View File

@@ -59,6 +59,7 @@
} }
</script> </script>
</body> </body>

2
resources/twig/errors/503.twig
View File

@@ -51,7 +51,7 @@
m.parentNode.insertBefore(a, m) m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto'); ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>

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

@@ -164,11 +164,11 @@
// date range picker configuration: // date range picker configuration:
var dateRangeConfig = { var dateRangeConfig = {
startDate: moment("{{Session.get('start').format('Y-m-d')}}"), startDate: moment("{{ Session.get('start').format('Y-m-d') }}"),
endDate: moment("{{Session.get('end').format('Y-m-d')}}"), endDate: moment("{{ Session.get('end').format('Y-m-d') }}"),
linkTitle: "{{Session.get('start').formatLocalized(monthAndDayFormat)}} - {{Session.get('end').formatLocalized(monthAndDayFormat)}}", linkTitle: "{{ Session.get('start').formatLocalized(monthAndDayFormat) }} - {{ Session.get('end').formatLocalized(monthAndDayFormat) }}",
URL: "{{route('daterange')}}", URL: "{{ route('daterange') }}",
firstDate: moment("{{Session.get('first').format('Y-m-d')}}"), firstDate: moment("{{ Session.get('first').format('Y-m-d') }}"),
currentMonth: "{{ currentMonthName }}", currentMonth: "{{ currentMonthName }}",
previousMonth: "{{ previousMonthName }}", previousMonth: "{{ previousMonthName }}",
nextMonth: "{{ nextMonthName }}", nextMonth: "{{ nextMonthName }}",
@@ -180,10 +180,10 @@
toLabel: '{{ 'to'|_ }}' toLabel: '{{ 'to'|_ }}'
}; };
var token = "{{csrf_token()}}"; var token = "{{ csrf_token() }}";
var language = "{{ language }}"; var language = "{{ language }}";
var currencyCode = '{{getCurrencyCode() }}'; var currencyCode = '{{ getCurrencyCode() }}';
var currencySymbol = '{{getCurrencySymbol()|raw }}'; var currencySymbol = '{{ getCurrencySymbol()|raw }}';
</script> </script>
@@ -205,17 +205,17 @@
a.src = g; a.src = g;
m.parentNode.insertBefore(a, m) m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
ga('send', 'pageview'); ga('send', 'pageview');
// send an event if relevant: // send an event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
{% endif %} {% endif %}
// send event if relevant: // send event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}'); ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
{% endif %} {% endif %}
</script> </script>
{% endif %} {% endif %}

6
resources/twig/layout/empty.twig
View File

@@ -62,17 +62,17 @@
a.src = g; a.src = g;
m.parentNode.insertBefore(a, m) m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
ga('send', 'pageview'); ga('send', 'pageview');
// send an event if relevant: // send an event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
{% endif %} {% endif %}
// send event if relevant: // send event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}'); ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
{% endif %} {% endif %}
</script> </script>
{% endif %} {% endif %}

6
resources/twig/layout/guest.twig
View File

@@ -63,17 +63,17 @@
a.src = g; a.src = g;
m.parentNode.insertBefore(a, m) m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
ga('send', 'pageview'); ga('send', 'pageview');
// send an event if relevant: // send an event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
{% endif %} {% endif %}
// send event if relevant: // send event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}'); ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
{% endif %} {% endif %}
</script> </script>
{% endif %} {% endif %}

36
resources/twig/list/journals.twig
View File

@@ -115,24 +115,24 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
<tfoot> <tfoot>
{% if showPageSum %} {% if showPageSum %}
<tr> <tr>
<td colspan="3" style="text-align: right;"><em>{{ 'sum'|_ }}</em></td> <td colspan="3" style="text-align: right;"><em>{{ 'sum'|_ }}</em></td>
<td colspan="2">{{ _sum|formatAmount }}</td> <td colspan="2">{{ _sum|formatAmount }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% if showPeriodSum %} {% if showPeriodSum %}
<tr> <tr>
<td colspan="3" style="text-align: right;"><em>{{ 'period_sum'|_ }}</em></td> <td colspan="3" style="text-align: right;"><em>{{ 'period_sum'|_ }}</em></td>
<td colspan="2">{{ periodSum|formatAmount }}</td> <td colspan="2">{{ periodSum|formatAmount }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% if showTotalSum %} {% if showTotalSum %}
<tr> <tr>
<td colspan="3" style="text-align: right;"><em>{{ 'total_sum'|_ }}</em></td> <td colspan="3" style="text-align: right;"><em>{{ 'total_sum'|_ }}</em></td>
<td colspan="2">{{ totalSum|formatAmount }}</td> <td colspan="2">{{ totalSum|formatAmount }}</td>
</tr> </tr>
{% endif %} {% endif %}
</tfoot> </tfoot>
</table> </table>

2
resources/twig/preferences/index.twig
View File

@@ -104,7 +104,7 @@
{% if language == key %} {% if language == key %}
checked checked
{% endif %} {% endif %}
/> />
{{ lang }} {{ lang }}
</label> </label>
</div> </div>

2
resources/twig/reports/default/year.twig
View File

@@ -102,7 +102,7 @@
<script type="text/javascript" src="js/Chart.StackedBar.js"></script> <script type="text/javascript" src="js/Chart.StackedBar.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var year = '{{start.year}}'; var year = '{{ start.year }}';
// to report another URL: // to report another URL:
var startDate = '{{ start.format('Ymd') }}'; var startDate = '{{ start.format('Ymd') }}';

7
resources/twig/reports/index.twig
View File

@@ -14,7 +14,7 @@
<div class="box-body"> <div class="box-body">
<form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post"> <form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}" /> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="form-group"> <div class="form-group">
<label for="inputReportType" class="col-sm-3 control-label">{{ 'report_type'|_ }}</label> <label for="inputReportType" class="col-sm-3 control-label">{{ 'report_type'|_ }}</label>
@@ -64,7 +64,8 @@
<ul class="list-inline"> <ul class="list-inline">
{% for month in data.months %} {% for month in data.months %}
<li> <li>
<a data-start="{{ month.start }}" data-end="{{ month.end }}" class="date-select" href="#">{{ month.formatted }}</a> <a data-start="{{ month.start }}" data-end="{{ month.end }}" class="date-select"
href="#">{{ month.formatted }}</a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
@@ -96,7 +97,7 @@
['default', ['default',
Session.get('start').startOfMonth.format('Ymd'), Session.get('start').startOfMonth.format('Ymd'),
Session.get('start').endOfMonth.format('Ymd'), Session.get('start').endOfMonth.format('Ymd'),
accountList accountList
]) }}">{{ 'report_this_month_quick'|_ }}</a> ]) }}">{{ 'report_this_month_quick'|_ }}</a>
</li> </li>
<li> <li>

6
resources/twig/tags/create.twig
View File

@@ -55,7 +55,7 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
{% if Input.old('latitude') %} {% if Input.old('latitude') %}
var latitude = "{{Input.old('latitude')}}"; var latitude = "{{ Input.old('latitude') }}";
{% else %} {% else %}
var latitude = "52.3167"; var latitude = "52.3167";
{% endif %} {% endif %}
@@ -67,13 +67,13 @@
{% endif %} {% endif %}
{% if Input.old('longitude') %} {% if Input.old('longitude') %}
var longitude = "{{Input.old('longitude')}}"; var longitude = "{{ Input.old('longitude') }}";
{% else %} {% else %}
var longitude = "5.5500"; var longitude = "5.5500";
{% endif %} {% endif %}
{% if Input.old('zoomLevel') %} {% if Input.old('zoomLevel') %}
var zoomLevel = {{Input.old('zoomLevel')}}; var zoomLevel = {{ Input.old('zoomLevel') }};
{% else %} {% else %}
var zoomLevel = 6; var zoomLevel = 6;
{% endif %} {% endif %}

6
resources/twig/tags/edit.twig
View File

@@ -59,7 +59,7 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
{% if Input.old('latitude') %} {% if Input.old('latitude') %}
var latitude = "{{Input.old('latitude')}}"; var latitude = "{{ Input.old('latitude') }}";
{% else %} {% else %}
var latitude = "52.3167"; var latitude = "52.3167";
{% endif %} {% endif %}
@@ -71,13 +71,13 @@
{% endif %} {% endif %}
{% if Input.old('longitude') %} {% if Input.old('longitude') %}
var longitude = "{{Input.old('longitude')}}"; var longitude = "{{ Input.old('longitude') }}";
{% else %} {% else %}
var longitude = "5.5500"; var longitude = "5.5500";
{% endif %} {% endif %}
{% if Input.old('zoomLevel') %} {% if Input.old('zoomLevel') %}
var zoomLevel = {{Input.old('zoomLevel')}}; var zoomLevel = {{ Input.old('zoomLevel') }};
{% else %} {% else %}
var zoomLevel = 6; var zoomLevel = 6;
{% endif %} {% endif %}

20
resources/twig/tags/show.twig
View File

@@ -19,8 +19,10 @@
<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"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li> <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
<li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li> </a></li>
<li><a href="{{ route('tags.delete',tag.id) }}"><i
class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -50,8 +52,10 @@
<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"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li> <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
<li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li> </a></li>
<li><a href="{{ route('tags.delete',tag.id) }}"><i
class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -80,8 +84,10 @@
<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"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li> <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
<li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li> </a></li>
<li><a href="{{ route('tags.delete',tag.id) }}"><i
class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -96,6 +102,6 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var tagID = {{tag.id}}; var tagID = {{ tag.id }};
</script> </script>
{% endblock %} {% endblock %}

2
resources/twig/transactions/edit.twig
View File

@@ -103,7 +103,7 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var what = "{{what}}"; var what = "{{ what }}";
</script> </script>
<script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script> <script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script> <script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>