Fix some things.

This commit is contained in:
James Cole 2015-06-20 09:54:01 +02:00
parent ae92e409d9
commit bf516d4d21
27 changed files with 66 additions and 158 deletions

View File

@ -8,12 +8,6 @@
}
#map-canvas {
height: 100%;
margin: 0px;
padding: 0px
}
.medium {
font-size: 16px;
}
a.panel-link {color:#fff;text-decoration: none;}
a.panel-link:hover {color:#fff;text-decoration: none;}
margin: 0;
padding: 0;
}

View File

@ -47,8 +47,8 @@ var defaultAreaChartOptions = {
chartArea: {
left: 50,
top: 10,
width: '85%',
height: '80%'
width: '95%',
height: '90%'
},
height: 400,
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],

View File

@ -12,7 +12,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name') }}
@ -25,7 +25,7 @@
{% if what == 'asset' %}
<div class="box">
<div class="box-header with-border">
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
@ -40,7 +40,7 @@
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','account') }}

View File

@ -9,10 +9,9 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('accounts.destroy',account.id)}) }}
<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="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_account', {'name': account.name}) }}
<h3 class="box-title">{{ trans('form.delete_account', {'name': account.name}) }}</h3>
</div>
<div class="box-body">
<p class="text-danger">

View File

@ -13,7 +13,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name') }}
@ -24,7 +24,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
@ -42,7 +42,7 @@
{% if Session.get('preFilled').accountRole == 'ccAsset' %}
<div class="box">
<div class="box-header with-border">
<i class="fa fa-credit-card"></i> Credit card options
<h3 class="box-title">Credit card options</h3>
</div>
<div class="box-body">
{{ ExpandedForm.select('ccType',Config.get('firefly.ccTypes')) }}
@ -54,7 +54,7 @@
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','account') }}

View File

@ -9,7 +9,7 @@
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw {{ subTitleIcon }} fa-fw"></i> {{ account.name }}
<h3 class="box-title">{{ account.name }}</h3>
<!-- ACTIONS MENU -->
@ -38,7 +38,7 @@
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-repeat fa-fw"></i> {{ 'transactions'|_ }}
<h3 class="box-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="box-body">
{% include 'list/journals.twig' with {sorting:true} %}

View File

@ -12,7 +12,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name') }}
@ -28,7 +28,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.integer('skip',0) }}
@ -40,7 +40,7 @@
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','bill') }}

View File

@ -9,10 +9,9 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('bills.destroy',bill.id)}) }}
<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="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_bill', {'name': bill.name}) }}
<h3 class="box-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h3>
</div>
<div class="box-body">
<p class="text-danger">

View File

@ -14,7 +14,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name') }}
@ -31,7 +31,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.integer('skip') }}
@ -42,7 +42,7 @@
</div>
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','bill') }}

View File

@ -9,7 +9,7 @@
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
<i class="fa {{ mainTitleIcon }}"></i> {{ title }}
<h3 class="box-title">{{ title }}</h3>
<!-- ACTIONS MENU -->
<div class="pull-right">

View File

@ -10,7 +10,7 @@
<div class="col-lg-6 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-rotate-right"></i> {{ bill.name }}
<h3 class="box-title">{{ bill.name }}</h3>
{% if bill.active %}
<i class="fa fa-check fa-fw" title="Active"></i>
@ -67,7 +67,7 @@
<div class="col-lg-6 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
More
<h3 class="box-title">More</h3>
</div>
<div class="box-body">
<p>
@ -82,7 +82,7 @@
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
Chart
<h3 class="box-title">Chart</h3>
</div>
<div class="box-body">
<div id="bill-overview"></div>
@ -95,7 +95,7 @@
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
Connected transaction journals
<h3 class="box-title">Connected transaction journals</h3>
</div>
<div class="box-body">
{% include 'list/journals' %}

View File

@ -10,7 +10,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<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') }}
@ -21,7 +21,7 @@
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','budget') }}
@ -35,7 +35,7 @@
<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_budget'|_ }}
<h3 class="box-title">{{ 'store_new_budget'|_ }}</h3>
</button>
</p>
</div>

View File

