Install Laravel 5.6

This commit is contained in:
James Brooks
2018-06-17 00:23:59 +01:00
parent bdacc81b8d
commit 57aef06927
80 changed files with 2105 additions and 1461 deletions

View File

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

View File

@@ -1,36 +1,36 @@
@if($enable_external_dependencies)
@if($app_analytics)
@if($enableExternalDependencies)
@if($appAnalytics)
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ $app_analytics }}', 'auto');
ga('create', '{{ $appAnalytics }}', 'auto');
ga('send', 'pageview');
</script>
@endif
@if($app_analytics_go_squared)
@if($appAnalyticsGoSquared)
<script>
!function(g,s,q,r,d){r=g[r]=g[r]||function(){(r.q=r.q||[]).push(
arguments)};d=s.createElement(q);q=s.getElementsByTagName(q)[0];
d.src='https://d1l6p2sc9645hc.cloudfront.net/tracker.js';q.parentNode.
insertBefore(d,q)}(window,document,'script','_gs');
_gs('{{ $app_analytics_go_squared }}');
_gs('{{ $appAnalyticsGoSquared }}');
</script>
@endif
@if($app_analytics_piwik_url)
@if($appAnalyticsPiwikUrl)
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="{{ $app_analytics_piwik_url }}";
var u="{{ $appAnalyticsPiwikUrl }}";
_paq.push(['setTrackerUrl', u+'/piwik.php']);
_paq.push(['setSiteId', {{ $app_analytics_piwik_site_id }}]);
_paq.push(['setSiteId', {{ $appAnalyticsPiwikSiteID }}]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'/piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="{{ $app_analytics_piwik_url }}/piwik.php?idsite={{ $app_analytics_piwik_site_id }}" style="border:0;" alt="" /></p></noscript>
<noscript><p><img src="{{ $appAnalyticsPiwikUrl }}/piwik.php?idsite={{ $appAnalyticsPiwikSiteID }}" style="border:0;" alt="" /></p></noscript>
@endif
@endif

View File

@@ -1,15 +1,15 @@
@if($app_header)
{!! $app_header !!}
@if($appHeader)
{!! $appHeader !!}
@else
@if($app_banner)
<div @if($app_banner_style_full_width)class="app-banner"@endif>
@if($appBanner)
<div @if($appBannerStyleFullWidth)class="app-banner"@endif>
<div class="container">
<div class="row app-banner-padding @if(!$app_banner_style_full_width) app-banner @endif">
<div class="row app-banner-padding @if(!$appBannerStyleFullWidth) app-banner @endif">
<div class="col-md-12 text-center">
@if($app_domain)
<a href="{{ $app_domain }}" class="links"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
@if($appDomain)
<a href="{{ $appDomain }}" class="links"><img src="data:{{ $app_banner_type }};base64, {{ $appBanner }}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
<img src="data:{{ $appBannerType }};base64, {{ $appBanner }}" class="banner-image img-responsive">
@endif
</div>
</div>

View File

@@ -1,5 +1,5 @@
@if($component_groups->isNotEmpty())
@foreach($component_groups as $componentGroup)
@if($componentGroups->isNotEmpty())
@foreach($componentGroups as $componentGroup)
<ul class="list-group components">
@if($componentGroup->enabled_components->isNotEmpty())
<li class="list-group-item group-name">
@@ -19,16 +19,16 @@
@endforeach
@endif
@if($ungrouped_components->isNotEmpty())
@if($ungroupedComponents->isNotEmpty())
<ul class="list-group components">
<li class="list-group-item group-name">
<strong>{{ trans('cachet.components.group.other') }}</strong>
<div class="pull-right">
<i class="ion ion-ios-circle-filled text-component-{{ $ungrouped_components->max('status') }} {{ $ungrouped_components->sortByDesc('status')->first()->status_color }}" data-toggle="tooltip" title="{{ $ungrouped_components->sortByDesc('status')->first()->human_status }}"></i>
<i class="ion ion-ios-circle-filled text-component-{{ $ungroupedComponents->max('status') }} {{ $ungroupedComponents->sortByDesc('status')->first()->status_color }}" data-toggle="tooltip" title="{{ $ungroupedComponents->sortByDesc('status')->first()->human_status }}"></i>
</div>
</li>
@each('partials.component', $ungrouped_components, 'component')
@each('partials.component', $ungroupedComponents, 'component')
</ul>
@endif

View File

@@ -1,5 +1,5 @@
@if($component_groups->isNotEmpty())
@foreach($component_groups as $componentGroup)
@if($componentGroups->isNotEmpty())
@foreach($componentGroups as $componentGroup)
<ul class="list-group components">
@if($componentGroup->enabled_components->isNotEmpty())
<li class="list-group-item group-name">
@@ -21,12 +21,12 @@
@endforeach
@endif
@if($ungrouped_components->isNotEmpty())
@if($ungroupedComponents->isNotEmpty())
<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)
@foreach($ungroupedComponents as $component)
@include('partials.component_input', compact($component))
@endforeach
</ul>

