kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 13:36:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some layouts [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-22 07:24:44 +02:00
parent 780d137b76
commit 0f88cbb41b
10 changed files with 189 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/gcharts.options.js
View File

@@ -90,7 +90,7 @@ var defaultBarChartOptions = {
colors: ["#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"], colors: ["#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
vAxis: { vAxis: {
textStyle: { textStyle: {
color: '#838383', color: '#838383'
}, },
textPosition: 'in', textPosition: 'in',
gridlines: { gridlines: {
@@ -148,7 +148,7 @@ var defaultColumnChartOptions = {
fontSize: 11, fontSize: 11,
hAxis: { hAxis: {
textStyle: { textStyle: {
color: '#838383', color: '#838383'
}, },
gridlines: { gridlines: {
color: 'transparent' color: 'transparent'
@@ -159,7 +159,7 @@ var defaultColumnChartOptions = {
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"], colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
vAxis: { vAxis: {
textStyle: { textStyle: {
color: '#838383', color: '#838383'
}, },
baselineColor: '#aaaaaa', baselineColor: '#aaaaaa',
format: '\u20AC #' format: '\u20AC #'

39
resources/twig/budgets/create.twig
View File

@@ -6,44 +6,35 @@
{% block content %} {% block content %}
{{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('budgets.store')}) }} {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('budgets.store')}) }}
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3> <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{{ ExpandedForm.text('name') }} {{ ExpandedForm.text('name') }}
</div>
</div> </div>
</div> </div>
</div> <div class="col-lg-6 col-md-6 col-sm-12">
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- panel for options --> <!-- panel for options -->
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{{ ExpandedForm.optionsList('create','budget') }} {{ ExpandedForm.optionsList('create','budget') }}
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">{{ 'store_new_budget'|_ }}</button>
</div> </div>
</div> </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">
<h3 class="box-title">{{ 'store_new_budget'|_ }}</h3>
</button>
</p>
</div> </div>
</div> {{ Form.close|raw }}
</form>
{% endblock %} {% endblock %}

60
resources/twig/budgets/delete.twig
View File

@@ -5,45 +5,37 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) }) }} {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) }) }}
<div class="row"> <div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12"> <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
<div class="box box-danger"> <div class="box box-danger">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3> <h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-danger"> <p class="text-danger">
{{ trans('form.permDeleteWarning') }} {{ trans('form.permDeleteWarning') }}
</p> </p>
<p>
{{ trans('form.budget_areYouSure', {'name': budget.name}) }}
</p>
<p> <p>
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" /> {{ trans('form.budget_areYouSure', {'name': budget.name}) }}
<a href="{{URL.previous()}}" class="btn-default btn">{{ trans('form.cancel') }}</a > </p>
</p>
<p class="small"> <p>
{% if budget.transactionjournals|length > 0 %} {% if budget.transactionjournals|length > 0 %}
{{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals|length, {count: budget.transactionjournals|length}) }} {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals|length, {count: budget.transactionjournals|length}) }}
{% endif %} {% endif %}
</p> </p>
</div>
</div> </div>
</div> <div class="box-footer">
</div> <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 class="row">
<div class="col-lg-6">
<div class="form-group">
<div class="col-sm-8">
</div> </div>
</div> </div>
</div> </div>
</div> {{ Form.close|raw }}
</form>
{% endblock %} {% endblock %}

18
resources/twig/budgets/edit.twig
View File

@@ -6,7 +6,7 @@
{% block content %} {% block content %}
{{ Form.model(budget, {'class' : 'form-horizontal','id' : 'update','url' : route('budgets.update',budget.id) } ) }} {{ Form.model(budget, {'class' : 'form-horizontal','id' : 'update','url' : route('budgets.update',budget.id) } ) }}
<input type="hidden" name="id" value="{{budget.id}}" /> <input type="hidden" name="id" value="{{ budget.id }}"/>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-12 col-sm-6"> <div class="col-lg-6 col-md-12 col-sm-6">
<div class="box box-primary"> <div class="box box-primary">
@@ -27,21 +27,15 @@
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{{ ExpandedForm.optionsList('update','budget') }} {{ ExpandedForm.optionsList('update','budget') }}
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">Update budget</button>
</div> </div>
</div> </div>
</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-pencil"></i> Update budget
</button>
</p>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %} {% endblock %}

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

