lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.4' of github.com:CachetHQ/Cachet into feature/2895-custom-meta-descriptions-per-incident

Browse Source
This commit is contained in:
Nico Stapelbroek
2018-07-02 11:20:47 +02:00
parent 0fe924d868 fc1889a3c2
commit 43078e9c75
399 changed files with 10754 additions and 5607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/auth/login.blade.php
View File

@@ -36,11 +36,13 @@
<div class="form-group">
<div class="row">
<div class="col-xs-2">
@if(!config('setting.always_authenticate', false))
<a class="btn btn-default btn-lg btn-trans" href="{{ cachet_route('status-page') }}">
<span class="text-center">
<i class="ion ion-home"></i>
</span>
</a>
@endif
</div>
<div class="col-xs-9 col-xs-push-1">
<button type="submit" class="btn btn-success btn-lg btn-block btn-trans">{{ trans('dashboard.login.login') }}</button>

2
resources/views/dashboard/components/add.blade.php
View File

@@ -13,7 +13,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="CreateComponentForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.components.create', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

6
resources/views/dashboard/components/edit.blade.php
View File

@@ -13,7 +13,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="EditComponentForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.components.edit', [$component->id], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@@ -53,7 +53,7 @@
</div>
<div class="form-group">
<label>{{ trans('forms.components.tags') }}</label>
<input name="component[tags]" class="form-control" value="{{ $component->tagsList }}" placeholder="{{ trans('forms.components.tags') }}">
<input name="component[tags]" class="form-control" value="{{ $component->tags->implode(', ') }}" placeholder="{{ trans('forms.components.tags') }}">
<span class="help-block">{{ trans('forms.components.tags-help') }}</span>
</div>
<div class="checkbox">
@@ -65,7 +65,7 @@
</div>
</fieldset>
<input type="hidden" name="component[user_id]" value="{{ $component->agent_id || $current_user->id }}">
<input type="hidden" name="component[user_id]" value="{{ $component->agent_id || $currentUser->id }}">
<input type="hidden" name="component[order]" value="{{ $component->order ?: 0 }}">
<div class="btn-group">

2
resources/views/dashboard/components/groups/add.blade.php
View File

@@ -13,7 +13,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="CreateComponentGroupForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.components.groups.create', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

2
resources/views/dashboard/components/groups/edit.blade.php
View File

@@ -13,7 +13,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="EditComponentGroupForm" class="form-vertical" role="form" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

4
resources/views/dashboard/components/groups/index.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
@@ -13,7 +13,7 @@
</a>
<div class="clearfix"></div>
</div>
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="row">
<div class="col-sm-12 striped-list" data-orderable-list="/dashboard/api/components/groups/order">
@forelse($groups as $group)

4
resources/views/dashboard/components/index.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
@@ -13,7 +13,7 @@
</a>
<div class="clearfix"></div>
</div>
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="row">
<div class="col-sm-12 striped-list" data-orderable-list="/dashboard/api/components/order">
@forelse($components as $component)

18
resources/views/dashboard/incidents/add.blade.php
View File

