From 0780e404a80af10989a949edcd16ac9b73f6d67f Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Mon, 5 Dec 2016 20:19:15 +0000
Subject: [PATCH] Simplify the incidents templates

---
 resources/views/partials/incident.blade.php  | 36 --------------------
 resources/views/partials/incidents.blade.php | 34 +++++++++++++++++-
 2 files changed, 33 insertions(+), 37 deletions(-)
 delete mode 100644 resources/views/partials/incident.blade.php

diff --git a/resources/views/partials/incident.blade.php b/resources/views/partials/incident.blade.php
deleted file mode 100644
index 4b11a063..00000000
--- a/resources/views/partials/incident.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="panel panel-message incident">
-    <div class="panel-heading">
-        @if($current_user)
-        <div class="pull-right btn-group">
-            <a href="{{ cachet_route('dashboard.incidents.edit', ['id' => $incident->id]) }}" class="btn btn-default">{{ trans('forms.edit') }}</a>
-            <a href="{{ cachet_route('dashboard.incidents.delete', ['id' => $incident->id], 'delete') }}" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
-        </div>
-        @endif
-        @if($incident->component)
-        <span class="label label-default">{{ $incident->component->name }}</span>
-        @endif
-        <strong>{{ $incident->name }}</strong>{{ $incident->isScheduled ? trans("cachet.incidents.scheduled_at", ["timestamp" => $incident->scheduled_at_diff]) : null }}
-        <br>
-        <small class="date">
-            @if($with_link)
-            <a href="{{ cachet_route('incident', ['id' => $incident->id]) }}" class="links"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->timestamp_formatted }}" data-timeago="{{ $incident->timestamp_iso }}"></abbr></a>
-            @else
-            <abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->timestamp_formatted }}" data-timeago="{{ $incident->timestamp_iso }}"></abbr>
-            @endif
-        </small>
-    </div>
-    <div class="panel-body markdown-body">
-        {!! $incident->formatted_message !!}
-    </div>
-    @if($incident->updates->count())
-    <div class="list-group">
-        @foreach($incident->updates as $update)
-        <a class="list-group-item" href="{{ $update->permalink }}">
-            <i class="{{ $update->icon }}" title="{{ $update->human_status }}" data-toggle="tooltip"></i> <strong>{{ Str::limit($update->raw_message, 20) }}</strong>
-            <small>{{ $update->created_at_diff }}</small>
-            <span class="ion-ios-arrow-right pull-right"></span>
-        </a>
-        @endforeach
-    </div>
-    @endif
-</div>
diff --git a/resources/views/partials/incidents.blade.php b/resources/views/partials/incidents.blade.php
index a668e886..8428e72d 100644
--- a/resources/views/partials/incidents.blade.php
+++ b/resources/views/partials/incidents.blade.php
@@ -10,7 +10,39 @@
                     </div>
                 </div>
                 <div class="col-xs-10 col-xs-offset-2 col-sm-11 col-sm-offset-0">
-                    @include('partials.incident', ['incident' => $incident, 'with_link' => true])
+                    <div class="panel panel-message incident">
+                        <div class="panel-heading">
+                            @if($current_user)
+                            <div class="pull-right btn-group">
+                                <a href="{{ cachet_route('dashboard.incidents.edit', ['id' => $incident->id]) }}" class="btn btn-default">{{ trans('forms.edit') }}</a>
+                                <a href="{{ cachet_route('dashboard.incidents.delete', ['id' => $incident->id], 'delete') }}" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
+                            </div>
+                            @endif
+                            @if($incident->component)
+                            <span class="label label-default">{{ $incident->component->name }}</span>
+                            @endif
+                            <strong>{{ $incident->name }}</strong>{{ $incident->isScheduled ? trans("cachet.incidents.scheduled_at", ["timestamp" => $incident->scheduled_at_diff]) : null }}
+                            <br>
+                            <small class="date">
+                                <a href="{{ cachet_route('incident', ['id' => $incident->id]) }}" class="links"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->timestamp_formatted }}" data-timeago="{{ $incident->timestamp_iso }}"></abbr></a>
+                            </small>
+                        </div>
+                        <div class="panel-body markdown-body">
+                            {!! $incident->formatted_message !!}
+                        </div>
+                        @if($incident->updates->count())
+                        <div class="list-group">
+                            @foreach($incident->updates as $update)
+                            <a class="list-group-item" href="{{ $update->permalink }}">
+                                <i class="{{ $update->icon }}" title="{{ $update->human_status }}" data-toggle="tooltip"></i> <strong>{{ Str::limit($update->raw_message, 20) }}</strong>
+                                <small>{{ $update->created_at_diff }}</small>
+                                <span class="ion-ios-arrow-right pull-right"></span>
+                            </a>
+                            @endforeach
+                        </div>
+                        @endif
+                    </div>
+
                 </div>
             </div>
         </div>