View File

@@ -1,4 +1,4 @@
@if($app_locale === 'en-UD' && $enable_external_dependencies)
@if($appLocale === 'en-UD' && $enableExternalDependencies)
<script type="text/javascript">
var _jipt = [];
_jipt.push(['project', 'cachet']);

View File

@@ -1,14 +1,14 @@
@if($app_footer)
{!! $app_footer !!}
@if($appFooter)
{!! $appFooter !!}
@else
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-sm-4">
@if($show_support)
@if($showSupport)
<p>
{!! trans('cachet.powered_by') !!}
@if($show_timezone)
@if($showTimezone)
{{ trans('cachet.timezone', ['timezone' => $timezone]) }}
@endif
</p>
@@ -16,12 +16,12 @@
</div>
<div class="col-sm-8">
<ul class="list-inline">
@if($current_user || $dashboard_link)
@if($currentUser || $dashboardLink)
<li>
<a class="btn btn-link" href="{{ cachet_route('dashboard') }}">{{ trans('dashboard.dashboard') }}</a>
</li>
@endif
@if($current_user)
@if($currentUser)
<li>
<a class="btn btn-link" href="{{ cachet_route('auth.logout') }}">{{ trans('dashboard.logout') }}</a>
</li>
@@ -32,7 +32,7 @@
<li>
<a class="btn btn-link" href="{{ cachet_route('feed.atom') }}">{{ trans('cachet.atom-feed') }}</a>
</li>
@if($enable_subscribers)
@if($enableSubscribers)
<li>
<a class="btn btn-success btn-outline" href="{{ cachet_route('subscribe') }}">{{ trans('cachet.subscriber.button') }}</a>
</li>

View File

@@ -12,7 +12,7 @@
<div class="col-xs-10 col-xs-offset-2 col-sm-11 col-sm-offset-0">
<div class="panel panel-message incident">
<div class="panel-heading">
@if($current_user)
@if($currentUser)
<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>

View File

@@ -1,4 +1,4 @@
@if($component_groups->isNotEmpty() || $ungrouped_components->isNotEmpty())
@if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
<div class="section-components">
@include('partials.components')
</div>

View File

@@ -1,10 +1,10 @@
@if($display_metrics && $app_graphs)
@if($displayMetrics && $appGraphs)
<div class="section-metrics">
@if($metrics->count() > 0)
<ul class="list-group">
@foreach($metrics as $metric)
<li class="list-group-item metric" data-metric-id="{{ $metric->id }}">
<metric-chart :metric="{{ $metric->toJson() }}" :theme-light="{{ json_encode($theme_metrics) }}" :theme="{{ json_encode(color_darken($theme_metrics, -0.1)) }}" :theme-dark="{{ json_encode(color_darken($theme_metrics, -0.2)) }}"></metric-chart>
<metric-chart :metric="{{ $metric->toJson() }}" :theme-light="{{ json_encode($themeMetrics) }}" :theme="{{ json_encode(color_darken($themeMetrics, -0.1)) }}" :theme-dark="{{ json_encode(color_darken($themeMetrics, -0.2)) }}"></metric-chart>
</li>
@endforeach
</ul>

