Merge pull request #1554 from CachetHQ/tweaks

Tweaks
This commit is contained in:
James Brooks
2016-02-24 13:50:13 +00:00
6 changed files with 37 additions and 30 deletions

View File

@@ -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.',
],
];

View File

@@ -296,7 +296,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;

View File

@@ -12,6 +12,9 @@
return [
// Components
'components' => [
'group' => [
'other' => 'Other Components',
],
'status' => [
1 => 'Operational',
2 => 'Performance Issues',

View File

@@ -5,12 +5,12 @@
@include('dashboard.partials.errors')
</div>
@include('partials.about-app')
<div class="section-status">
<div class="alert alert-{{ $system_status }}">{{ $system_message }}</div>
</div>
@include('partials.about-app')
@if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
<div class="section-components">
@include('partials.components')

View File

@@ -1,7 +1,7 @@
@if($about_app)
<div class="about-app">
<h1>{{ trans('cachet.about_this_site') }}</h1>
<p>{!! $about_app !!}</p>
<h2>{{ trans('cachet.about_this_site') }}</h2>
{!! $about_app !!}
</div>
@endif

View File

@@ -1,6 +1,6 @@
@if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup)
<ul class="list-group components">
@if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup)
@if($componentGroup->enabled_components->count() > 0)
<li class="list-group-item group-name">
<i class="{{ $componentGroup->collapse_class }} group-toggle"></i>
@@ -17,15 +17,17 @@
@endforeach
</div>
@endif
@endforeach
@if($ungrouped_components->count() > 0)
<li class="list-group-item break"></li>
@endif
@endif
</ul>
@endforeach
@endif
@if($ungrouped_components->count() > 0)
@if($ungrouped_components->count() > 0)
<ul class="list-group components">
<li class="list-group-item group-name">
<strong>{{ trans('cachet.components.group.other') }}</strong>
</li>
@foreach($ungrouped_components as $component)
@include('partials.component', compact($component))
@endforeach
@endif
</ul>
@endif