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

Merge remote-tracking branch 'forked/2.4' into upgrade-google2fa

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
Max Kovalenko
2019-07-13 10:39:25 +03:00
parent 87281f905a 3d0322dded
commit 2b2337eb8e
55 changed files with 788 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@
@if($components->count() > 1)
<span class="drag-handle"><i class="ion ion-drag"></i></span>
@endif
{{ $component->name }} <small>{{ $component->human_status }}</small>
{!! $component->name !!} <small>{{ $component->human_status }}</small>
</h4>
@if($component->group)
<p><small>{{ trans('dashboard.components.listed_group', ['name' => $component->group->name]) }}</small></p>

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

@@ -83,12 +83,12 @@
@foreach($componentsInGroups as $group)
<optgroup label="{{ $group->name }}">
@foreach($group->components as $component)
<option value="{{ $component->id }}">{{ $component->name }}</option>
<option value="{{ $component->id }}">{!! $component->name !!}</option>
@endforeach
</optgroup>
@endforeach
@foreach($componentsOutGroups as $component)
<option value="{{ $component->id }}">{{ $component->name }}</option>
<option value="{{ $component->id }}">{!! $component->name !!}</option>
@endforeach
</select>
</div>

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

@@ -57,7 +57,15 @@
<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>
@if($notificationsEnabled)
<input type="hidden" name="notify" value="0">
<div class="checkbox">
<label>
<input type="checkbox" name="notify" value="1" checked="{{ Binput::old('notify', 'checked') }}">
{{ trans('forms.incidents.notify_subscribers') }}
</label>
</div>
@endif
<div class="form-group">
<div class="btn-group">
<button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>

2
resources/views/dashboard/partials/component.blade.php
View File

@@ -2,7 +2,7 @@
<form class='component-inline form-vertical' data-messenger="{{trans('dashboard.components.edit.success')}}">
<div class="row striped-list-item">
<div class="col-lg-4 col-md-3 col-sm-12">
<h5 class="{{ $component->status_color }}">{{ $component->name }}</h5>
<h5 class="{{ $component->status_color }}">{!! $component->name !!}</h5>
</div>
<div class="col-lg-8 col-md-9 col-sm-12 radio-items component-inline-update">
@foreach(trans('cachet.components.status') as $statusID => $status)

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

@@ -2,10 +2,7 @@
<div class="sidebar-inner">
<div class="profile">
<a href="{{ cachet_route('dashboard.user') }}">
<span class="avatar"><img src="{{ $currentUser->avatar }}"></span>
</a>
<a href="{{ cachet_route('dashboard.user') }}">
<h4 class="username">{{ $currentUser->username }}</h4>
<h4 class="username"><i class='ion ion-person'></i> {{ $currentUser->username }}</h4>
</a>
</div>
<div class="clearfix"></div>

7
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($currentUser->isAdmin && $enableSubscribers)
@if($currentUser->isAdmin)
<a class="btn btn-md btn-success pull-right" href="{{ cachet_route('dashboard.subscribers.create') }}">
{{ trans('dashboard.subscribers.add.title') }}
</a>
@@ -19,11 +19,7 @@
<div class="row">
<div class="col-sm-12">
<p class="lead">
@if($enableSubscribers)
{{ trans('dashboard.subscribers.description') }}
@else
{{ trans('dashboard.subscribers.description_disabled') }}
@endif
</p>
<div class="striped-list">
@@ -51,6 +47,7 @@
@endif
</div>
<div class="col-xs-3 text-right">
<a href="{{ cachet_route('subscribe.manage', $subscriber->verify_code) }}" target="_blank" class="btn btn-success">{{ trans('forms.edit') }}</a>
<a href="{{ cachet_route('dashboard.subscribers.delete', [$subscriber->id], 'delete') }}" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
</div>
</div>

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

@@ -27,13 +27,12 @@
<div class="user-grid">
@foreach($teamMembers as $member)
<div class="user col-sm-3 col-xs-6">
<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>
<div class="email">{{ $member->email }}</div>
</div>
<a href="@if($currentUser->id == $member->id) {{ cachet_route('dashboard.team.edit', $member) }} @else /dashboard/team/{{ $member->id }} @endif">
<div class="user col-sm-3 col-xs-6">
<div class="name">{{ $member->username }}</div>
<div class="email">{{ $member->email }}</div>
</div>
</a>
@endforeach
</div>
</div>

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

@@ -25,7 +25,7 @@
@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') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css')
@include('partials.crowdin')
@@ -35,8 +35,8 @@
Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="@yield('bodyClass')">
@@ -45,5 +45,5 @@
</div>
</body>
@yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>

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

@@ -31,13 +31,13 @@
@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') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css')
@include('partials.crowdin')
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="dashboard">
@@ -61,5 +61,5 @@
</div>
</body>
@yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>

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

@@ -16,7 +16,7 @@
<meta property="og:type" content="website">
<meta property="og:title" content="@yield('title', $siteTitle)">
<meta property="og:image" content="/img/favicon.png">
<meta property="og:image" content=" {{ asset('/img/favicon.png') }}">
<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 -->
@@ -48,7 +48,7 @@
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/app.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/app.css')) }} ">
@include('partials.stylesheet')
@@ -74,8 +74,8 @@
Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="status-page @yield('bodyClass')">
@yield('outer-content')
@@ -88,5 +88,5 @@
@yield('bottom-content')
</body>
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>

4
resources/views/partials/component.blade.php
View File

@@ -1,8 +1,8 @@
<li class="list-group-item {{ $component->group_id ? "sub-component" : "component" }}">
@if($component->link)
<a href="{{ $component->link }}" target="_blank" class="links">{{ $component->name }}</a>
<a href="{{ $component->link }}" target="_blank" class="links">{!! $component->name !!}</a>
@else
{{ $component->name }}
{!! $component->name !!}
@endif
@if($component->description)

2
resources/views/partials/component_input.blade.php
View File

@@ -8,7 +8,7 @@
@if (in_array($component->id, $subscriptions) || $subscriber->global)
checked="checked"
@endif />
{{ $component->name }}
{!! $component->name !!}
</label>
@if($component->description)
<i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i>

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

@@ -33,7 +33,8 @@
@if($incident->updates->isNotEmpty())
<div class="list-group">
@foreach($incident->updates as $update)
<a class="list-group-item incident-update-item" href="{{ $update->permalink }}">
<li class="list-group-item incident-update-item">
<i class="{{ $update->icon }}" title="{{ $update->human_status }}" data-toggle="tooltip"></i>
{!! $update->formatted_message !!}
<small>
@@ -42,9 +43,9 @@
data-timeago="{{ $update->timestamp_iso }}">
</abbr>
</small>
<span class="ion-ios-arrow-right pull-right"></span>
<a href="{{ $update->permalink }}" class="pull-right"><span class="ion-ios-arrow-right"></span></a>
</a>
</li>
@endforeach
</div>
@endif