@ -8,10 +8,9 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) }) }}
<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="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_budget', {'name': budget.name}) }}
<h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
</div>
<div class="box-body">
<p class="text-danger">

View File

@ -11,7 +11,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.checkbox('active') }}
@ -24,7 +24,7 @@
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','budget') }}

View File

@ -9,8 +9,7 @@
<div class="col-lg-9 col-sm-8 col-md-8">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-calendar fa-fw"></i>
{{ Session.get('start').formatLocalized(monthFormat) }}
<h3 class="box-title">{{ Session.get('start').formatLocalized(monthFormat) }}</h3>
</div>
<div class="box-body">
<div class="row">
@ -54,8 +53,7 @@
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-tags"></i>
{{ 'transactionsWithoutBudget'|_ }}
<h3 class="box-title">{{ 'transactionsWithoutBudget'|_ }}</h3>
</div>
<div class="box-body">
<p>
@ -74,13 +72,14 @@
<div class="col-lg-3 col-sm-4 col-md-6" style="height:180px;">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-tasks"></i>
<h3 class="box-title">
<!-- link in header -->
{% if budget.currentRep %}
<a href="{{ route('budgets.show', [budget.id, budget.currentRep.id]) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a>
{% else %}
<a href="{{ route('budgets.show',budget.id) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a>
{% endif %}
</h3>
<!-- ACTIONS MENU -->
@ -121,8 +120,7 @@
<div class="col-lg-3 col-sm-4 col-md-6">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-plus-circle"></i>
{{ 'createBudget'|_ }}
<h3 class="box-title">{{ 'createBudget'|_ }}</h3>
</div>
<div class="box-body">
<a href="{{ route('budgets.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> {{ 'createBudget'|_ }}</a>
@ -133,8 +131,7 @@
<div class="col-lg-3 col-sm-4 col-md-6">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-fw fa-minus-circle"></i>
{{ 'inactiveBudgets'|_ }}
<h3 class="box-title">{{ 'inactiveBudgets'|_ }}</h3>
</div>
<div class="box-body">
{% for index,budget in inactive %}

View File

@ -9,7 +9,7 @@
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
{{ subTitle }}
<h3 class="box-title">{{ subTitle }}</h3>
</div>
<div class="box-body">
{% include 'list/journals.twig' with {'journals': list} %}

View File

@ -9,7 +9,7 @@
<div class="col-lg-9 col-md-9 col-sm-7">
<div class="box">
<div class="box-header with-border">
{{ 'overview'|_ }}
<h3 class="box-title">{{ 'overview'|_ }}</h3>
<!-- ACTIONS MENU -->
@ -33,7 +33,7 @@
<div class="box">
<div class="box-header with-border">
{{ 'transactions'|_ }}
<h3 class="box-title">{{ 'transactions'|_ }}</h3>
</div>
{% include 'list/journals.twig' %}
</div>
@ -47,7 +47,7 @@
{% for rep in limit.limitRepetitions %}
<div class="box">
<div class="box-header with-border">
<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></h3>
</div>
<div class="box-body">
<div class="row">

View File

@ -11,7 +11,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<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') }}
@ -24,7 +24,7 @@
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','category') }}

View File

@ -8,10 +8,9 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('categories.destroy',category.id)}) }}
<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="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_category', {'name': category.name}) }}
<h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
</div>
<div class="box-body">
<p class="text-danger">

View File

@ -9,7 +9,7 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('currency.destroy',currency.id)}) }}
<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="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_currency', {'name': currency.name}) }}

View File

@ -135,12 +135,12 @@
<div class="col-lg-8 col-md-8 col-sm-6 col-xs-4">
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" style="width: {{100 - account.percentage}}%">
<div class="progress-bar progress-bar-info progress-bar" style="width: {{100 - account.percentage}}%">
{% if account.percentage <= 50 %}
{{account.piggyBalance|formatAmountPlain}} {{ 'divided'|_}}
{% endif %}
</div>
<div class="progress-bar progress-bar-success progress-bar-striped" style="width: {{account.percentage}}%">
<div class="progress-bar progress-bar-success progress-bar" style="width: {{account.percentage}}%">
{% if account.percentage > 50 %}
{{account.difference|formatAmountPlain}} {{ 'toDivide'|_}}
{% endif %}

