IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed search [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-06-21 05:58:05 +02:00
parent cb0122a43f
commit f84381c927
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,9 @@
<!-- sidebar: style can be found in sidebar.less -->
<section class="sidebar">
<!-- search form -->
<form action="#" method="get" class="sidebar-form">
<form action="{{ route('search') }}" method="get" class="sidebar-form">
<div class="input-group">
<input type="text" name="q" class="form-control" placeholder="Search..."/>
<input type="text" name="q" class="form-control" placeholder="Search..." value="{{ query }}" />
<span class="input-group-btn">
<button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
</span>

33
resources/twig/search/index.twig
View File

@ -11,11 +11,14 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-repeat"></i> Transactions ({{ result.transactions|length }})
<h3 class="box-title">Transactions</h3>
</div>
<div class="box-body">
<div class="box-body no-padding">
{% include 'list/journals-tiny' with {'transactions' : result.transactions} %}
</div>
<div class="box-footer">
<span class="pull-right">Results: {{ result.transactions|length }}</span>
</div>
</div>
</div>
{% endif %}
@ -23,9 +26,9 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bar-chart"></i> Categories ({{result['categories'].count()}})
<h3 class="box-title">Categories</h3>
</div>
<div class="box-body">
<div class="box-body no-padding">
<div class="list-group">
{% for category in result.categories %}
<a class="list-group-item" title="{{category.name}}" href="{{route('categories.show',category.id)}}">
@ -34,6 +37,9 @@
{% endfor %}
</div>
</div>
<div class="box-footer">
<span class="pull-right">Results: {{ result['categories']|length }}</span>
</div>
</div>
</div>
{% endif %}
@ -41,11 +47,14 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bar-chart"></i> Tags ({{result['tags'].count()}})
<h3 class="box-title">Tags</h3>
</div>
<div class="box-body">
<div class="box-body no-padding">
<p>Bla bla</p>
</div>
<div class="box-footer">
<span class="pull-right">Results: {{result['tags']|length}}</span>
</div>
</div>
</div>
{% endif %}
@ -53,9 +62,9 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-credit-card"></i> Accounts ({{result['accounts'].count()}})
<h3 class="box-title">Accounts</h3>
</div>
<div class="box-body">
<div class="box-body no-padding">
<div class="list-group">
{% for account in result.accounts %}
<a class="list-group-item" title="{{account.name}}" href="{{route('accounts.show',account.id)}}">
@ -64,6 +73,9 @@
{% endfor %}
</div>
</div>
<div class="box-footer">
<span class="pull-right">Results: {{result['accounts'].count()}}</span>
</div>
</div>
</div>
{% endif %}
@ -71,7 +83,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-tasks"></i> Budgets ({{result['budgets'].count()}})
<h3 class="box-title">Budgets</h3>
</div>
<div class="box-body">
<div class="list-group">
@ -82,6 +94,9 @@
{% endfor %}
</div>
</div>
<div class="box-footer">
<span class="pull-right">Results: {{result['budgets'].count()}}</span>
</div>
</div>
</div>
{% endif %}