View File

@@ -1,4 +1,4 @@
@if($scheduled_maintenance->isNotEmpty())
@if($scheduledMaintenance->isNotEmpty())
<div class="section-scheduled">
@include('partials.schedule')
</div>

View File

@@ -1,3 +1,3 @@
<div class="section-status">
<div class="alert alert-{{ $system_status }}">{{ $system_message }}</div>
<div class="alert alert-{{ $systemStatus }}">{{ $systemMessage }}</div>
</div>

View File

@@ -1,7 +1,7 @@
@if($stickied_incidents->isNotEmpty())
@if($stickiedIncidents->isNotEmpty())
<div class="section-stickied">
<h1>{{ trans('cachet.incidents.stickied') }}</h1>
@foreach($stickied_incidents as $date => $incidents)
@foreach($stickiedIncidents as $date => $incidents)
@include('partials.incidents', [compact($date), compact($incidents)])
@endforeach
</div>

View File

@@ -1,23 +1,23 @@
@if($days_to_show > 0 && $all_incidents)
@if($daysToShow > 0 && $allIncidents)
<div class="section-timeline">
<h1>{{ trans('cachet.incidents.past') }}</h1>
@foreach($all_incidents as $date => $incidents)
@foreach($allIncidents as $date => $incidents)
@include('partials.incidents', [compact($date), compact($incidents)])
@endforeach
</div>
<nav>
<ul class="pager">
@if($can_page_backward)
@if($canPageBackward)
<li class="previous">
<a href="{{ cachet_route('status-page') }}?start_date={{ $previous_date }}" class="links">
<a href="{{ cachet_route('status-page') }}?start_date={{ $previousDate }}" class="links">
<span aria-hidden="true">&larr;</span> {{ trans('pagination.previous') }}
</a>
</li>
@endif
@if($can_page_forward)
@if($canPageForward)
<li class="next">
<a href="{{ cachet_route('status-page') }}?start_date={{ $next_date }}" class="links">
<a href="{{ cachet_route('status-page') }}?start_date={{ $nextDate }}" class="links">
{{ trans('pagination.next') }} <span aria-hidden="true">&rarr;</span>
</a>
</li>

View File

@@ -1,16 +1,16 @@
<div class="navbar navbar-custom" role="navigation">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="{{ cachet_route('status-page') }}"><span>{{ $app_name }}</span></a>
<a class="navbar-brand" href="{{ cachet_route('status-page') }}"><span>{{ $appName }}</span></a>
</div>
<div class="navbar-collapse collapse" id="navbar-menu">
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ cachet_route('status-page') }}">{{ trans('cachet.home') }}</a></li>
@if($current_user)
@if($currentUser)
<li class="dropdown">
<a href="#" data-toggle="dropdown">
<i class="icon ion-person"></i> {{ $current_user->username }}
<i class="icon ion-person"></i> {{ $currentUser->username }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu arrow">
@@ -19,7 +19,7 @@
<li><a href="{{ cachet_route('auth.logout') }}">{{ trans('dashboard.logout') }}</a></li>
</ul>
</li>
@elseif($dashboard_link)
@elseif($dashboardLink)
<li><a href="{{ cachet_route('dashboard') }}">{{ trans('dashboard.dashboard') }}</a></li>
@endif
</ul>

View File

@@ -4,7 +4,7 @@
<strong>{{ trans('cachet.incidents.scheduled') }}</strong>
</div>
<div class="list-group">
@foreach($scheduled_maintenance as $schedule)
@foreach($scheduledMaintenance as $schedule)
<div class="list-group-item" id="scheduled-{{ $schedule->id }}">
<strong>{{ $schedule->name }}</strong> <small class="date"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $schedule->scheduled_at_formatted }}" data-timeago="{{ $schedule->scheduled_at_iso }}"></abbr></small>
<div class="pull-right"><a href="#scheduled-{{ $schedule->id }}"><i class="ion ion-link"></i></a></div>
@@ -13,8 +13,8 @@
</div>
@if($schedule->components->count() > 0)
<hr>
@foreach($schedule->components as $affected_component)
<span class="label label-primary">{{ $affected_component->component->name }}</span>
@foreach($schedule->components as $affectedComponent)
<span class="label label-primary">{{ $affectedComponent->component->name }}</span>
@endforeach
@endif
</div>

