diff --git a/app/helpers.php b/app/helpers.php index d1f19b5e..0d1dda04 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -2,27 +2,27 @@ if ( ! function_exists('elixir')) { - /** - * Get the path to a versioned Elixir file. - * - * @param string $file - * @return string - */ - function elixir($file) - { - static $manifest = null; + /** + * Get the path to a versioned Elixir file. + * + * @param string $file + * @return string + */ + function elixir($file) + { + static $manifest = null; - if (is_null($manifest)) - { - $manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true); - } + if (is_null($manifest)) + { + $manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true); + } - if (isset($manifest[$file])) - { - return '/build/'.$manifest[$file]; - } + if (isset($manifest[$file])) + { + return '/build/'.$manifest[$file]; + } - throw new InvalidArgumentException("File {$file} not defined in asset manifest."); - } + throw new InvalidArgumentException("File {$file} not defined in asset manifest."); + } } diff --git a/app/view-composers.php b/app/view-composers.php index b787f50c..8f5290b8 100644 --- a/app/view-composers.php +++ b/app/view-composers.php @@ -1,24 +1,24 @@ groupBy('status') - ->orderBy('status', 'desc'); + $incidents = Incident::whereRaw('DATE(created_at) = "' . $date . '"') + ->groupBy('status') + ->orderBy('status', 'desc'); - $incidentCount = $incidents->count(); + $incidentCount = $incidents->count(); - if ($incidentCount <= 1 || ($incidentCount > 1 && (int) $incidents->first()->status === 4)) { - $status = 'success'; - $message = Lang::get('overview.good'); - } else { - $status = 'danger'; - $message = Lang::get('overview.bad'); - } + if ($incidentCount <= 1 || ($incidentCount > 1 && (int) $incidents->first()->status === 4)) { + $status = 'success'; + $message = Lang::get('overview.good'); + } else { + $status = 'danger'; + $message = Lang::get('overview.bad'); + } - $view->with([ - 'systemStatus' => $status, - 'systemMessage' => $message - ]); + $view->with([ + 'systemStatus' => $status, + 'systemMessage' => $message + ]); }); diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php index bf6088da..93c1c611 100644 --- a/app/views/auth/login.blade.php +++ b/app/views/auth/login.blade.php @@ -2,34 +2,34 @@ @section('content') -
-
- {{ Form::open() }} -
- Login +
+
+ {{ Form::open() }} +
+ Login - @if(Session::has('error')) - {{ Session::get('error') }} - @endif + @if(Session::has('error')) + {{ Session::get('error') }} + @endif -
- - {{ Form::email('email', Input::old('email'), [ - 'class' => 'form-control', 'placeholder' => 'Email', 'required' => 'required' - ]) }} -
-
- - {{ Form::password('password', [ - 'class' => 'form-control', 'placeholder' => 'Password', 'required' => 'required' - ]) }} -
-
- -
-
- {{ Form::close() }} -
-
+
+ + {{ Form::email('email', Input::old('email'), [ + 'class' => 'form-control', 'placeholder' => 'Email', 'required' => 'required' + ]) }} +
+
+ + {{ Form::password('password', [ + 'class' => 'form-control', 'placeholder' => 'Password', 'required' => 'required' + ]) }} +
+
+ +
+
+ {{ Form::close() }} +
+
@stop diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php index 9efc6230..257bd007 100644 --- a/app/views/dashboard/index.blade.php +++ b/app/views/dashboard/index.blade.php @@ -2,28 +2,28 @@ @section('content')
-

Dashboard. Manage Cachet.

+

Dashboard. Manage Cachet.

- + -
-
-

Coming soon... Back to Status Page.

-
-
Components
-
Incidents
-
Metrics
-
Users
-
+
+
+

Coming soon... Back to Status Page.