View File

@ -24,6 +24,9 @@
folder instead of downloading all of them to reduce the load. -->
<link href="dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />
<link href="css/daterangepicker-bs3.css" rel="stylesheet" type="text/css" />
<link href="css/firefly.css" rel="stylesheet" type="text/css" />
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
@ -54,82 +57,12 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<!-- Messages: style can be found in dropdown.less-->
<li class="dropdown messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-envelope-o"></i>
<!-- reminders will be here -->
<span class="label label-success">4</span>
<li>
<a href="#">
<span class="hidden-xs" id="daterange"></span>
</a>
<ul class="dropdown-menu">
<li class="header">You have 4 messages</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
<li><!-- start message -->
<a href="#">
<div class="pull-left">
<img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"/>
</div>
<h4>
Support Team
<small><i class="fa fa-clock-o"></i> 5 mins</small>
</h4>
<p>Why not buy a new awesome theme?</p>
</a>
</li><!-- end message -->
<li>
<a href="#">
<div class="pull-left">
<img src="dist/img/user3-128x128.jpg" class="img-circle" alt="user image"/>
</div>
<h4>
AdminLTE Design Team
<small><i class="fa fa-clock-o"></i> 2 hours</small>
</h4>
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li>
<a href="#">
<div class="pull-left">
<img src="dist/img/user4-128x128.jpg" class="img-circle" alt="user image"/>
</div>
<h4>
Developers
<small><i class="fa fa-clock-o"></i> Today</small>
</h4>
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li>
<a href="#">
<div class="pull-left">
<img src="dist/img/user3-128x128.jpg" class="img-circle" alt="user image"/>
</div>
<h4>
Sales Department
<small><i class="fa fa-clock-o"></i> Yesterday</small>
</h4>
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li>
<a href="#">
<div class="pull-left">
<img src="dist/img/user4-128x128.jpg" class="img-circle" alt="user image"/>
</div>
<h4>
Reviewers
<small><i class="fa fa-clock-o"></i> 2 days</small>
</h4>
<p>Why not buy a new awesome theme?</p>
</a>
</li>
</ul>
</li>
<li class="footer"><a href="#">See All Messages</a></li>
</ul>
</li>
<!-- Notifications: style can be found in dropdown.less -->
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
@ -206,10 +139,10 @@
<script src="js/jquery-2.1.3.min.js" type="text/javascript"></script>
<script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="js/moment.min.js" type="text/javascript"></script>
<script src="js/daterangepicker.js" type="text/javascript"></script>
<script src="dist/js/app.min.js" type="text/javascript"></script>
<script src="js/moment.min.js" type="text/javascript"></script>
<script type="text/javascript">
var start = "{{Session.get('start').format('d-m-Y')}}";
@ -232,7 +165,7 @@
var nextMonthName = "{{ nextMonthName }}";
var currencyCode = '{{getCurrencyCode() }}';
$('#daterange span').text(titleString);
$('#daterange').text(titleString);
</script>
<script type="text/javascript" src="js/firefly.js"></script>

View File

@ -8,7 +8,7 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('piggy-banks.destroy',piggyBank.id)}) }}
<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="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_piggyBank', {'name': piggyBank.name}) }}

View File

@ -7,7 +7,7 @@
{% block content %}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-red">
<div class="box box-danger">
<div class="box-header with-border">
Delete your account
</div>

View File

@ -85,18 +85,6 @@
</div>
</div>
{% endif %}
<!--
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<i class="fa fa-search-plus"></i> Other results
</div>
<div class="box-body">
<p>Bla bla</p>
</div>
</div>
</div>
-->
</div>
{% endif %}

View File

@ -8,7 +8,7 @@
{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('tags.destroy',tag.id)}) }}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-red">
<div class="box box-danger">
<div class="box-header with-border">
Delete tag "{{ tag.tag }}"
</div>

View File

@ -9,7 +9,7 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
<div class="panel panel-red">
<div class="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_journal', {'description': journal.description}) }}