Updated boxes and what-not.

This commit is contained in:
James Cole
2015-06-20 07:29:25 +02:00
parent 707f4e2965
commit 4d017dc8a9
67 changed files with 427 additions and 1167 deletions

View File

@@ -8,22 +8,22 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('budgets.store')}) }}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
{{ ExpandedForm.text('name') }}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
{{ ExpandedForm.optionsList('create','budget') }}
</div>
</div>

View File

@@ -9,11 +9,11 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
<div class="panel panel-red">
<div class="panel-heading">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_budget', {'name': budget.name}) }}
</div>
<div class="panel-body">
<div class="box-body">
<p class="text-danger">
{{ trans('form.permDeleteWarning') }}
</p>

View File

@@ -9,11 +9,11 @@
<input type="hidden" name="id" value="{{budget.id}}" />
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
{{ ExpandedForm.checkbox('active') }}
{{ ExpandedForm.text('name') }}
</div>
@@ -22,11 +22,11 @@
</div>
<div class="col-lg-6 col-md-12 col-sm-6">
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
{{ ExpandedForm.optionsList('update','budget') }}
</div>
</div>

View File

@@ -7,12 +7,12 @@
{% block content %}
<div class="row">
<div class="col-lg-9 col-sm-8 col-md-8">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-calendar fa-fw"></i>
{{ Session.get('start').formatLocalized(monthFormat) }}
</div>
<div class="panel-body">
<div class="box-body">
<div class="row">
<div class="col-lg-6 col-md-4 col-sm-3">
<small>{{ 'budgeted'|_ }}: <span id="budgetedAmount" class="text-success">{{ budgeted|formatAmountPlain }}</span></small>
@@ -52,12 +52,12 @@
</div>
<div class="col-lg-3 col-sm-4 col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-tags"></i>
{{ 'transactionsWithoutBudget'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
<p>
<a href="{{ route('budgets.noBudget') }}">
{{ trans('firefly.transactionsWithoutBudgetDate', {date: Session.get('start').formatLocalized(monthFormat)}) }}
@@ -72,8 +72,8 @@
<div class="row">
{% for budget in budgets %}
<div class="col-lg-3 col-sm-4 col-md-6" style="height:180px;">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-tasks"></i>
<!-- link in header -->
{% if budget.currentRep %}
@@ -119,24 +119,24 @@
</div>
{% endfor %}
<div class="col-lg-3 col-sm-4 col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-plus-circle"></i>
{{ 'createBudget'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
<a href="{{ route('budgets.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> {{ 'createBudget'|_ }}</a>
</div>
</div>
</div>
{% if inactive|length > 0 %}
<div class="col-lg-3 col-sm-4 col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-minus-circle"></i>
{{ 'inactiveBudgets'|_ }}
</div>
<div class="panel-body">
<div class="box-body">
{% for index,budget in inactive %}
{% if index != inactive|length-1 %}
<a href="{{ route('budgets.show',budget.id) }}">{{ budget.name }}</a>,

View File

@@ -7,11 +7,11 @@
{% block content %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
{{ subTitle }}
</div>
<div class="panel-body">
<div class="box-body">
{% include 'list/journals.twig' with {'journals': list} %}
</div>
</div>

View File

@@ -7,8 +7,8 @@
{% block content %}
<div class="row">
<div class="col-lg-9 col-md-9 col-sm-7">
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
{{ 'overview'|_ }}
@@ -26,13 +26,13 @@
</div>
</div>
</div>
<div class="panel-body">
<div class="box-body">
<div id="budgetOverview"></div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
{{ 'transactions'|_ }}
</div>
{% include 'list/journals.twig' %}
@@ -45,11 +45,11 @@
{% for limit in limits %}
{% for rep in limit.limitRepetitions %}
<div class="panel panel-default">
<div class="panel-heading">
<div class="box">
<div class="box-header with-border">
<a href="{{route('budgets.show',[budget.id,rep.id])}}">{{rep.startdate.formatLocalized(monthFormat)}}</a>
</div>
<div class="panel-body">
<div class="box-body">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6">
{{ 'amount'|_ }}: {{ rep.amount|formatAmount }}