+
+
Components
+
Incidents
+
Metrics
+
Users
+
@stop diff --git a/app/views/imports/components.blade.php b/app/views/imports/components.blade.php index 128700fa..3bef9b14 100644 --- a/app/views/imports/components.blade.php +++ b/app/views/imports/components.blade.php @@ -1,12 +1,12 @@ @if($components->count() > 0)
- +
@endif diff --git a/app/views/imports/incident.blade.php b/app/views/imports/incident.blade.php index 414d655c..3147739a 100644 --- a/app/views/imports/incident.blade.php +++ b/app/views/imports/incident.blade.php @@ -1,23 +1,23 @@ diff --git a/app/views/imports/support-link.blade.php b/app/views/imports/support-link.blade.php index bf329491..a79dc6ca 100644 --- a/app/views/imports/support-link.blade.php +++ b/app/views/imports/support-link.blade.php @@ -1,6 +1,6 @@ @if(Setting::get('show_support'))
-

{{ Setting::get('app_name') }} Status Page is powered by Cachet.

+

{{ Setting::get('app_name') }} Status Page is powered by Cachet.

@endif diff --git a/app/views/index.blade.php b/app/views/index.blade.php index 4b77e431..61aa97b9 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -1,22 +1,22 @@ @extends('layout.master') @section('content') -
{{ $systemMessage }}
+
{{ $systemMessage }}
- @if(Auth::check()) - Logout -

You're logged in. This will be a link to the Dashboard.

- @endif + @if(Auth::check()) + Logout +

You're logged in. This will be a link to the Dashboard.

+ @endif - @include('imports.components') + @include('imports.components') - @if(Setting::get('display_graphs')) - @include('imports.graphs') - @endif + @if(Setting::get('display_graphs')) + @include('imports.graphs') + @endif - @for($i=0; $i <= 7; $i++) - @include('imports.incident', array('i', $i)) - @endfor + @for($i=0; $i <= 7; $i++) + @include('imports.incident', array('i', $i)) + @endfor - @include('imports.support-link') + @include('imports.support-link') @stop diff --git a/app/views/layout/master.blade.php b/app/views/layout/master.blade.php index 9b0c321f..cfdfa2c4 100644 --- a/app/views/layout/master.blade.php +++ b/app/views/layout/master.blade.php @@ -1,20 +1,20 @@ - - - {{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet - - - - - - - + + + {{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet + + + + + + + -
- @yield('content') -
+
+ @yield('content') +
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php index 0e5a6604..283e91a4 100644 --- a/app/views/setup.blade.php +++ b/app/views/setup.blade.php @@ -1,84 +1,84 @@ @extends('layout.master') @section('content') -
-

Setup Cachet Under construction.

-
+
+

Setup Cachet Under construction.

+
-
+
-
-
-
-
Service Details
-
- {{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'role' => 'form']) }} -
- Status Page Setup -
- - - @if($errors->has('settings.app_name')) - {{ $errors->first('settings.app_name') }} - @endif -
-
- - - @if($errors->has('settings.app_domain')) - {{ $errors->first('settings.app_domain') }} - @endif -
-
- -
-
+
+
+
+
Service Details
+
+ {{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'role' => 'form']) }} +
+ Status Page Setup +
+ + + @if($errors->has('settings.app_name')) + {{ $errors->first('settings.app_name') }} + @endif +
+
+ + + @if($errors->has('settings.app_domain')) + {{ $errors->first('settings.app_domain') }} + @endif +
+
+ +
+
-
- Administrator Account -
- - - @if($errors->has('user.name')) - {{ $errors->first('user.name') }} - @endif -
-
- - - @if($errors->has('user.email')) - {{ $errors->first('user.email') }} - @endif -
-
- - - @if($errors->has('user.password')) - {{ $errors->first('user.password') }} - @endif -
-
+
+ Administrator Account +
+ + + @if($errors->has('user.name')) + {{ $errors->first('user.name') }} + @endif +
+
+ + + @if($errors->has('user.email')) + {{ $errors->first('user.email') }} + @endif +
+
+ + + @if($errors->has('user.password')) + {{ $errors->first('user.password') }} + @endif +
+
-
-
- -
- {{ Form::close() }} -
-
-
-
-
-
Ding!
-
-

You'll be able to reconfigure Cachet later on.

-

At least when there is a management panel…

-
-
-
-
+
+
+ +
+ {{ Form::close() }} +
+
+
+
+
+
Ding!
+
+

You'll be able to reconfigure Cachet later on.

+

At least when there is a management panel…

+
+
+
+
@stop