View File

@@ -1,125 +1,125 @@
<style type="text/css">
body.status-page {
background-color: {{ $theme_background_color }};
color: {{ $theme_text_color }};
@if($app_banner)
background-color: {{ $themeBackgroundColor }};
color: {{ $themeTextColor }};
@if($appBanner)
padding-top: 0;
@endif
}
p, strong { color: {{ $theme_text_color }} !important; }
.reds { color: {{ $theme_reds }} !important; }
.blues { color: {{ $theme_blues }} !important; }
.greens { color: {{ $theme_greens }} !important; }
.yellows { color: {{ $theme_yellows }} !important; }
.oranges { color: {{ $theme_oranges }} !important; }
.greys { color: {{ $theme_greys }} !important; }
.metrics { color: {{ $theme_metrics }} !important; }
.links { color: {{ $theme_links }} !important; }
p, strong { color: {{ $themeTextColor }} !important; }
.reds { color: {{ $themeReds }} !important; }
.blues { color: {{ $themeBlues }} !important; }
.greens { color: {{ $themeGreens }} !important; }
.yellows { color: {{ $themeYellows }} !important; }
.oranges { color: {{ $themeOranges }} !important; }
.greys { color: {{ $themeGreys }} !important; }
.metrics { color: {{ $themeMetrics }} !important; }
.links { color: {{ $themeLinks }} !important; }
/**
* Banner background
*/
.app-banner {
background-color: {{ $theme_banner_background_color }} !important;
background-color: {{ $themeBannerBackgroundColor }} !important;
}
.app-banner-padding {
padding: {{ $theme_banner_padding }} !important;
padding: {{ $themeBannerPadding }} !important;
}
/**
* Alert overrides.
*/
.alert {
background-color: {{ $theme_yellows }};
border-color: {{ color_darken($theme_yellows, -0.1) }};
color: {{ color_contrast($theme_yellows) }};
background-color: {{ $themeYellows }};
border-color: {{ color_darken($themeYellows, -0.1) }};
color: {{ color_contrast($themeYellows) }};
}
.alert.alert-success {
background-color: {{ $theme_greens }};
border-color: {{ color_darken($theme_greens, -0.1) }};
color: {{ color_contrast($theme_greens) }};
background-color: {{ $themeGreens }};
border-color: {{ color_darken($themeGreens, -0.1) }};
color: {{ color_contrast($themeGreens) }};
}
.alert.alert-info {
background-color: {{ $theme_blues }};
border-color: {{ color_darken($theme_blues, -0.1) }};
color: {{ color_contrast($theme_blues) }};
background-color: {{ $themeBlues }};
border-color: {{ color_darken($themeBlues, -0.1) }};
color: {{ color_contrast($themeBlues) }};
}
.alert.alert-danger {
background-color: {{ $theme_reds }};
border-color: {{ color_darken($theme_reds, -0.1) }};
color: {{ color_contrast($theme_reds) }};
background-color: {{ $themeReds }};
border-color: {{ color_darken($themeReds, -0.1) }};
color: {{ color_contrast($themeReds) }};
}
/**
* Button Overrides
*/
.btn.links {
color: {{ color_darken($theme_yellows, -0.3) }};
color: {{ color_darken($themeYellows, -0.3) }};
}
.btn.btn-success {
background-color: {{ $theme_greens }};
border-color: {{ color_darken($theme_greens, -0.1) }};
color: {{ color_contrast($theme_greens) }};
background-color: {{ $themeGreens }};
border-color: {{ color_darken($themeGreens, -0.1) }};
color: {{ color_contrast($themeGreens) }};
}
.btn.btn-success.links {
color: {{ color_darken($theme_greens, -0.3) }};
color: {{ color_darken($themeGreens, -0.3) }};
}
.btn.btn-success.btn-outline {
background-color: transparent;
border-color: {{ $theme_greens }};
color: {{ $theme_greens }};
border-color: {{ $themeGreens }};
color: {{ $themeGreens }};
}
.btn.btn-success.btn-outline:hover {
background-color: {{ $theme_greens }};
border-color: {{ color_darken($theme_greens, -0.1) }};
color: {{ color_contrast($theme_greens) }};
background-color: {{ $themeGreens }};
border-color: {{ color_darken($themeGreens, -0.1) }};
color: {{ color_contrast($themeGreens) }};
}
.btn.btn-info {
background-color: {{ $theme_blues }};
border-color: {{ color_darken($theme_blues, -0.1) }};
color: {{ color_contrast($theme_blues) }};
background-color: {{ $themeBlues }};
border-color: {{ color_darken($themeBlues, -0.1) }};
color: {{ color_contrast($themeBlues) }};
}
.btn.btn-info.links {
color: {{ color_darken($theme_blues, -0.3) }};
color: {{ color_darken($themeBlues, -0.3) }};
}
.btn.btn-danger {
background-color: {{ $theme_reds }};
border-color: {{ color_darken($theme_reds, -0.1) }};
color: {{ color_contrast($theme_reds) }};
background-color: {{ $themeReds }};
border-color: {{ color_darken($themeReds, -0.1) }};
color: {{ color_contrast($themeReds) }};
}
.btn.btn-danger.links {
color: {{ color_darken($theme_reds, -0.3) }};
color: {{ color_darken($themeReds, -0.3) }};
}
/**
* Background fills Overrides
*/
.component {
background-color: {{ $theme_background_fills }};
border-color: {{ color_darken($theme_background_fills, -0.1) }};
background-color: {{ $themeBackgroundFills }};
border-color: {{ color_darken($themeBackgroundFills, -0.1) }};
}
.sub-component {
background-color: {{ $theme_background_fills }};
border-color: {{ color_darken($theme_background_fills, -0.1) }};
background-color: {{ $themeBackgroundFills }};
border-color: {{ color_darken($themeBackgroundFills, -0.1) }};
}
.incident {
background-color: {{ $theme_background_fills }};
border-color: {{ color_darken($theme_background_fills, -0.1) }};
background-color: {{ $themeBackgroundFills }};
border-color: {{ color_darken($themeBackgroundFills, -0.1) }};
}
.status-icon {
background-color: {{ $theme_background_fills }};
border-color: {{ color_darken($theme_background_fills, -0.1) }};
background-color: {{ $themeBackgroundFills }};
border-color: {{ color_darken($themeBackgroundFills, -0.1) }};
}
.panel.panel-message:before {
border-left-color: {{ $theme_background_fills }} !important;
border-right-color: {{ $theme_background_fills }} !important;
border-left-color: {{ $themeBackgroundFills }} !important;
border-right-color: {{ $themeBackgroundFills }} !important;
}
.panel.panel-message:after {
border-left-color: {{ $theme_background_fills }} !important;
border-right-color: {{ $theme_background_fills }} !important;
border-left-color: {{ $themeBackgroundFills }} !important;
border-right-color: {{ $themeBackgroundFills }} !important;
}
.footer a {
color: {{ $theme_text_color }};
color: {{ $themeTextColor }};
}
</style>