From f186907d8b225ead3b5aed79c4322e3578d785b0 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 24 Feb 2016 13:16:58 +0000 Subject: [PATCH 1/4] Seed with app_about data --- app/Console/Commands/DemoSeederCommand.php | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/app/Console/Commands/DemoSeederCommand.php b/app/Console/Commands/DemoSeederCommand.php index cf7a9f01..07edad2f 100644 --- a/app/Console/Commands/DemoSeederCommand.php +++ b/app/Console/Commands/DemoSeederCommand.php @@ -265,38 +265,33 @@ class DemoSeederCommand extends Command [ 'name' => 'app_name', 'value' => 'Cachet Demo', - ], - [ + ], [ 'name' => 'app_domain', 'value' => 'https://demo.cachethq.io', - ], - [ + ], [ 'name' => 'show_support', 'value' => '1', - ], - [ + ], [ 'name' => 'app_locale', 'value' => 'en', - ], - [ + ], [ 'name' => 'app_timezone', 'value' => 'Europe/London', - ], - [ + ], [ 'name' => 'app_incident_days', 'value' => '7', - ], - [ + ], [ 'name' => 'app_analytics', 'value' => 'UA-58442674-3', - ], - [ + ], [ 'name' => 'app_analytics_gs', 'value' => 'GSN-712462-P', - ], - [ + ], [ 'name' => 'display_graphs', 'value' => '1', + ], [ + 'name' => 'app_about', + 'value' => 'This is the demo instance of [Cachet](https://cachethq.io?ref=demo). The open source status page system, for everyone. An [Alt Three](https://alt-three.com) product.', ], ]; From f92761437d5c0fae5229dd6968df31fa5888b8ab Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 24 Feb 2016 13:20:33 +0000 Subject: [PATCH 2/4] Move position of "About This Site". Don't double wrap text. --- resources/views/index.blade.php | 4 ++-- resources/views/partials/about-app.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index c89d242a..682b4f44 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -5,12 +5,12 @@ @include('dashboard.partials.errors') -@include('partials.about-app') -
{{ $system_message }}
+@include('partials.about-app') + @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
@include('partials.components') diff --git a/resources/views/partials/about-app.blade.php b/resources/views/partials/about-app.blade.php index 196635d0..ca857340 100644 --- a/resources/views/partials/about-app.blade.php +++ b/resources/views/partials/about-app.blade.php @@ -1,7 +1,7 @@ @if($about_app)
-

{{ trans('cachet.about_this_site') }}

-

{!! $about_app !!}

+

{{ trans('cachet.about_this_site') }}

+ {!! $about_app !!}
@endif From 9a3b073fc67089388874e18c91066b97fb43a041 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 24 Feb 2016 13:36:27 +0000 Subject: [PATCH 3/4] Split up component groups to make it more obvious --- resources/assets/sass/_status-page.scss | 13 +++++++++++- resources/lang/en/cachet.php | 3 +++ resources/views/partials/components.blade.php | 20 ++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss index 14422fc2..e58a4434 100755 --- a/resources/assets/sass/_status-page.scss +++ b/resources/assets/sass/_status-page.scss @@ -83,6 +83,10 @@ body.status-page { font-weight: 600; } + h4 + .timeline { + margin-bottom: 10px; + } + .timeline { .content-wrapper { margin-top: 40px; @@ -296,7 +300,14 @@ body.status-page { &.components { @extend .panel; border-color: $cachet_gray_light; - margin-bottom: 30px; + + &:last-child { + margin-bottom: 30px; + } + + + .components { + margin-top: 5px; + } p { margin-bottom: 10px; diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php index 2f3a780b..0062c451 100755 --- a/resources/lang/en/cachet.php +++ b/resources/lang/en/cachet.php @@ -12,6 +12,9 @@ return [ // Components 'components' => [ + 'group' => [ + 'other' => 'Other Components', + ], 'status' => [ 1 => 'Operational', 2 => 'Performance Issues', diff --git a/resources/views/partials/components.blade.php b/resources/views/partials/components.blade.php index 78ed2635..e4e95170 100644 --- a/resources/views/partials/components.blade.php +++ b/resources/views/partials/components.blade.php @@ -1,6 +1,6 @@ +@if($component_groups->count() > 0) +@foreach($component_groups as $componentGroup)
    - @if($component_groups->count() > 0) - @foreach($component_groups as $componentGroup) @if($componentGroup->enabled_components->count() > 0)
  • @@ -17,15 +17,17 @@ @endforeach
@endif - @endforeach - @if($ungrouped_components->count() > 0) -
  • - @endif - @endif + +@endforeach +@endif - @if($ungrouped_components->count() > 0) +@if($ungrouped_components->count() > 0) + +@endif From 3f7d1f588b224b2c285042f900e16b5c4bbe315d Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 24 Feb 2016 13:39:17 +0000 Subject: [PATCH 4/4] Remove unused styles --- resources/assets/sass/_status-page.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss index e58a4434..05bf59ed 100755 --- a/resources/assets/sass/_status-page.scss +++ b/resources/assets/sass/_status-page.scss @@ -83,10 +83,6 @@ body.status-page { font-weight: 600; } - h4 + .timeline { - margin-bottom: 10px; - } - .timeline { .content-wrapper { margin-top: 40px;