@@ -10,6 +10,12 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ Session.get('start').formatLocalized(monthFormat) }}</h3> <h3 class="box-title">{{ Session.get('start').formatLocalized(monthFormat) }}</h3>
<!-- 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>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
@@ -18,16 +24,21 @@
</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 : Session.get('start').formatLocalized(monthFormat) }) }}: <small>{{ trans('firefly.availableIn',{date : Session.get('start').formatLocalized(monthFormat) }) }}:
<a href="#" class="updateIncome"><span id="budgetIncomeTotal" data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a></small> <a href="#" class="updateIncome"><span id="budgetIncomeTotal"
data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a>
</small>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="progress progress-striped budgetedBar"> <div class="progress budgetedBar">
<div class="progress-bar progress-bar-danger" id="progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div> <div class="progress-bar progress-bar-danger" id="progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0"
<div class="progress-bar progress-bar-warning" id="progress-bar-warning" role="progressbar" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div> aria-valuemax="100" style="width: 0;"></div>
<div class="progress-bar progress-bar-info" id="progress-bar-default" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div> <div class="progress-bar progress-bar-warning" id="progress-bar-warning" role="progressbar" aria-valuenow="10" aria-valuemin="0"
aria-valuemax="100" style="width: 0;"></div>
<div class="progress-bar progress-bar-info" id="progress-bar-default" role="progressbar" aria-valuenow="0" aria-valuemin="0"
aria-valuemax="100" style="width: 0;"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -38,10 +49,13 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="progress progress-striped spentBar"> <div class="progress spentBar">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div> <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div> style="width: 0;"></div>
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div> <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
style="width: 0;"></div>
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
style="width: 0;"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -54,6 +68,11 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'transactionsWithoutBudget'|_ }}</h3> <h3 class="box-title">{{ 'transactionsWithoutBudget'|_ }}</h3>
<!-- 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>
</div> </div>
<div class="box-body"> <div class="box-body">
<p> <p>
@@ -64,7 +83,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -73,57 +91,64 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
<!-- link in header --> <!-- link in header -->
{% if budget.currentRep %} {% if budget.currentRep %}
<a href="{{ route('budgets.show', [budget.id, budget.currentRep.id]) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a> <a href="{{ route('budgets.show', [budget.id, budget.currentRep.id]) }}" class="budget-link"
{% else %} data-id="{{ budget.id }}">{{ budget.name }}</a>
<a href="{{ route('budgets.show',budget.id) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a> {% else %}
{% endif %} <a href="{{ route('budgets.show',budget.id) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a>
{% endif %}
</h3> </h3>
<!-- ACTIONS MENU --> <!-- 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"> <div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
{{ 'actions'|_ }} <ul class="dropdown-menu" role="menu">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" 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) }}"><i class="fa fa-pencil fa-fw"></i> {{ '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) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<table class="table"> <div class="box-body">
<tr> <table class="table">
<td style="width:40%;">{{ 'budgeted'|_ }}</td> <tr>
<td> <td style="width:40%;">{{ 'budgeted'|_ }}</td>
<div class="form-group" style="margin-bottom:0;"> <td>
<div class="input-group"> <div class="form-group" style="margin-bottom:0;">
<div class="input-group-addon">{{ defaultCurrency.symbol|raw }}</div> <div class="input-group">
<input type="hidden" name="balance_currency_id" value="1" /> <div class="input-group-addon">{{ defaultCurrency.symbol|raw }}</div>
<input class="form-control budgetAmount" data-original="{{ budget.currentRep.amount|number_format(0,'','') }}" data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off" step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number"> <input type="hidden" name="balance_currency_id" value="1"/>
<input class="form-control budgetAmount" data-original="{{ budget.currentRep.amount|number_format(0,'','') }}"
data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off"
step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number">
</div>
</div> </div>
</div> </td>
</td> </tr>
</tr> <tr>
<tr> <td style="width:50%;">{{ 'spent'|_ }}</td>
<td style="width:50%;">{{ 'spent'|_ }}</td> <td>{{ budget.spent|formatAmount }}</td>
<td>{{ budget.spent|formatAmount }}</td> </tr>
</tr> </table>
</table> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
<div class="col-lg-3 col-sm-4 col-md-6"> <div class="col-lg-3 col-sm-4 col-md-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'createBudget'|_ }}</h3> <h3 class="box-title">{{ 'createBudget'|_ }}</h3>
<!-- 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>
</div> </div>
<div class="box-body"> <div class="box-body">
<a href="{{ route('budgets.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> {{ 'createBudget'|_ }}</a> <a href="{{ route('budgets.create') }}" class="btn btn-success pull-right">{{ 'createBudget'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>
@@ -132,6 +157,10 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'inactiveBudgets'|_ }}</h3> <h3 class="box-title">{{ 'inactiveBudgets'|_ }}</h3>
<!-- 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>
</div> </div>
<div class="box-body"> <div class="box-body">
{% for index,budget in inactive %} {% for index,budget in inactive %}

