kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Some updated templates [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-22 17:55:37 +02:00
parent e8b40518e0
commit 1ddaacbef5
13 changed files with 489 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/twig/accounts/create.twig
View File

@@ -45,19 +45,14 @@
<div class="box-body">
{{ ExpandedForm.optionsList('create','account') }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<button type="submit" class="btn btn-lg btn-success">
<i class="fa fa-plus-circle"></i> {{ ('store_new_' ~ what ~ '_account')|_ }}
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
{{ ('store_new_' ~ what ~ '_account')|_ }}
</button>
</p>
</div>
</div>
</div>
</div>
</form>
{% endblock %}

13
resources/twig/accounts/delete.twig
View File

@@ -17,14 +17,12 @@
<p class="text-danger">
{{ trans('form.permDeleteWarning') }}
</p>
<p>
{{ trans('form.account_areYouSure', {'name': account.name}) }}
</p>
<p>
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
<a href="{{URL.previous()}}" class="btn-default btn">{{ trans('form.cancel') }}</a >
</p>
<p class="small">
{% if account.transactions|length > 0 %}
{{ Lang.choice('form.also_delete_transactions', account.transactions|length, {count: account.transactions|length}) }}
{% endif %}<br/>
@@ -32,10 +30,15 @@
{{ Lang.choice('form.also_delete_piggyBanks', account.piggyBanks|length, {count: account.piggyBanks|length}) }}
{% endif %}
</p>
</div>
<div class="box-footer">
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>
<a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
</div>
</div>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}

14
resources/twig/accounts/edit.twig
View File

@@ -59,17 +59,13 @@
<div class="box-body">
{{ ExpandedForm.optionsList('update','account') }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<button type="submit" class="btn btn-lg btn-success">
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
{{ ('update_' ~ what ~ '_account')|_ }}
</button>
</p>
</div>
</div>
</form>
</div>
</div>
{{ Form.close|raw }}
{% endblock %}

10
resources/twig/accounts/index.twig
View File

@@ -20,13 +20,11 @@
<h3 class="box-title">{{ subTitle}}</h3>
<!-- ACTIONS MENU -->
<div class="pull-right">
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
{{ 'actions'|_ }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{route('accounts.create', what)}}"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ what ~ '_account')|_ }}</a></li>
</ul>
</div>

11
resources/twig/accounts/show.twig
View File

@@ -11,15 +11,12 @@
<div class="box-header with-border">
<h3 class="box-title">{{ account.name }}</h3>
<!-- ACTIONS MENU -->
<div class="pull-right">
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
{{ 'actions'|_ }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('accounts.edit', account.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('accounts.delete', account.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
</ul>

11
resources/twig/bills/create.twig
View File

@@ -45,6 +45,11 @@
<div class="box-body">
{{ ExpandedForm.optionsList('create','bill') }}
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
Store new bill
</button>
</div>
</div>
</div>
@@ -53,14 +58,12 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<button type="submit" class="btn btn-lg btn-success">
<i class="fa fa-plus-circle"></i> Store new bill
</button>
</p>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}

12
resources/twig/bills/delete.twig
View File

@@ -17,21 +17,23 @@
<p class="text-danger">
{{ trans('form.permDeleteWarning') }}
</p>
<p>
{{ trans('form.bill_areYouSure', {'name': bill.name}) }}
</p>
<p>
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
<a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
</p>
<p class="small">
{% if bill.transactionjournals|length > 0 %}
{{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals|length,{count: bill.transactionjournals|length}) }}
{% endif %}
</p>
</div>
<div class="box-footer">
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>
<a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
</div>
</div>
</div>
</form>
</div>
{{ Form.close|raw }}
{% endblock %}

17
resources/twig/bills/edit.twig
View File

@@ -47,20 +47,15 @@
<div class="box-body">
{{ ExpandedForm.optionsList('update','bill') }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<button type="submit" class="btn btn-lg btn-success">
<i class="fa fa-plus-circle"></i> Update bill
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
Update bill
</button>
</p>
</div>
</div>
</form>
</div>
</div>
{{ Form.close|raw }}
{% endblock %}
{% block styles %}

12
resources/twig/bills/index.twig
View File

@@ -12,22 +12,22 @@
<h3 class="box-title">{{ title }}</h3>
<!-- ACTIONS MENU -->
<div class="pull-right">
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
{{ 'actions'|_ }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> New bill</a></li>
</ul>
</div>
</div>
</div>
<div class="box-body table-responsive no-padding">
{% include 'list/bills.twig' %}
</div>
</div>
</div>
</div>
{% endblock %}
{% block styles %}
<link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>

16
resources/twig/bills/show.twig
View File

@@ -24,13 +24,12 @@
<i class="fa fa-times fa-fw" title="Not automatically matched by Firefly"></i>
{% endif %}
<div class="pull-right">
<!-- ACTIONS MENU -->
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
{{ 'actions'|_ }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('bills.edit',bill.id) }}"><i class="fa fa-fw fa-pencil"></i> edit</a></li>
<li><a href="{{ route('bills.delete',bill.id) }}"><i class="fa fa-fw fa-trash-o"></i> delete</a></li>
</ul>
@@ -47,7 +46,8 @@
<span class="label label-info">{{ word }}</span>
{% endfor %}
between {{ bill.amount_min|formatAmount }} and {{ bill.amount_max|formatAmount }}.
Repeats {{ bill.repeat_freq }}.</td>
Repeats {{ bill.repeat_freq }}.
</td>
</tr>
<tr>
@@ -97,7 +97,7 @@
<div class="box-header with-border">
<h3 class="box-title">Connected transaction journals</h3>
</div>
<div class="box-body">
<div class="box-body table-responsive no-padding">
{% include 'list/journals' %}
</div>
</div>

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

@@ -52,6 +52,7 @@
</div>
<div class="box-body">
<p class="text-info">Some charts are automatically grouped in periods. What period would you prefer?</p>
<div class="radio">
<label>
<input type="radio" name="viewRange" value="1D" {% if viewRange == '1D' %} checked {% endif %}>
@@ -124,5 +125,5 @@
</div>
<!-- form close -->
</form>
{{ Form.close|raw }}
{% endblock %}

2
resources/twig/tags/delete.twig
View File

@@ -31,5 +31,5 @@
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}

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

@@ -47,7 +47,8 @@
<!-- ALWAYS SHOW DATE -->
{{ ExpandedForm.date('date',data['date']) }}
</div>
</div> <!-- close panel -->
</div>
<!-- close panel -->
</div>
<div class="col-lg-6 col-md-12 col-sm-12">
@@ -73,7 +74,8 @@
{% endif %}
</div>
</div><!-- end of panel for options-->
</div>
<!-- end of panel for options-->
<!-- panel for options -->
<div class="box">
@@ -90,14 +92,7 @@
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
</p>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}