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

Better unicity for objects.

Browse Source
This commit is contained in:
James Cole
2015-03-31 14:16:25 +02:00
parent 776b37f4ea
commit a079eec2cb
9 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/layouts/default.blade.php
View File

@@ -1,6 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<?php $r = Route::getCurrentRoute()->getName();?>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">

5
resources/views/partials/menu.blade.php
View File

@@ -1,4 +1,6 @@
<!-- Navigation -->
<?php $r = Route::getCurrentRoute()->getName();?>
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -147,10 +149,9 @@
</li>
<?php
$isMM = !(strpos($r,'piggy-banks') === false) || !(strpos($r,'bills') === false) | !(strpos($r,'repeated') === false);
$isMM = !(strpos($r,'piggy-banks') === false) || !(strpos($r,'bills') === false);
$isPiggy = !(strpos($r,'piggy-banks') === false);
$isBill = !(strpos($r,'bills') === false) && strpos($r,'bills.create') === false;
$isRep = !(strpos($r,'repeated') === false);
?>
<li @if($isMM)class="active"@endif>
<a href="#"><i class="fa fa-euro fa-fw"></i> Money management<span class="fa arrow"></span></a>

11
resources/views/reports/month.blade.php
View File

@@ -233,7 +233,7 @@
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-sort-amount-asc fa-fw"></i>
@@ -242,15 +242,6 @@
<div class="panel-body">Body</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-rotate-left fa-fw"></i>
Repeated expenses
</div>
<div class="panel-body">Body</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">