@@ -13,22 +13,22 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@if(!$notifications_enabled)
@if(!$notificationsEnabled)
<div class="alert alert-info" role="alert">
{{ trans('forms.incidents.notify_disabled') }}
</div>
@endif
@include('dashboard.partials.errors')
@include('partials.errors')
<report-incident inline-template>
<form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@if($incident_templates->count() > 0)
@if($incidentTemplates->count() > 0)
<div class="form-group">
<label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
<select class="form-control" name="template" v-model="template">
<option selected></option>
@foreach($incident_templates as $tpl)
@foreach($incidentTemplates as $tpl)
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
@endforeach
</select>
@@ -75,19 +75,19 @@
<option value="0" selected>{{ trans('forms.incidents.not_stickied') }}</option>
</select>
</div>
@if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty())
@if(!$componentsInGroups->isEmpty() || !$componentsOutGroups->isEmpty())
<div class="form-group">
<label>{{ trans('forms.incidents.component') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
<select name="component_id" class="form-control" v-model="component.id">
<option value="" selected></option>
@foreach($components_in_groups as $group)
@foreach($componentsInGroups as $group)
<optgroup label="{{ $group->name }}">
@foreach($group->components as $component)
<option value="{{ $component->id }}">{{ $component->name }}</option>
@endforeach
</optgroup>
@endforeach
@foreach($components_out_groups as $component)
@foreach($componentsOutGroups as $component)
<option value="{{ $component->id }}">{{ $component->name }}</option>
@endforeach
</select>
@@ -118,9 +118,9 @@
</div>
<div class="form-group">
<label>{{ trans('forms.incidents.occurred_at') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
<input type="text" name="occurred_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" placeholder="{{ trans('forms.optional') }}">
<input type="text" name="occurred_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" placeholder="{{ trans('forms.optional') }}">
</div>
@if($notifications_enabled)
@if($notificationsEnabled)
<input type="hidden" name="notify" value="0">
<div class="checkbox">
<label>

6
resources/views/dashboard/incidents/edit.blade.php
View File

@@ -13,12 +13,12 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@if(!$notifications_enabled)
@if(!$notificationsEnabled)
<div class="alert alert-info" role="alert">
{{ trans('forms.incidents.notify_disabled') }}
</div>
@endif
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@@ -109,7 +109,7 @@
</div>
<div class="form-group">
<label>{{ trans('forms.incidents.occurred_at') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
<input type="text" name="occurred_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" value="{{ $incident->occurred_at_datetimepicker }}" placeholder="{{ trans('forms.optional') }}">
<input type="text" name="occurred_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" value="{{ $incident->occurred_at_datetimepicker }}" placeholder="{{ trans('forms.optional') }}">
</div>
<div class="form-group">
<label>{{ trans('forms.seo.title') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>

9
resources/views/dashboard/incidents/index.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
@@ -15,7 +15,7 @@
</div>
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<p class="lead">{!! trans_choice('dashboard.incidents.logged', $incidents->count(), ['count' => $incidents->count()]) !!}</p>
<div class="striped-list">
@@ -24,7 +24,10 @@
<div class="col-xs-6">
<i class="{{ $incident->icon }}"></i> <strong>{{ $incident->name }}</strong> <span class="badge badge-info">{{ trans_choice('dashboard.incidents.updates.count', $incident->updates()->count()) }}</span>
@if($incident->message)
<p><small>{{ Str::words($incident->message, 5) }}</small></p>
<p>{{ Str::words($incident->message, 5) }}</p>
@endif
@if ($incident->user)
<p><small>&mdash; {{ trans('dashboard.incidents.reported_by', ['user' => $incident->user->username]) }}</small></p>
@endif
</div>
<div class="col-xs-6 text-right">

4
resources/views/dashboard/incidents/updates/add.blade.php
View File

@@ -13,12 +13,12 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@if(!$notifications_enabled)
@if(!$notificationsEnabled)
<div class="alert alert-info" role="alert">
{{ trans('forms.incidents.notify_disabled') }}
</div>
@endif
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="IncidentUpdateForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

4
resources/views/dashboard/incidents/updates/edit.blade.php
View File

@@ -13,12 +13,12 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@if(!$notifications_enabled)
@if(!$notificationsEnabled)
<div class="alert alert-info" role="alert">
{{ trans('forms.incidents.notify_disabled') }}
</div>
@endif
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="IncidentUpdateForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

2
resources/views/dashboard/incidents/updates/index.blade.php
View File

@@ -19,7 +19,7 @@
</div>
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="striped-list">
@foreach($incident->updates as $update)

8
resources/views/dashboard/index.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layout.dashboard')
@section('content')
<dashboard inline-template :welcome-user="{{ $welcome_user ? 'true' : 'false' }}">
<dashboard inline-template :welcome-user="{{ $welcomeUser ? 'true' : 'false' }}" :user="{{ $currentUser }}">
<div>
<div class="header">
<div class="sidebar-toggler visible-xs">
@@ -21,7 +21,7 @@
<div class="row">
<div class="col-md-12">
<div class="section-components no-select">
@if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
@if(!$componentGroups->isEmpty() || !$ungroupedComponents->isEmpty())
@include('dashboard.partials.components')
@else
<ul class="list-group components">
@@ -88,8 +88,8 @@
</div>
@endif
</div>
@includeWhen($welcomeUser, 'dashboard.partials.welcome-modal')
</div>
@includeWhen($welcome_user, 'dashboard.partials.welcome-modal')
</div>
</dashboard>
</div>
@stop

10
resources/views/dashboard/maintenance/add.blade.php
View File

@@ -13,16 +13,16 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="ScheduleForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@if($incident_templates->count() > 0)
@if($incidentTemplates->count() > 0)
<div class="form-group">
<label for="incident-template">{{ trans('forms.schedules.templates.template') }}</label>
<select class="form-control" name="template">
<option selected></option>
@foreach($incident_templates as $tpl)
@foreach($incidentTemplates as $tpl)
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
@endforeach
</select>
@@ -49,11 +49,11 @@
</div>
<div class="form-group">
<label>{{ trans('forms.schedules.scheduled_at') }}</label>
<input type="text" name="scheduled_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" required placeholder="{{ trans('forms.schedules.scheduled_at') }}">
<input type="text" name="scheduled_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" required placeholder="{{ trans('forms.schedules.scheduled_at') }}">
</div>
<div class="form-group">
<label>{{ trans('forms.schedules.completed_at') }}</label>
<input type="text" name="completed_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" placeholder="{{ trans('forms.schedules.completed_at') }}">
<input type="text" name="completed_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" placeholder="{{ trans('forms.schedules.completed_at') }}">
</div>
</fieldset>

10
resources/views/dashboard/maintenance/edit.blade.php
View File

@@ -13,17 +13,17 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="ScheduleForm" role="form" method='POST' autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="visible" value="1">
<fieldset>
@if($incident_templates->count() > 0)
@if($incidentTemplates->count() > 0)
<div class="form-group">
<label for="incident-template">{{ trans('forms.schedules.templates.template') }}</label>
<select class="form-control" name="template">
<option selected></option>
@foreach($incident_templates as $tpl)
@foreach($incidentTemplates as $tpl)
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
@endforeach
</select>
@@ -50,11 +50,11 @@
</div>
<div class="form-group">
<label>{{ trans('forms.schedules.scheduled_at') }}</label>
<input type="text" name="scheduled_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" value="{{ $schedule->scheduled_at_datetimepicker }}" required placeholder="{{ trans('forms.schedules.scheduled_at') }}">
<input type="text" name="scheduled_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" value="{{ $schedule->scheduled_at_datetimepicker }}" required placeholder="{{ trans('forms.schedules.scheduled_at') }}">
</div>
<div class="form-group">
<label>{{ trans('forms.schedules.completed_at') }}</label>
<input type="text" name="completed_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" value="{{ $schedule->completed_at_datetimepicker }}" placeholder="{{ trans('forms.schedules.completed_at') }}">
<input type="text" name="completed_at" class="form-control flatpickr-time" data-date-format="Y-m-d H:i" value="{{ $schedule->completed_at_datetimepicker }}" placeholder="{{ trans('forms.schedules.completed_at') }}">
</div>
</fieldset>

4
resources/views/dashboard/maintenance/index.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
@@ -15,7 +15,7 @@
</div>
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<p class="lead">{!! trans_choice('dashboard.schedule.logged', $schedule->count(), ['count' => $schedule->count()]) !!}</p>
<div class="striped-list">

4
resources/views/dashboard/metrics/add.blade.php
View File

@@ -13,7 +13,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="MetricsForm" role="form" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@@ -58,7 +58,7 @@
<div class="form-group">
<label for="metric-places">{{ trans('forms.metrics.threshold') }}</label>
<select name="metric[threshold]" class="form-control" required>
@foreach ($acceptable_thresholds as $threshold)
@foreach ($acceptableThresholds as $threshold)
<option {{ (int) Binput::old('metric.threshold') === $threshold ? 'selected' : null }}>{{ $threshold }}</option>
@endforeach
</select>

4
resources/views/dashboard/metrics/edit.blade.php
View File

@@ -13,7 +13,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="MetricsForm" role="form" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@@ -58,7 +58,7 @@
<div class="form-group">
<label for="metric-places">{{ trans('forms.metrics.threshold') }}</label>
<select name="threshold" class="form-control" required>
@foreach ($acceptable_thresholds as $threshold)
@foreach ($acceptableThresholds as $threshold)
<option {{ (int) Binput::old('metric.threshold') === $threshold || $metric->threshold === $threshold ? 'selected' : null }}>{{ $threshold }}</option>
@endforeach
</select>

62
resources/views/dashboard/metrics/index.blade.php
View File

@@ -1,39 +1,39 @@
@extends('layout.dashboard')
@section('content')
<div class="header fixed">
<div class="sidebar-toggler visible-xs">
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="ion ion-ios-pie-outline"></i> {{ trans('dashboard.metrics.metrics') }}
</span>
<a class="btn btn-md btn-success pull-right" href="{{ cachet_route('dashboard.metrics.create') }}">
{{ trans('dashboard.metrics.add.title') }}
</a>
<div class="clearfix"></div>
</div>
<div class="content-wrapper header-fixed">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
<div class="striped-list">
@forelse($metrics as $metric)
<div class="row striped-list-item">
<div class="col-md-6">
<i class="{{ $metric->icon }}"></i> <strong>{{ $metric->name }}</strong>
@if($metric->description)
<p><small>{{ Str::words($metric->description, 5) }}</small></p>
@endif
</div>
<div class="col-md-6 text-right">
<a href="{{ cachet_route('dashboard.metrics.edit', [$metric->id]) }}" class="btn btn-default">{{ trans('forms.edit') }}</a>
<a href="{{ cachet_route('dashboard.metrics.delete', [$metric->id], 'delete') }}" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
<i class="ion ion-ios-pie-outline"></i> {{ trans('dashboard.metrics.metrics') }}
</span>
<a class="btn btn-md btn-success pull-right" href="{{ cachet_route('dashboard.metrics.create') }}">
{{ trans('dashboard.metrics.add.title') }}
</a>
<div class="clearfix"></div>
</div>
<div class="row">
<div class="col-sm-12">
@include('partials.errors')
<div class="striped-list">
@forelse($metrics as $metric)
<div class="row striped-list-item">
<div class="col-md-6">
<i class="{{ $metric->icon }}"></i> <strong>{{ $metric->name }}</strong>
@if($metric->description)
<p><small>{{ Str::words($metric->description, 5) }}</small></p>
@endif
</div>
<div class="col-md-6 text-right">
<a href="{{ cachet_route('dashboard.metrics.edit', [$metric->id]) }}" class="btn btn-default">{{ trans('forms.edit') }}</a>
<a href="{{ cachet_route('dashboard.metrics.delete', [$metric->id], 'delete') }}" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
</div>
</div>
@empty
<div class="list-group-item text-danger">{{ trans('dashboard.metrics.add.message') }}</div>
@endforelse
</div>
@empty
<div class="list-group-item text-danger">{{ trans('dashboard.metrics.add.message') }}</div>
@endforelse
</div>
</div>
</div>

10
resources/views/dashboard/partials/components.blade.php
View File

@@ -1,5 +1,5 @@
@if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup)
@if($componentGroups->count() > 0)
@foreach($componentGroups as $componentGroup)
@if($componentGroup->enabled_components->count() > 0)
<ul class="list-group components">
<li class="list-group-item group-name">
@@ -16,14 +16,14 @@
@endforeach
@endif
@if($ungrouped_components->count() > 0)
@if($ungroupedComponents->count() > 0)
<ul class="list-group components">
@if($component_groups->count() > 0)
@if($componentGroups->count() > 0)
<li class="list-group-item group-name">
<span class="component-group-other">{{ trans('cachet.components.group.other') }}</span>
</li>
@endif
@foreach($ungrouped_components as $component)
@foreach($ungroupedComponents as $component)
@include('dashboard.partials.component', compact($component))
@endforeach
</ul>

15
resources/views/dashboard/partials/errors.blade.php
View File

@@ -1,15 +0,0 @@
@if ($errors->any())
@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@endif
@if ($message = Session::get('success'))
@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('warning'))
@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('info'))
@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@endif

14
resources/views/dashboard/partials/sidebar.blade.php
View File

@@ -2,10 +2,10 @@
<div class="sidebar-inner">
<div class="profile">
<a href="{{ cachet_route('dashboard.user') }}">
<span class="avatar"><img src="{{ $current_user->avatar }}"></span>
<span class="avatar"><img src="{{ $currentUser->avatar }}"></span>
</a>
<a href="{{ cachet_route('dashboard.user') }}">
<h4 class="username">{{ $current_user->username }}</h4>
<h4 class="username">{{ $currentUser->username }}</h4>
</a>
</div>
<div class="clearfix"></div>
@@ -26,28 +26,28 @@
<a href="{{ cachet_route('dashboard.incidents') }}">
<i class="ion ion-ios-information-outline"></i>
<span>{{ trans('dashboard.incidents.incidents') }}</span>
<span class="label label-info">{{ $incident_count }}</span>
<span class="label label-info">{{ $incidentCount }}</span>
</a>
</li>
<li {!! set_active('dashboard/templates*') !!}>
<a href="{{ cachet_route('dashboard.templates') }}">
<i class="ion ion-ios-paper-outline"></i>
<span>{{ trans('dashboard.incidents.incident-templates') }}</span>
<span class="label label-info">{{ $incident_template_count }}</span>
<span class="label label-info">{{ $incidentTemplateCount }}</span>
</a>
</li>
<li {!! set_active('dashboard/schedule*') !!}>
<a href="{{ cachet_route('dashboard.schedule') }}">
<i class="ion ion-android-calendar"></i>
<span>{{ trans('dashboard.schedule.schedule') }}</span>
<span class="label label-info">{{ $schedule_count }}</span>
<span class="label label-info">{{ $scheduleCount }}</span>
</a>
</li>
<li {!! set_active('dashboard/components*') !!}>
<a href="{{ cachet_route('dashboard.components') }}">
<i class="ion ion-ios-browsers-outline"></i>
<span>{{ trans('dashboard.components.components') }}</span>
<span class="label label-info">{{ $component_count }}</span>
<span class="label label-info">{{ $componentCount }}</span>
</a>
</li>
<li {!! set_active('dashboard/metrics*') !!}>
@@ -60,7 +60,7 @@
<a href="{{ cachet_route('dashboard.subscribers') }}">
<i class="ion ion-ios-email-outline"></i>
<span>{{ trans('dashboard.subscribers.subscribers') }}</span>
<span class="label label-info">{{ $subscriber_count }}</span>
<span class="label label-info">{{ $subscriberCount }}</span>
</a>
</li>
<li {!! set_active('dashboard/team*') !!}>

4
resources/views/dashboard/partials/sub-sidebar.blade.php
View File

@@ -2,10 +2,10 @@
<div class="sidebar-toggler visible-xs">
<i class="ion ion-navicon"></i>
</div>
<h3>{{ $sub_title }}</h3>
<h3>{{ $subTitle }}</h3>
<hr>
<ul class="menu">
@foreach($sub_menu as $key => $item)
@foreach($subMenu as $key => $item)
<li><a href="{{ $item['url'] }}" class="{{ $item['active'] ? 'active' : null }}"><i class="ion {{ $item['icon'] }}"></i> {{ $item['title'] }}</a></li>
@endforeach
</ul>

2
resources/views/dashboard/partials/welcome-modal.blade.php
View File

@@ -6,7 +6,7 @@
</div>
<div class="modal-body">
<header>
{{ trans('dashboard.welcome.welcome', ['username' => $current_user->username]) }}
{{ trans('dashboard.welcome.welcome', ['username' => $currentUser->username]) }}
</header>
<p>

12
resources/views/dashboard/settings/analytics.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">
@@ -13,13 +13,13 @@
<div class="col-sm-12">
<form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.analytics.analytics_google') }}</label>
<input type="text" name="app_analytics" class="form-control" value="{{ $app_analytics }}" placeholder="UA-12345-12">
<input type="text" name="app_analytics" class="form-control" value="{{ $appAnalytics }}" placeholder="UA-12345-12">
</div>
</div>
</div>
@@ -27,7 +27,7 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.analytics.analytics_gosquared') }}</label>
<input type="text" name="app_analytics_go_squared" class="form-control" value="{{ $app_analytics_go_squared }}" placeholder="GSN-12345-A">
<input type="text" name="app_analytics_go_squared" class="form-control" value="{{ $appAnalyticsGoSquared }}" placeholder="GSN-12345-A">
</div>
</div>
</div>
@@ -35,7 +35,7 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.analytics.analytics_piwik_url') }}</label>
<input type="text" name="app_analytics_piwik_url" class="form-control" value="{{ $app_analytics_piwik_url }}" placeholder="{{ trans('forms.settings.analytics.analytics_piwik_url') }}">
<input type="text" name="app_analytics_piwik_url" class="form-control" value="{{ $appAnalyticsPiwikUrl }}" placeholder="{{ trans('forms.settings.analytics.analytics_piwik_url') }}">
</div>
</div>
</div>
@@ -43,7 +43,7 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.analytics.analytics_piwik_siteid') }}</label>
<input type="number" min="1" max="100" name="app_analytics_piwik_site_id" class="form-control" value="{{ $app_analytics_piwik_site_id }}" placeholder="{{ trans('forms.settings.analytics.analytics_piwik_siteid') }}">
<input type="number" min="1" max="100" name="app_analytics_piwik_site_id" class="form-control" value="{{ $appAnalyticsPiwikSiteId }}" placeholder="{{ trans('forms.settings.analytics.analytics_piwik_siteid') }}">
</div>
</div>
</div>

28
resources/views/dashboard/settings/app-setup.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">
@@ -13,13 +13,13 @@
<div class="col-sm-12">
<form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.site-name') }}</label>
<input type="text" class="form-control" name="app_name" value="{{ $app_name }}" required placeholder="{{ trans('forms.settings.app-setup.site-name') }}">
<input type="text" class="form-control" name="app_name" value="{{ $appName }}" required placeholder="{{ trans('forms.settings.app-setup.site-name') }}">
</div>
</div>
</div>
@@ -27,7 +27,7 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.site-url') }}</label>
<input type="text" class="form-control" name="app_domain" value="{{ $app_domain }}" required placeholder="{{ trans('forms.settings.app-setup.site-url') }}">
<input type="text" class="form-control" name="app_domain" value="{{ $appDomain }}" required placeholder="{{ trans('forms.settings.app-setup.site-url') }}">
</div>
</div>
</div>
@@ -36,7 +36,7 @@
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.about-this-page') }}</label>
<div class='markdown-control'>
<textarea name="app_about" class="form-control autosize" rows="4" placeholder="{{ trans('forms.settings.app-setup.about-this-page') }}">{{ $raw_app_about }}</textarea>
<textarea name="app_about" class="form-control autosize" rows="4" placeholder="{{ trans('forms.settings.app-setup.about-this-page') }}">{{ $rawAppAbout }}</textarea>
</div>
</div>
</div>
@@ -57,6 +57,14 @@
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.major_outage_rate') }}</label>
<input type="number" name="major_outage_rate" class="form-control" value="{{ Config::get('setting.major_outage_rate', 50) }}" placeholder="{{ trans('forms.settings.app-setup.major_outage_rate') }}">
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="checkbox">
@@ -95,7 +103,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="display_graphs">
<input type="checkbox" value="1" name="display_graphs" {{ $app_graphs ? 'checked' : null }}>
<input type="checkbox" value="1" name="display_graphs" {{ $appGraphs ? 'checked' : null }}>
{{ trans('forms.settings.app-setup.display-graphs') }}
</label>
</div>
@@ -106,7 +114,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="show_support">
<input type="checkbox" value="1" name="show_support" {{ $show_support ? 'checked' : null }}>
<input type="checkbox" value="1" name="show_support" {{ $showSupport ? 'checked' : null }}>
{{ trans('setup.show_support') }}
</label>
</div>
@@ -117,7 +125,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="enable_external_dependencies">
<input type="checkbox" value="1" name="enable_external_dependencies" {{ $enable_external_dependencies ? 'checked' : null }}>
<input type="checkbox" value="1" name="enable_external_dependencies" {{ $enableExternalDependencies ? 'checked' : null }}>
{{ trans('forms.settings.app-setup.enable_external_dependencies') }}
</label>
</div>
@@ -128,7 +136,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="show_timezone">
<input type="checkbox" value="1" name="show_timezone" {{ $show_timezone ? 'checked' : null }}>
<input type="checkbox" value="1" name="show_timezone" {{ $showTimezone ? 'checked' : null }}>
{{ trans('forms.settings.app-setup.show_timezone') }}
</label>
</div>
@@ -139,7 +147,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="only_disrupted_days">
<input type="checkbox" value="1" name="only_disrupted_days" {{ $only_disrupted_days ? 'checked' : null }}>
<input type="checkbox" value="1" name="only_disrupted_days" {{ $onlyDisruptedDays ? 'checked' : null }}>
{{ trans('forms.settings.app-setup.only_disrupted_days') }}
</label>
</div>

2
resources/views/dashboard/settings/credits.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">

4
resources/views/dashboard/settings/customization.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">
@@ -13,7 +13,7 @@
<div class="col-sm-12">
<form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="row">
<div class="col-xs-12">

8
resources/views/dashboard/settings/localization.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">
@@ -13,7 +13,7 @@
<div class="col-sm-12">
<form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="row">
<div class="col-xs-12">
@@ -63,7 +63,7 @@
<select name="app_locale" class="form-control" required>
<option value="">Select Language</option>
@foreach($langs as $key => $lang)
<option value="{{ $key }}" @if($app_locale === $key) selected @endif>
<option value="{{ $key }}" @if($appLocale === $key) selected @endif>
{{ $lang['name'] }}
</option>
@endforeach
@@ -76,7 +76,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="automatic_localization">
<input type="checkbox" value="1" name="automatic_localization" {{ $automatic_localization ? 'checked' : null }}>
<input type="checkbox" value="1" name="automatic_localization" {{ $automaticLocalization ? 'checked' : null }}>
{{ trans('forms.settings.app-setup.automatic_localization') }}
</label>
</div>

2
resources/views/dashboard/settings/log.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">

6
resources/views/dashboard/settings/mail.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="application-setup">
<span class="uppercase">
@@ -13,13 +13,13 @@
<div class="col-sm-12">
<form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings.mail', [], 'post') }}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="form-group">
<label>{{ trans('forms.setup.mail_driver') }}</label>
<select name="config[mail_driver]" class="form-control" required>
<option disabled>{{ trans('forms.setup.mail_driver') }}</option>
@foreach($mail_drivers as $driver => $driverName)
@foreach($mailDrivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('config.mail_driver', $config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@endforeach
</select>

20
resources/views/dashboard/settings/security.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="security">
<span class="uppercase">
@@ -13,8 +13,20 @@
<div class="col-sm-12">
<form name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="row">
<div class="col-xs-12">
<label>{{ trans('forms.settings.security.always-authenticate') }}</label>
<div class="checkbox">
<label>
<input type="hidden" value="0" name="always_authenticate">
<input type="checkbox" value="1" name="always_authenticate" {{ Config::get('setting.always_authenticate') ? 'checked' : null }}>
{{ trans('forms.settings.security.always-authenticate-help') }}
</label>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
@@ -36,13 +48,13 @@
</div>
</div>
@if(!$unsecure_users->isEmpty())
@if(!$unsecureUsers->isEmpty())
<hr>
<div class="panel panel-danger">
<div class="panel-heading">{{ trans('dashboard.settings.security.two-factor') }}</div>
<div class="list-group">
@foreach($unsecure_users as $user)
@foreach($unsecureUsers as $user)
<div class="list-group-item">
<strong>{{ $user->username }}</strong>
<span class="label label-danger pull-right"><i class="ion ion-ios-unlocked"></i></span>

4
resources/views/dashboard/settings/stylesheet.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="stylesheet">
<span class="uppercase">
@@ -13,7 +13,7 @@
<div class="col-sm-12">
<form name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<fieldset>
<div class="row">
<div class="col-xs-12">

34
resources/views/dashboard/settings/theme.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="content-panel">
@includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
@includeWhen(isset($subMenu), 'dashboard.partials.sub-sidebar')
<div class="content-wrapper">
<div class="header sub-header" id="theme">
<span class="uppercase">
@@ -13,14 +13,14 @@
<div class="col-sm-12">
<form name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.banner') }}</label>
@if($app_banner)
@if($appBanner)
<div id="banner-view" class="well">
<img src="data:{{ $app_banner_type }};base64,{{ $app_banner }}" style="max-width: 100%">
<img src="data:{{ $appBannerType }};base64,{{ $appBanner }}" style="max-width: 100%">
<br><br>
<button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
</div>
@@ -37,13 +37,13 @@
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.background-color') }}</label>
<input type="text" class="form-control color-code" name="style.background_color" value="{{ $theme_background_color }}" placeholder="{{ trans('forms.settings.theme.background-color') }}">
<input type="text" class="form-control color-code" name="style.background_color" value="{{ $themeBackgroundColor }}" placeholder="{{ trans('forms.settings.theme.background-color') }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.text-color') }}</label>
<input type="text" class="form-control color-code" name="style.text_color" value="{{ $theme_text_color }}" placeholder="{{ trans('forms.settings.theme.text-color') }}">
<input type="text" class="form-control color-code" name="style.text_color" value="{{ $themeTextColor }}" placeholder="{{ trans('forms.settings.theme.text-color') }}">
</div>
</div>
</div>
@@ -52,20 +52,20 @@
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.banner-background-color') }}</label>
<input type="text" class="form-control color-code" name="style.banner_background_color" value="{{ $theme_banner_background_color }}" placeholder="{{ trans('forms.settings.theme.banner-background-color') }}">
<input type="text" class="form-control color-code" name="style.banner_background_color" value="{{ $themeBannerBackgroundColor }}" placeholder="{{ trans('forms.settings.theme.banner-background-color') }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.banner-padding') }}</label>
<input type="text" class="form-control" name="style.banner_padding" value="{{ $theme_banner_padding }}" placeholder="{{ trans('forms.settings.theme.banner-padding') }}">
<input type="text" class="form-control" name="style.banner_padding" value="{{ $themeBannerPadding }}" placeholder="{{ trans('forms.settings.theme.banner-padding') }}">
</div>
</div>
<div class="col-xs-12">
<div class="checkbox">
<label>
<input type="hidden" value="0" name="style.fullwidth_header">
<input type="checkbox" value="1" name="style.fullwidth_header" {{ $app_banner_style_full_width ? 'checked' : null }}>
<input type="checkbox" value="1" name="style.fullwidth_header" {{ $appBannerStyleFullWidth ? 'checked' : null }}>
{{ trans('forms.settings.theme.fullwidth-banner') }}
</label>
</div>
@@ -76,13 +76,13 @@
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.reds') }}</label>
<input type="text" class="form-control color-code" name="style.reds" value="{{ $theme_reds }}" placeholder="{{ trans('forms.settings.theme.reds') }}">
<input type="text" class="form-control color-code" name="style.reds" value="{{ $themeReds }}" placeholder="{{ trans('forms.settings.theme.reds') }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.blues') }}</label>
<input type="text" class="form-control color-code" name="style.blues" value="{{ $theme_blues }}" placeholder="{{ trans('forms.settings.theme.blues') }}">
<input type="text" class="form-control color-code" name="style.blues" value="{{ $themeBlues }}" placeholder="{{ trans('forms.settings.theme.blues') }}">
</div>
</div>
</div>
@@ -90,13 +90,13 @@
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.greens') }}</label>
<input type="text" class="form-control color-code" name="style.greens" value="{{ $theme_greens }}" placeholder="{{ trans('forms.settings.theme.greens') }}">
<input type="text" class="form-control color-code" name="style.greens" value="{{ $themeGreens }}" placeholder="{{ trans('forms.settings.theme.greens') }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.yellows') }}</label>
<input type="text" class="form-control color-code" name="style.yellows" value="{{ $theme_yellows }}" placeholder="{{ trans('forms.settings.theme.yellows') }}">
<input type="text" class="form-control color-code" name="style.yellows" value="{{ $themeYellows }}" placeholder="{{ trans('forms.settings.theme.yellows') }}">
</div>
</div>
</div>
@@ -104,13 +104,13 @@
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.oranges') }}</label>
<input type="text" class="form-control color-code" name="style.oranges" value="{{ $theme_oranges }}" placeholder="{{ trans('forms.settings.theme.oranges') }}">
<input type="text" class="form-control color-code" name="style.oranges" value="{{ $themeOranges }}" placeholder="{{ trans('forms.settings.theme.oranges') }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.metrics') }}</label>
<input type="text" class="form-control color-code" name="style.metrics" value="{{ $theme_metrics }}" placeholder="{{ trans('forms.settings.theme.metrics') }}">
<input type="text" class="form-control color-code" name="style.metrics" value="{{ $themeMetrics }}" placeholder="{{ trans('forms.settings.theme.metrics') }}">
</div>
</div>
</div>
@@ -118,13 +118,13 @@
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.links') }}</label>
<input type="text" class="form-control color-code" name="style.links" value="{{ $theme_links }}" placeholder="{{ trans('forms.settings.theme.links') }}">
<input type="text" class="form-control color-code" name="style.links" value="{{ $themeLinks }}" placeholder="{{ trans('forms.settings.theme.links') }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.background-fills') }}</label>
<input type="text" class="form-control color-code" name="style.background_fills" value="{{ $theme_background_fills }}" placeholder="{{ trans('forms.settings.theme.background-fills') }}">
<input type="text" class="form-control color-code" name="style.background_fills" value="{{ $themeBackgroundFills }}" placeholder="{{ trans('forms.settings.theme.background-fills') }}">
</div>
</div>
</div>

2
resources/views/dashboard/subscribers/add.blade.php
View File

@@ -12,7 +12,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="SubscriberForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.subscribers.create', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

4
resources/views/dashboard/subscribers/index.blade.php
View File

@@ -8,7 +8,7 @@
<span class="uppercase">
<i class="ion ion-ios-email-outline"></i> {{ trans('dashboard.subscribers.subscribers') }}
</span>
@if($current_user->isAdmin && $enable_subscribers)
@if($currentUser->isAdmin && $enableSubscribers)
<a class="btn btn-md btn-success pull-right" href="{{ cachet_route('dashboard.subscribers.create') }}">
{{ trans('dashboard.subscribers.add.title') }}
</a>
@@ -19,7 +19,7 @@
<div class="row">
<div class="col-sm-12">
<p class="lead">
@if($enable_subscribers)
@if($enableSubscribers)
{{ trans('dashboard.subscribers.description') }}
@else
{{ trans('dashboard.subscribers.description_disabled') }}

4
resources/views/dashboard/team/add.blade.php
View File

@@ -12,7 +12,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.team.create', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@@ -29,7 +29,7 @@
<input type="password" class="form-control password-strength" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
<div class="strengthify-wrapper"></div>
</div>
@if($current_user->isAdmin)
@if($currentUser->isAdmin)
<div class="form-group">
<label>{{ trans('forms.user.user_level') }}</label>
<select name="level" class="form-control">

10
resources/views/dashboard/team/edit.blade.php
View File

@@ -12,7 +12,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/{{ $user->id }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@@ -26,10 +26,10 @@
</div>
<div class="form-group">
<label>{{ trans('forms.user.password') }}</label>
<input type="password" class="form-control password-strength" name="password" value="" {{ !$current_user->isAdmin ? "disabled": "" }} placeholder="{{ trans('forms.user.password') }}">
<input type="password" class="form-control password-strength" name="password" value="" {{ !$currentUser->isAdmin ? "disabled": "" }} placeholder="{{ trans('forms.user.password') }}">
<div class="strengthify-wrapper"></div>
</div>
@if($current_user->isAdmin)
@if($currentUser->isAdmin)
<div class="form-group">
<label>{{ trans('forms.user.user_level') }}</label>
<select name="level" class="form-control">
@@ -42,9 +42,9 @@
<div class="form-group">
<button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
@if($current_user->isAdmin)
@if($currentUser->isAdmin)
<a class="btn btn-info" href="{{ cachet_route('dashboard.user.api.regen', [$user->id]) }}">{{ trans('cachet.api.revoke') }}</a>
@if($current_user->id != $user->id)
@if($currentUser->id != $user->id)
<a class="btn btn-danger confirm-action" href="{{ cachet_route('dashboard.team.delete', [$user->id], 'delete') }}" data-method="DELETE">{{ trans('forms.delete') }}</a>
@endif
@endif

6
resources/views/dashboard/team/index.blade.php
View File

@@ -8,7 +8,7 @@
<span class="uppercase">
<i class="ion ion-ios-people-outline"></i> {{ trans('dashboard.team.team') }}
</span>
@if($current_user->isAdmin)
@if($currentUser->isAdmin)
<div class="button-group pull-right">
<a class="btn btn-sm btn-success" href="{{ cachet_route('dashboard.team.invite') }}">
{{ trans('dashboard.team.invite.title') }}
@@ -26,9 +26,9 @@
<p class="lead">{{ trans('dashboard.team.description') }}</p>
<div class="user-grid">
@foreach($team_members as $member)
@foreach($teamMembers as $member)
<div class="user col-sm-3 col-xs-6">
<a href="@if($current_user->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
<a href="@if($currentUser->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
<img src="{{ $member->avatar }}">
</a>
<div class="name">{{ $member->username }}</div>

2
resources/views/dashboard/team/invite.blade.php
View File

@@ -13,7 +13,7 @@
<invite-team inline-template>
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.team.invite', [], 'post') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

2
resources/views/dashboard/templates/add.blade.php
View File

@@ -33,7 +33,7 @@ window.addEventListener("DOMContentLoaded", function(e) {
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>

8
resources/views/dashboard/templates/edit.blade.php
View File

@@ -33,10 +33,10 @@ window.addEventListener("DOMContentLoaded", function(e) {
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@if($updated_template = Session::get('updated_template'))
<div class="alert alert-{{ ($template_errors = Session::get('template_errors')) ? 'danger' : 'success' }}">
@if($template_errors)
{{ sprintf("%s - %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure').' '.$template_errors) }}
@if($updatedTemplate = Session::get('updated_template'))
<div class="alert alert-{{ ($templateErrors = Session::get('template_errors')) ? 'danger' : 'success' }}">
@if($templateErrors)
{{ sprintf("%s - %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure').' '.$templateErrors) }}
@else
{{ sprintf("%s - %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.edit.success')) }}
@endif

4
resources/views/dashboard/templates/index.blade.php
View File

@@ -15,9 +15,9 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="striped-list">
@forelse($incident_templates as $template)
@forelse($incidentTemplates as $template)
<div class="row striped-list-item">
<div class="col-xs-6">
<strong>{{ $template->name }}</strong>

20
resources/views/dashboard/user/index.blade.php
View File

@@ -12,22 +12,22 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
@include('partials.errors')
<form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.user', [], 'post') }}" method="POST">
{!! csrf_field() !!}
<fieldset>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<a href="https://gravatar.com"><img src="{{ $current_user->avatar }}" class="img-responsive img-thumbnail" title="{{ trans('forms.user.gravatar') }}" data-toggle="tooltip"></a>
<a href="https://gravatar.com"><img src="{{ $currentUser->avatar }}" class="img-responsive img-thumbnail" title="{{ trans('forms.user.gravatar') }}" data-toggle="tooltip"></a>
</div>
<div class="form-group">
<label>{{ trans('forms.user.username') }}</label>
<input type="text" class="form-control" name="username" value="{{ $current_user->username }}" required placeholder="{{ trans('forms.user.username') }}">
<input type="text" class="form-control" name="username" value="{{ $currentUser->username }}" required placeholder="{{ trans('forms.user.username') }}">
</div>
<div class="form-group">
<label>{{ trans('forms.user.email') }}</label>
<input type="email" class="form-control" name="email" value="{{ $current_user->email }}" required placeholder="{{ trans('forms.user.email') }}">
<input type="email" class="form-control" name="email" value="{{ $currentUser->email }}" required placeholder="{{ trans('forms.user.email') }}">
</div>
<div class="form-group">
<label>{{ trans('forms.user.password') }}</label>
@@ -38,8 +38,8 @@
<div class="form-group">
<label>{{ trans('forms.user.api-token') }}</label>
<div class="input-group">
<input type="text" class="form-control" name="api_key" readonly value="{{ $current_user->api_key }}" placeholder="{{ trans('forms.user.api-token') }}">
<a href="{{ cachet_route('dashboard.user.api.regen', [$current_user->id]) }}" class="input-group-addon btn btn-danger">{{ trans('cachet.api.regenerate') }}</a>
<input type="text" class="form-control" name="api_key" readonly value="{{ $currentUser->api_key }}" placeholder="{{ trans('forms.user.api-token') }}">
<a href="{{ cachet_route('dashboard.user.api.regen', [$currentUser->id]) }}" class="input-group-addon btn btn-danger">{{ trans('cachet.api.regenerate') }}</a>
</div>
<span class="help-block">{{ trans('forms.user.api-token-help') }}</span>
</div>
@@ -47,17 +47,17 @@
<div class="form-group">
<label class="checkbox-inline">
<input type="hidden" name="google2fa" value="0">
<input type='checkbox' name="google2fa" value="1" {{ $current_user->hasTwoFactor ? "checked" : "" }}>
<input type='checkbox' name="google2fa" value="1" {{ $currentUser->hasTwoFactor ? "checked" : "" }}>
{{ trans('forms.setup.enable_google2fa') }}
</label>
</div>
@if($current_user->hasTwoFactor)
@if($currentUser->hasTwoFactor)
<div class="form-group">
<?php
$google2fa_url = PragmaRX\Google2FA\Vendor\Laravel\Facade::getQRCodeGoogleUrl(
'Cachet',
$current_user->email,
$current_user->google_2fa_secret
$currentUser->email,
$currentUser->google_2fa_secret
);
?>
<img src="{{ $google2fa_url }}" class="img-responsive">

8
resources/views/index.blade.php
View File

@@ -1,7 +1,13 @@
@extends('layout.master')
@section('content')
@modules
@include('partials.modules.messages')
@include('partials.modules.status')
@include('partials.modules.components')
@include('partials.modules.metrics')
@include('partials.modules.stickied')
@include('partials.modules.scheduled')
@include('partials.modules.timeline')
@stop
@section('bottom-content')

8
resources/views/layout/clean.blade.php
View File

@@ -20,10 +20,10 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ asset('/img/apple-touch-icon-144x144.png') }}">
<link rel="apple-touch-icon" sizes="152x152" href="{{ asset('/img/apple-touch-icon-152x152.png') }}">
<title>{{ $page_title or $site_title }}</title>
<title>{{ $pageTitle or $siteTitle }}</title>
@if($enable_external_dependencies)
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css"> --}}
@if($enableExternalDependencies)
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> --}}
@endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
@yield('css')
@@ -32,7 +32,7 @@
<script type="text/javascript">
var Global = {};
Global.locale = '{{ $app_locale }}';
Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>

10
resources/views/layout/dashboard.blade.php
View File

@@ -20,16 +20,16 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ asset('/img/apple-touch-icon-144x144.png') }}">
<link rel="apple-touch-icon" sizes="152x152" href="{{ asset('/img/apple-touch-icon-152x152.png') }}">
<title>{{ $page_title or $site_title }}</title>
<title>{{ $pageTitle or $siteTitle }}</title>
<script>
window.Global = {}
Global.locale = '{{ $app_locale }}';
Global.locale = '{{ $appLocale }}';
Global.csrfToken = '{{ csrf_token() }}';
</script>
@if($enable_external_dependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
@yield('css')
@@ -44,7 +44,7 @@
<div class="wrapper" id="app">
@include('dashboard.partials.sidebar')
<div class="page-content">
@if(!$is_writeable)
@if(!$isWriteable)
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">

31
resources/views/layout/master.blade.php
View File

@@ -7,25 +7,25 @@
<meta name="env" content="{{ app('env') }}">
<meta name="token" content="{{ csrf_token() }}">
<link rel="alternate" type="application/atom+xml" href="{{ cachet_route('feed.atom') }}" title="{{ $site_title }} - Atom Feed">
<link rel="alternate" type="application/rss+xml" href="{{ cachet_route('feed.rss') }}" title="{{ $site_title }} - RSS Feed">
<link rel="alternate" type="application/atom+xml" href="{{ cachet_route('feed.atom') }}" title="{{ $siteTitle }} - Atom Feed">
<link rel="alternate" type="application/rss+xml" href="{{ cachet_route('feed.rss') }}" title="{{ $siteTitle }} - RSS Feed">
<!-- Mobile friendliness -->
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $app_name]))">
<meta name="description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $appName]))">
<meta property="og:type" content="website">
<meta property="og:title" content="@yield('title', $site_title)">
<meta property="og:image" content="/img/favicon.png">
<meta property="og:description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $app_name]))">
<meta property="og:description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $appName]))">
<!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
<meta http-equiv="cleartype" content="on">
<meta name="msapplication-TileColor" content="{{ $theme_greens }}" />
<meta name="msapplication-TileColor" content="{{ $themeGreens }}" />
<meta name="msapplication-TileImage" content="{{ asset('/img/favicon.png') }}" />
@if (isset($favicon))
@@ -44,10 +44,10 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ asset('/img/apple-touch-icon-144x144.png') }}">
<link rel="apple-touch-icon" sizes="152x152" href="{{ asset('/img/apple-touch-icon-152x152.png') }}">
<title>@yield('title', $site_title)</title>
<title>@yield('title', $siteTitle)</title>
@if($enable_external_dependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/app.css') }}">
@@ -55,26 +55,25 @@
@include('partials.crowdin')
@if($app_stylesheet)
@if($appStylesheet)
<style type="text/css">
{!! $app_stylesheet !!}
{!! $appStylesheet !!}
</style>
@endif
<script type="text/javascript">
var Global = {};
var refreshRate = parseInt("{{ $app_refresh_rate }}");
var refreshRate = parseInt("{{ $appRefreshRate }}");
function refresh() {
window.location.reload(true);
window.location.reload(true);
}
if(refreshRate > 0) {
setTimeout(refresh, refreshRate * 1000);
if (refreshRate > 0) {
setTimeout(refresh, refreshRate * 1000);
}
Global.locale = '{{ $app_locale }}';
Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>

15
resources/views/notifications/incident/new.blade.php Normal file
View File

@@ -0,0 +1,15 @@
@component('mail::message')
# {{ trans('notifications.incident.new.mail.greeting', ['app_name' => Config::get('setting.app_name')]) }}
{{ $incident->message }}
@component('mail::button', ['url' => $actionUrl])
{{ $actionText }}
@endcomponent
Thanks,<br>
{{ Config::get('setting.app_name') }}
@include('notifications.partials.subscription')
@endcomponent

3
resources/views/notifications/partials/subscription.blade.php Normal file
View File

@@ -0,0 +1,3 @@
@component('mail::subcopy')
[{{ $unsubscribeText }}]({{ $unsubscribeUrl }}) &mdash; [{{ $manageSubscriptionText }}]({{ $manageSubscriptionUrl }})
@endcomponent

4
resources/views/partials/about-app.blade.php
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

18
resources/views/partials/analytics.blade.php
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

16
resources/views/partials/banner.blade.php
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:{{ $appBannerType }};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>

10
resources/views/partials/components.blade.php
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

8
resources/views/partials/components_form.blade.php
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>

2
resources/views/partials/crowdin.blade.php
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']);

0
resources/views/dashboard/partials/_error.blade.php → resources/views/partials/error.blade.php
View File

15
resources/views/partials/errors.blade.php Normal file
View File

@@ -0,0 +1,15 @@
@if ($errors->any())
@include('partials.error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@endif
@if ($message = Session::get('success'))
@include('partials.error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('warning'))
@include('partials.error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('info'))
@include('partials.error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@endif

14
resources/views/partials/footer.blade.php
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>

2
resources/views/partials/incidents.blade.php
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>

2
resources/views/partials/modules/components.blade.php
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>

2
resources/views/partials/modules/messages.blade.php
View File

@@ -1,3 +1,3 @@
<div class="section-messages">
@include('dashboard.partials.errors')
@include('partials.errors')
</div>

4
resources/views/partials/modules/metrics.blade.php
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() }}"></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>

2
resources/views/partials/modules/scheduled.blade.php
View File

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

2
resources/views/partials/modules/status.blade.php
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>

4
resources/views/partials/modules/stickied.blade.php
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>

12
resources/views/partials/modules/timeline.blade.php
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>

8
resources/views/partials/nav.blade.php
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>

7
resources/views/partials/schedule.blade.php
View File

@@ -4,16 +4,17 @@
<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>
<div class="markdown-body">
{!! $schedule->formatted_message !!}
</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>

114
resources/views/partials/stylesheet.blade.php
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>

26
resources/views/setup/index.blade.php
View File

@@ -39,8 +39,8 @@
<label>{{ trans('forms.setup.cache_driver') }}</label>
<select name="env[cache_driver]" class="form-control" required v-model="env.cache_driver">
<option disabled>{{ trans('forms.setup.cache_driver') }}</option>
@foreach($cache_drivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.cache_driver', $cache_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@foreach($cacheDrivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.cache_driver', $cacheConfig['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@endforeach
</select>
@if($errors->has('env.cache_driver'))
@@ -51,8 +51,8 @@
<label>{{ trans('forms.setup.queue_driver') }}</label>
<select name="env[queue_driver]" class="form-control" required v-model="env.queue_driver">
<option disabled>{{ trans('forms.setup.queue_driver') }}</option>
@foreach($queue_drivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.queue_driver', $queue_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@foreach($queueDrivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.queue_driver', $queueConfig['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@endforeach
</select>
@if($errors->has('env.queue_driver'))
@@ -63,8 +63,8 @@
<label>{{ trans('forms.setup.session_driver') }}</label>
<select name="env[session_driver]" class="form-control" required v-model="env.session_driver">
<option disabled>{{ trans('forms.setup.session_driver') }}</option>
@foreach($cache_drivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.session_driver', $session_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@foreach($cacheDrivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.session_driver', $sessionConfig['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@endforeach
</select>
@if($errors->has('env.session_driver'))
@@ -78,8 +78,8 @@
<label>{{ trans('forms.setup.mail_driver') }}</label>
<select name="env[mail_driver]" class="form-control" required v-model="env.mail_driver">
<option disabled>{{ trans('forms.setup.mail_driver') }}</option>
@foreach($mail_drivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.mail_driver', $mail_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@foreach($mailDrivers as $driver => $driverName)
<option value="{{ $driver }}" {{ Binput::old('env.mail_driver', $mailConfig['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
@endforeach
</select>
@if($errors->has('env.mail_driver'))
@@ -88,28 +88,28 @@
</div>
<div class="form-group">
<label>{{ trans('forms.setup.mail_host') }}</label>
<input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}" :required="mail.requiresHost">
<input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mailConfig['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}" :required="mail.requiresHost">
@if($errors->has('env.mail_host'))
<span class="text-danger">{{ $errors->first('env.mail_host') }}</span>
@endif
</div>
<div class="form-group">
<label>{{ trans('forms.setup.mail_address') }}</label>
<input type="text" class="form-control" name="env[mail_address]" value="{{ Binput::old('env.mail_address', $mail_config['from']['address']) }}" placeholder="notifications@alt-three.com">
<input type="text" class="form-control" name="env[mail_address]" value="{{ Binput::old('env.mail_address', $mailConfig['from']['address']) }}" placeholder="notifications@alt-three.com">
@if($errors->has('env.mail_address'))
<span class="text-danger">{{ $errors->first('env.mail_address') }}</span>
@endif
</div>
<div class="form-group">
<label>{{ trans('forms.setup.mail_username') }}</label>
<input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mail_config['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}" :required="mail.requiresUsername">
<input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mailConfig['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}" :required="mail.requiresUsername">
@if($errors->has('env.mail_username'))
<span class="text-danger">{{ $errors->first('env.mail_username') }}</span>
@endif
</div>
<div class="form-group">
<label>{{ trans('forms.setup.mail_password') }}</label>
<input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}" :required="mail.requiresUsername">
<input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mailConfig['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}" :required="mail.requiresUsername">
@if($errors->has('env.mail_password'))
<span class="text-danger">{{ $errors->first('env.mail_password') }}</span>
@endif
@@ -161,7 +161,7 @@
<select name="settings[app_locale]" class="form-control" required>
<option value="">Select Language</option>
@foreach($langs as $key => $lang)
<option value="{{ $key }}" @if(Binput::old('settings.app_locale') == $key || $user_language == $key) selected @endif>
<option value="{{ $key }}" @if(Binput::old('settings.app_locale') == $key || $userLanguage == $key) selected @endif>
{{ $lang['name'] }}
</option>
@endforeach

12
resources/views/signup.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layout.master')
@section('title', trans('cachet.signup.title').' | '.$site_title)
@section('title', trans('cachet.signup.title').' | '.$siteTitle)
@section('content')
<div class="pull-right">
@@ -9,19 +9,19 @@
<div class="clearfix"></div>
@if($app_banner)
@if($appBanner)
<div class="row app-banner">
<div class="col-md-12 text-center">
@if($app_domain)
<a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
@if($appDomain)
<a href="{{ $appDomain }}"><img src="data:{{ $appBannerType }};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>
@endif
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="panel panel-meassage">
<div class="panel-heading">

4
resources/views/single-incident.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layout.master')
@section('title', array_get($incident->meta, 'seo.title', $incident->name).' | '.$site_title)
@section('title', array_get($incident->meta, 'seo.title', $incident->name).' | '.$siteTitle)
@section('description', array_get($incident->meta, 'seo.description', trans('cachet.meta.description.incident', ['name' => $incident->name, 'date' => $incident->occurred_at_formatted])))
@@ -33,7 +33,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-body">
@if($current_user)
@if($currentUser)
<div class="pull-right btn-group">
<a href="{{ cachet_route('dashboard.incidents.updates.edit', ['incident' => $incident, 'incident_update' => $update]) }}" class="btn btn-default">{{ trans('forms.edit') }}</a>
</div>

2
resources/views/single-schedule.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layout.master')
@section('title', $schedule->name.' | '.$site_title)
@section('title', $schedule->name.' | '.$siteTitle)
@section('description', trans('cachet.meta.description.schedule', ['name' => $schedule->name, 'startDate' => $schedule->scheduled_at_formatted]))

12
resources/views/subscribe/manage.blade.php
View File

@@ -8,18 +8,18 @@
<div class="clearfix"></div>
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="row">
<div class="col-xs-12 col-lg-offset-2 col-lg-8">
<div class="text-center margin-bottom">
<h1>{{ $app_name }} Notifications</h1>
<h1>{{ $appName }} Notifications</h1>
<p>Manage notifications for <strong>{{ $subscriber->email }}</strong></p>
</div>
<form action="{{ cachet_route('subscribe.manage', [$subscriber->verify_code], 'post') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@if($component_groups->isNotEmpty() || $ungrouped_components->isNotEmpty())
@foreach($component_groups as $componentGroup)
@if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
@foreach($componentGroups as $componentGroup)
<div class="list-group components">
@if($componentGroup->enabled_components->count() > 0)
<div class="list-group-item group-name">
@@ -38,12 +38,12 @@
</div>
@endforeach
@if($ungrouped_components->isNotEmpty())
@if($ungroupedComponents->isNotEmpty())
<ul class="list-group components">
<div class="list-group-item group-name">
<strong>{{ trans('cachet.components.group.other') }}</strong>
</div>
@foreach($ungrouped_components as $component)
@foreach($ungroupedComponents as $component)
@include('partials.component_input', compact($component))
@endforeach
</ul>

6
resources/views/subscribe/subscribe.blade.php
View File

@@ -1,8 +1,8 @@
@extends('layout.master')
@section('title', trans('cachet.subscriber.subscribe'). " | ". $site_title))
@section('title', trans('cachet.subscriber.subscribe'). " | ". $siteTitle))
@section('description', trans('cachet.meta.description.subscribe', ['app' => $site_title]))
@section('description', trans('cachet.meta.description.subscribe', ['app' => $siteTitle]))
@section('content')
<div class="pull-right">
@@ -11,7 +11,7 @@
<div class="clearfix"></div>
@include('dashboard.partials.errors')
@include('partials.errors')
<div class="row">
<div class="col-xs-12 col-lg-offset-2 col-lg-8">

8
resources/views/vendor/notifications/email.blade.php vendored
View File

@@ -42,7 +42,7 @@ $style = [
/* Type ------------------------------ */
'anchor' => "color: {$theme_links};",
'anchor' => "color: {$themeLinks};",
'header-1' => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
'paragraph' => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
'paragraph-sub' => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
@@ -54,9 +54,9 @@ $style = [
background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px;
text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
'button--green' => "background-color: {$theme_greens};",
'button--red' => "background-color: {$theme_reds};",
'button--blue' => "background-color: {$theme_blues};",
'button--green' => "background-color: {$themeGreens};",
'button--red' => "background-color: {$themeReds};",
'button--blue' => "background-color: {$themeBlues};",
];
?>