diff --git a/app/models/Incident.php b/app/models/Incident.php index 88a3755f..882388ab 100644 --- a/app/models/Incident.php +++ b/app/models/Incident.php @@ -10,15 +10,28 @@ } } - public function getLabelColorAttribute() { + public function getColorAttribute() { switch ($this->status) { case 1: - return 'label-warning'; + return 'warning'; case 2: case 3: - return 'label-info'; + return 'info'; case 4: - return 'label-success'; + return 'success'; + } + } + + public function getIconAttribute() { + switch ($this->status) { + case 1: + return 'glyphicon-flag'; + case 2: + return 'glyphicon-certificate'; + case 3: + return 'glyphicon-eye-open'; + case 4: + return 'glyphicon-ok'; } } } diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php index 457941cf..382b5dfd 100644 --- a/app/views/incident.blade.php +++ b/app/views/incident.blade.php @@ -1,15 +1,19 @@ -subDays($i); - $incidents = Incident::whereRaw('DATE(created_at) = "' . $incidentDate->format('Y-m-d') . '"')->orderBy('created_at', 'desc')->get(); -?> -

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

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

No incidents reported.

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

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

-

{{ $incident->message }}

-

-@endforeach -@endif +
  • + subDays($i); + $incidents = Incident::whereRaw('DATE(created_at) = "' . $incidentDate->format('Y-m-d') . '"')->orderBy('created_at', 'desc')->get(); + ?> +

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

    +
    + + @unless($incidents->count() > 0) +

    No incidents reported.

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

    {{ $incident->name }}

    + +

    {{ $incident->message }}

    + @endforeach +
  • diff --git a/app/views/index.blade.php b/app/views/index.blade.php index 9138c47a..a80c9105 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -24,7 +24,9 @@

    Past Incidents

    + @stop diff --git a/public/assets/sass/application.scss b/public/assets/sass/application.scss index 37c7a8a4..f4f6d866 100755 --- a/public/assets/sass/application.scss +++ b/public/assets/sass/application.scss @@ -1,5 +1,6 @@ body { color: #333333; + font-size: 1.4em; } .alert { @@ -14,35 +15,38 @@ body { border-color: #46b8da; color: #FFF; } + + &.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; + } } .list-group { margin-bottom: 20px; padding-left: 0; - a.list-group-item { - color: #030303; - } - .list-group-item { - position: relative; - display: block; padding: 10px 15px; - margin-bottom: -1px; background-color: #ffffff; - border: 1px solid #95a5a6; + border: 1px solid #BDC3C7; - h4 { + h1, h2, h3, h4 { &.list-group-item-heading { - color: inherit; - margin-top: 0px; + margin-top: 5px; margin-bottom: 5px; } } - p { + p, time { margin-bottom: 0; - line-height: 1.3; + line-height: 1.3em; + } + + time { + color: #6C7A89; + font-weight: bold; } } } diff --git a/public/build/css/.gitignore b/public/build/css/.gitignore deleted file mode 100644 index 9cf6616a..00000000 --- a/public/build/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -application-*.css diff --git a/public/build/css/application-bb5fc830.css b/public/build/css/application-bb5fc830.css new file mode 100755 index 00000000..f8af9fc8 --- /dev/null +++ b/public/build/css/application-bb5fc830.css @@ -0,0 +1,33 @@ +body { + color: #333333; + font-size: 1.4em; } + +.alert.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; } +.alert.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; } +.alert.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; } + +.list-group { + margin-bottom: 20px; + padding-left: 0; } + .list-group .list-group-item { + padding: 10px 15px; + background-color: #ffffff; + border: 1px solid #BDC3C7; } + .list-group .list-group-item h1.list-group-item-heading, .list-group .list-group-item h2.list-group-item-heading, .list-group .list-group-item h3.list-group-item-heading, .list-group .list-group-item h4.list-group-item-heading { + margin-top: 5px; + margin-bottom: 5px; } + .list-group .list-group-item p, .list-group .list-group-item time { + margin-bottom: 0; + line-height: 1.3em; } + .list-group .list-group-item time { + color: #6C7A89; + font-weight: bold; } diff --git a/public/build/css/application.css b/public/build/css/application.css index 55cf30ed..f8af9fc8 100755 --- a/public/build/css/application.css +++ b/public/build/css/application.css @@ -1,5 +1,6 @@ body { - color: #333333; } + color: #333333; + font-size: 1.4em; } .alert.alert-success { background-color: #8DCD8D; @@ -9,23 +10,24 @@ body { background: #8CD3E8; border-color: #46b8da; color: #FFF; } +.alert.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; } .list-group { margin-bottom: 20px; padding-left: 0; } - .list-group a.list-group-item { - color: #030303; } .list-group .list-group-item { - position: relative; - display: block; padding: 10px 15px; - margin-bottom: -1px; background-color: #ffffff; - border: 1px solid #95a5a6; } - .list-group .list-group-item h4.list-group-item-heading { - color: inherit; - margin-top: 0px; + border: 1px solid #BDC3C7; } + .list-group .list-group-item h1.list-group-item-heading, .list-group .list-group-item h2.list-group-item-heading, .list-group .list-group-item h3.list-group-item-heading, .list-group .list-group-item h4.list-group-item-heading { + margin-top: 5px; margin-bottom: 5px; } - .list-group .list-group-item p { + .list-group .list-group-item p, .list-group .list-group-item time { margin-bottom: 0; - line-height: 1.3; } + line-height: 1.3em; } + .list-group .list-group-item time { + color: #6C7A89; + font-weight: bold; } diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index 83b8a86e..b33e0193 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,3 +1,3 @@ { - "css/application.css": "css/application-338fad29.css" + "css/application.css": "css/application-bb5fc830.css" } \ No newline at end of file diff --git a/public/css/application.css b/public/css/application.css index 55cf30ed..f8af9fc8 100755 --- a/public/css/application.css +++ b/public/css/application.css @@ -1,5 +1,6 @@ body { - color: #333333; } + color: #333333; + font-size: 1.4em; } .alert.alert-success { background-color: #8DCD8D; @@ -9,23 +10,24 @@ body { background: #8CD3E8; border-color: #46b8da; color: #FFF; } +.alert.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; } .list-group { margin-bottom: 20px; padding-left: 0; } - .list-group a.list-group-item { - color: #030303; } .list-group .list-group-item { - position: relative; - display: block; padding: 10px 15px; - margin-bottom: -1px; background-color: #ffffff; - border: 1px solid #95a5a6; } - .list-group .list-group-item h4.list-group-item-heading { - color: inherit; - margin-top: 0px; + border: 1px solid #BDC3C7; } + .list-group .list-group-item h1.list-group-item-heading, .list-group .list-group-item h2.list-group-item-heading, .list-group .list-group-item h3.list-group-item-heading, .list-group .list-group-item h4.list-group-item-heading { + margin-top: 5px; margin-bottom: 5px; } - .list-group .list-group-item p { + .list-group .list-group-item p, .list-group .list-group-item time { margin-bottom: 0; - line-height: 1.3; } + line-height: 1.3em; } + .list-group .list-group-item time { + color: #6C7A89; + font-weight: bold; }