From e27fa2425faaf229374817bc5526e076c6e4086a Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 17 Nov 2014 13:45:25 +0000 Subject: [PATCH] Re-design the layout --- app/views/incident.blade.php | 27 ++++++++++-------------- app/views/index.blade.php | 13 +++++++++--- app/views/layout/master.blade.php | 34 +++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php index 086028819..864512b5b 100644 --- a/app/views/incident.blade.php +++ b/app/views/incident.blade.php @@ -2,19 +2,14 @@ $incidentDate = Carbon::now()->subDays($i); $incidents = Incident::whereRaw('DATE(created_at) = "' . $incidentDate->format('Y-m-d') . '"')->orderBy('created_at', 'desc')->get(); ?> -
  • -

    {{ $incidentDate->format('jS M, Y') }}

    - -
    • +

    {{ $incidentDate->format('jS M, Y') }}

    +
    +@if($incidents->count() === 0) +

    No incidents reported.

    +@else +@foreach($incidents as $incident) +

    {{ $incident->name }}, {{ $incident->humanStatus }}

    +

    {{ $incident->message }}

    +

    +@endforeach +@endif diff --git a/app/views/index.blade.php b/app/views/index.blade.php index 88b5913e2..659241032 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -1,6 +1,15 @@ @extends('layout.master') @section('content') +
    +
    +
    +
    + SITE_NAME +
    +
    +
    +
    {{ $systemMessage }}
    @@ -22,10 +31,8 @@

    Past Incidents

    -
    @stop diff --git a/app/views/layout/master.blade.php b/app/views/layout/master.blade.php index 81f796c16..2ad840003 100644 --- a/app/views/layout/master.blade.php +++ b/app/views/layout/master.blade.php @@ -10,6 +10,40 @@ +