51
resources/twig/categories/delete.twig
View File

@@ -5,34 +5,33 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('categories.destroy',category.id)}) }} {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('categories.destroy',category.id)}) }}
<div class="row"> <div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12"> <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
<div class="box box-danger"> <div class="box box-danger">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3> <h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-danger"> <p class="text-danger">
{{ trans('form.permDeleteWarning') }} {{ trans('form.permDeleteWarning') }}
</p> </p>
<p> <p>
{{ trans('form.category_areYouSure', {'name': category.name}) }} {{ trans('form.category_areYouSure', {'name': category.name}) }}
</p> </p>
<p>
<p> {% if category.transactionjournals|length > 0 %}
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" /> {{ Lang.choice('form.category_keep_transactions', category.transactionjournals|length, {count: category.transactionjournals|length}) }}
<a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a > {% endif %}
</p> </p>
<p class="small"> </div>
{% if category.transactionjournals|length > 0 %} <div class="box-footer">
{{ Lang.choice('form.category_keep_transactions', category.transactionjournals|length, {count: category.transactionjournals|length}) }} <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>
{% endif %} <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</form> {{ Form.close|raw }}
{% endblock %} {% endblock %}

66
resources/twig/categories/edit.twig
View File

@@ -5,44 +5,38 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{{ Form.model(category, {'class' : 'form-horizontal','id' : 'update','url' : route('categories.update',category.id)}) }} {{ Form.model(category, {'class' : 'form-horizontal','id' : 'update','url' : route('categories.update',category.id)}) }}
<input type="hidden" name="id" value="{{ category.id }}" /> <input type="hidden" name="id" value="{{ category.id }}"/>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }} <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name') }}
</div>
</div> </div>
<div class="box-body">
{{ ExpandedForm.text('name') }} </div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','category') }}
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
{{ 'update_category'|_ }}
</button>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12"> {{ Form.close|raw }}
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','category') }}
</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">
{{ 'update_category'|_ }}
</button>
</p>
</div>
</div>
</form>
{% endblock %} {% endblock %}

17
resources/twig/categories/index.twig
View File

@@ -9,24 +9,23 @@
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<i class="fa {{ mainTitleIcon }}"></i> {{ 'categories'|_ }} <h3 class="box-title">{{ 'categories'|_ }}</h3>
<!-- ACTIONS MENU --> <!-- 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"> <div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
{{ 'actions'|_ }} <ul class="dropdown-menu" role="menu">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" 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') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
{% include 'list/categories.twig' %} <div class="box-body no-padding">
{% include 'list/categories.twig' %}
</div>
</div> </div>
</div> </div>
</div> </div>

2
resources/twig/categories/noCategory.twig
View File

@@ -11,7 +11,7 @@
<div class="box-header with-border"> <div class="box-header with-border">
{{ subTitle }} {{ subTitle }}
</div> </div>
<div class="box-body"> <div class="box-body no-padding">
{% include 'list/journals.twig' with {'journals': list} %} {% include 'list/journals.twig' with {'journals': list} %}
</div> </div>
</div> </div>

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

@@ -9,8 +9,7 @@
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<i class="fa fa-calendar fa-fw"></i> <h3 class="box-title">{{ 'overview'|_ }} (month)</h3>
{{ 'overview'|_ }} (month)
</div> </div>
<div class="box-body"> <div class="box-body">
<div id="month"></div> <div id="month"></div>
@@ -20,8 +19,7 @@
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<i class="fa fa-calendar-o fa-fw"></i> <h3 class="box-title">{{ 'overview'|_ }} (all)</h3>
{{ 'overview'|_ }} (all)
</div> </div>
<div class="box-body"> <div class="box-body">
<div id="all"></div> <div id="all"></div>
@@ -34,10 +32,9 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<i class="fa fa-repeat fa-fw"></i> <h3 class="box-title">{{ 'transactions'|_ }}</h3>
{{ 'transactions'|_ }}
</div> </div>
<div class="box-body"> <div class="box-body no-padding">
{% include 'list/journals' %} {% include 'list/journals' %}
</div> </div>
</div> </div>