mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-25 13:10:35 +00:00
First functional run of new layout.
This commit is contained in:
James Cole
@@ -17,7 +17,7 @@
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<i class="fa {{ subTitleIcon }}"></i> {{ subTitle}}
|
||||
<h3 class="box-title">{{ subTitle}}</h3>
|
||||
|
||||
<!-- ACTIONS MENU -->
|
||||
<div class="pull-right">
|
||||
@@ -34,7 +34,9 @@
|
||||
|
||||
|
||||
</div>
|
||||
{% include 'list/accounts.twig' %}
|
||||
<div class="box-body table-responsive no-padding">
|
||||
{% include 'list/accounts.twig' %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -72,12 +72,12 @@
|
||||
{% if account.difference < 0 %}
|
||||
<!-- green (100-pct), then red (pct) -->
|
||||
<div class="progress">
|
||||
<div class="progress-bar progress-bar-success progress-bar-striped" style="width: {{ 100 - account.percentage }}%">
|
||||
<div class="progress-bar progress-bar-success" style="width: {{ 100 - account.percentage }}%">
|
||||
{% if account.percentage <= 50 %}
|
||||
{{account.difference|formatAmountPlain}}
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="progress-bar progress-bar-danger progress-bar-striped" style="width: {{ account.percentage }}%">
|
||||
<div class="progress-bar progress-bar-danger" style="width: {{ account.percentage }}%">
|
||||
{% if account.percentage > 50 %}
|
||||
{{account.difference|formatAmountPlain}}
|
||||
{% endif %}
|
||||
@@ -86,13 +86,13 @@
|
||||
{% else %}
|
||||
<!-- green (pct), then blue (100-pct) -->
|
||||
<div class="progress">
|
||||
<div class="progress-bar progress-bar-success progress-bar-striped" style="width: {{account.percentage}}%">
|
||||
<div class="progress-bar progress-bar-success" style="width: {{account.percentage}}%">
|
||||
{% if account.percentage <= 50 %}
|
||||
{{account.difference|formatAmountPlain}}
|
||||
{{account.difference|formatAmountPlain}}
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="progress-bar progress-bar-info progress-bar-striped" style="width: {{100 - account.percentage}}%">
|
||||
<div class="progress-bar progress-bar-info" style="width: {{100 - account.percentage}}%">
|
||||
{% if account.percentage > 50 %}
|
||||
{{account.difference|formatAmountPlain}}
|
||||
{% endif %}
|
||||
@@ -177,7 +177,7 @@
|
||||
{% for data in transactions %}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{data[1].name}} ({{ (data[1]|balance)|formatAmount }})</h3>
|
||||
<h3 class="box-title">{{data[1].name}}</h3>
|
||||
|
||||
<!-- ACTIONS MENU -->
|
||||
<div class="box-tools pull-right">
|
||||
@@ -195,7 +195,7 @@
|
||||
|
||||
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div class="box-body no-padding">
|
||||
{% include 'list/journals-tiny.twig' with {'transactions': data[0],'account': data[1]} %}
|
||||
</div>
|
||||
<div class="box-footer clearfix">
|
||||
|
||||
@@ -204,29 +204,13 @@
|
||||
|
||||
</div><!-- ./wrapper -->
|
||||
|
||||
<!-- jQuery 2.1.4 -->
|
||||
<script src="plugins/jQuery/jQuery-2.1.4.min.js"></script>
|
||||
<!-- Bootstrap 3.3.2 JS -->
|
||||
<script src="js/jquery-2.1.3.min.js" type="text/javascript"></script>
|
||||
<script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
|
||||
<!-- FastClick -->
|
||||
<script src='plugins/fastclick/fastclick.min.js'></script>
|
||||
<!-- AdminLTE App -->
|
||||
<script src="js/daterangepicker.js" type="text/javascript"></script>
|
||||
<script src="dist/js/app.min.js" type="text/javascript"></script>
|
||||
<!-- Sparkline -->
|
||||
<script src="plugins/sparkline/jquery.sparkline.min.js" type="text/javascript"></script>
|
||||
<!-- jvectormap -->
|
||||
<script src="plugins/jvectormap/jquery-jvectormap-1.2.2.min.js" type="text/javascript"></script>
|
||||
<script src="plugins/jvectormap/jquery-jvectormap-world-mill-en.js" type="text/javascript"></script>
|
||||
<!-- SlimScroll 1.3.0 -->
|
||||
<script src="plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
|
||||
<!-- ChartJS 1.0.1 -->
|
||||
<script src="plugins/chartjs/Chart.min.js" type="text/javascript"></script>
|
||||
|
||||
<script src="js/moment.min.js" type="text/javascript"></script>
|
||||
|
||||
<!-- AdminLTE dashboard demo (This is only for demo purposes) -->
|
||||
<script src="dist/js/pages/dashboard2.js" type="text/javascript"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var start = "{{Session.get('start').format('d-m-Y')}}";
|
||||
var end = "{{Session.get('end').format('d-m-Y')}}";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<table class="table table-striped table-bordered sortable">
|
||||
<table class="table table-hover sortable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsort="disabled"> </th>
|
||||
|
||||
@@ -87,35 +87,11 @@
|
||||
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<a href="{{route('tags.create')}}" title="New tag" class="btn btn-info"><i class="fa fa-fw fa-plus"></i> Create new tag</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<a href="{{route('tags.create')}}" title="New tag" class="btn btn-info"><i class="fa fa-fw fa-plus"></i> Create new tag</a>
|
||||
</p>
|
||||
<p style="line-height: 200%;">
|
||||
{% if tags|length == 0 %}
|
||||
<em>No tags</em>
|
||||
{% else %}
|
||||
{% for tag in tags %}
|
||||
|
||||
<span style="display: inline;"><a style="font-size:100%;font-weight:normal;" class="label label-success" href="{{route('tags.show',tag.id)}}">
|
||||
{% if tag.tagMode == 'nothing' %}
|
||||
<i class="fa fa-fw fa-tag"></i>
|
||||
{% endif %}
|
||||
{% if tag.tagMode == 'balancingAct' %}
|
||||
<i class="fa fa-fw fa-refresh"></i>
|
||||
{% endif %}
|
||||
{% if tag.tagMode == 'advancePayment' %}
|
||||
<i class="fa fa-fw fa-sort-numeric-desc"></i>
|
||||
{% endif %}
|
||||
{{tag.tag}}</a>
|
||||
</span>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
<script type="text/javascript" src="js/tags.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user