From 37ca4c9481e95c0c7a89e1cb7017bc411553e70b Mon Sep 17 00:00:00 2001 From: Jeramy Simpson Date: Thu, 2 Apr 2015 14:09:32 +1000 Subject: [PATCH] Working on L5 Also includes very minor meta tag changes to bring to industry standard. --- app/Http/Controllers/ClientController.php | 2 ++ resources/views/clients/show.blade.php | 2 +- resources/views/datatable.blade.php | 4 ++-- resources/views/header.blade.php | 6 +----- resources/views/master.blade.php | 14 +++++++------- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 34855b0a66ea..741961572d8c 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -1,6 +1,7 @@ withAttributes(['class'=>'normalDropDown']) ->withContents([ ['label' => trans('texts.edit_client'), 'url' => URL::to('clients/' . $client->public_id . '/edit')], - Navigation::NAVIGATION_DIVIDER, + DropdownButton::DIVIDER, ['label' => trans('texts.archive_client'), 'url' => "javascript:onArchiveClick()"], ['label' => trans('texts.delete_client'), 'url' => "javascript:onDeleteClick()"], ] diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php index af3b3e5df5a3..0ff1717325db 100644 --- a/resources/views/datatable.blade.php +++ b/resources/views/datatable.blade.php @@ -53,10 +53,10 @@ } ], @endif @foreach ($options as $k => $o) - {{ json_encode($k) }}: {{ json_encode($o) }}, + {!! json_encode($k) !!}: {!! json_encode($o) !!}, @endforeach @foreach ($callbacks as $k => $o) - {{ json_encode($k) }}: {{ $o }}, + {!! json_encode($k) !!}: {!! $o !!}, @endforeach "fnDrawCallback": function(oSettings) { if (window.onDatatableReady) { diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index 43500b55a773..142c0deeb2e4 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -201,12 +201,11 @@ @endif - @if (!Auth::check() || !Auth::user()->registered) @@ -381,9 +380,6 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice

 

- - -