改进
This commit is contained in:
parent
03ab06e81b
commit
9e300d5875
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<h3>{{ $application->name }}</h3>
|
<h3>{{ $application->name }}</h3>
|
||||||
{{-- <a class="mt-3" href="{{ route('admin.applications.show', $application) }}">查看</a>--}}
|
{{-- <a class="mt-3" href="{{ route('admin.applications.show', $application) }}">查看</a>--}}
|
||||||
|
|
||||||
<form method="POST" action="{{ route('admin.applications.update', $application)}}">
|
<form method="POST" action="{{ route('admin.applications.update', $application)}}">
|
||||||
@csrf
|
@csrf
|
||||||
|
@ -29,8 +29,10 @@
|
|||||||
<option value="running" {{ $host->status == 'running' ? 'selected' : '' }}>运行中</option>
|
<option value="running" {{ $host->status == 'running' ? 'selected' : '' }}>运行中</option>
|
||||||
<option value="stopped" {{ $host->status == 'stopped' ? 'selected' : '' }}>已停止</option>
|
<option value="stopped" {{ $host->status == 'stopped' ? 'selected' : '' }}>已停止</option>
|
||||||
<option value="suspended" {{ $host->status == 'suspended' ? 'selected' : '' }}>已暂停</option>
|
<option value="suspended" {{ $host->status == 'suspended' ? 'selected' : '' }}>已暂停</option>
|
||||||
<option value="error" {{ $host->status == 'error' ? 'selected' : '' }}>错误 (提交此项目将会被忽略)</option>
|
<option value="error" {{ $host->status == 'error' ? 'selected' : '' }}>错误 (提交此项目将会被忽略)
|
||||||
<option value="error" {{ $host->status == 'pending' ? 'selected' : '' }}>等待中 (提交此项目将会被忽略)</option>
|
</option>
|
||||||
|
<option value="error" {{ $host->status == 'pending' ? 'selected' : '' }}>等待中 (提交此项目将会被忽略)
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<x-host-status :status="$host->status" />
|
<x-host-status :status="$host->status"/>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ $host->updated_at }}
|
{{ $host->updated_at }}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<h4>正在登录到 {{ $module->name }}...</h4>
|
<h4>正在登录到 {{ $module->name }}...</h4>
|
||||||
|
|
||||||
<form class="visually-hidden" action="{{ $resp['url'] }}" method="GET" id="fast-login">
|
<form class="visually-hidden" action="{{ $resp['url'] }}" method="GET" id="fast-login">
|
||||||
<input type="hidden" name="fast_login_token" value="{{ $resp['token'] }}" />
|
<input type="hidden" name="fast_login_token" value="{{ $resp['token'] }}"/>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -16,6 +16,5 @@
|
|||||||
}, 1000)
|
}, 1000)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
|
@ -1,26 +1,26 @@
|
|||||||
{{--@auth--}}
|
{{--@auth--}}
|
||||||
{{--<span class="module_name" module="{{ $t->module_id }}">{{ $t->module_id }}</span>--}}
|
{{--<span class="module_name" module="{{ $t->module_id }}">{{ $t->module_id }}</span>--}}
|
||||||
<script>
|
<script>
|
||||||
let modules = {!! $modules !!},
|
let modules = {!! $modules !!},
|
||||||
display_name = "{{ config('app.display_name') }}"
|
display_name = "{{ config('app.display_name') }}"
|
||||||
|
|
||||||
let m = {}
|
let m = {}
|
||||||
modules.forEach((module) => {
|
modules.forEach((module) => {
|
||||||
// 转换成 key value
|
// 转换成 key value
|
||||||
m[module.id] = module.name
|
m[module.id] = module.name
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
document.querySelectorAll('.module_name').forEach((node) => {
|
document.querySelectorAll('.module_name').forEach((node) => {
|
||||||
let module = node.getAttribute('module')
|
let module = node.getAttribute('module')
|
||||||
|
|
||||||
if (module == null || module === "") {
|
if (module == null || module === "") {
|
||||||
node.innerText = display_name
|
node.innerText = display_name
|
||||||
} else {
|
} else {
|
||||||
console.log(module)
|
console.log(module)
|
||||||
node.innerText = m[module] ?? '模块'
|
node.innerText = m[module] ?? '模块'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{{--@endauth--}}
|
{{--@endauth--}}
|
||||||
|
@ -28,7 +28,7 @@ class="text-decoration-underline">服务条款</a></p>
|
|||||||
<x-alert-warning>
|
<x-alert-warning>
|
||||||
<div>
|
<div>
|
||||||
像密码一样保管好您的 API Token。
|
像密码一样保管好您的 API Token。
|
||||||
<br />
|
<br/>
|
||||||
{{ session('token') }}
|
{{ session('token') }}
|
||||||
</div>
|
</div>
|
||||||
</x-alert-warning>
|
</x-alert-warning>
|
||||||
|
@ -48,5 +48,4 @@ function beforeContinue() {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
@endsection
|
@endsection
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="content-cell" align="center">
|
<td class="content-cell" align="center">
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="header">
|
<td class="header">
|
||||||
<a href="{{ $url }}" style="display: inline-block;">
|
<a href="{{ $url }}" style="display: inline-block;">
|
||||||
@if (trim($slot) === 'Laravel')
|
@if (trim($slot) === 'Laravel')
|
||||||
<img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
|
<img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
|
||||||
@else
|
@else
|
||||||
{{ $slot }}
|
{{ $slot }}
|
||||||
@endif
|
@endif
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -1,56 +1,58 @@
|
|||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||||
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
<meta name="color-scheme" content="light">
|
<meta name="color-scheme" content="light">
|
||||||
<meta name="supported-color-schemes" content="light">
|
<meta name="supported-color-schemes" content="light">
|
||||||
<style>
|
<style>
|
||||||
@media only screen and (max-width: 600px) {
|
@media only screen and (max-width: 600px) {
|
||||||
.inner-body {
|
.inner-body {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.footer {
|
.footer {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 500px) {
|
@media only screen and (max-width: 500px) {
|
||||||
.button {
|
.button {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
{{ $header ?? '' }}
|
{{ $header ?? '' }}
|
||||||
|
|
||||||
<!-- Email Body -->
|
<!-- Email Body -->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="body" width="100%" cellpadding="0" cellspacing="0">
|
<td class="body" width="100%" cellpadding="0" cellspacing="0">
|
||||||
<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0"
|
||||||
<!-- Body content -->
|
role="presentation">
|
||||||
<tr>
|
<!-- Body content -->
|
||||||
<td class="content-cell">
|
<tr>
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
<td class="content-cell">
|
||||||
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
|
|
||||||
{{ $subcopy ?? '' }}
|
{{ $subcopy ?? '' }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
{{ $footer ?? '' }}
|
{{ $footer ?? '' }}
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -1,27 +1,27 @@
|
|||||||
@component('mail::layout')
|
@component('mail::layout')
|
||||||
{{-- Header --}}
|
{{-- Header --}}
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('mail::header', ['url' => config('app.url')])
|
@component('mail::header', ['url' => config('app.url')])
|
||||||
{{ config('app.display_name') }}
|
{{ config('app.display_name') }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
|
|
||||||
{{-- Body --}}
|
{{-- Body --}}
|
||||||
{{ $slot }}
|
{{ $slot }}
|
||||||
|
|
||||||
{{-- Subcopy --}}
|
{{-- Subcopy --}}
|
||||||
@isset($subcopy)
|
@isset($subcopy)
|
||||||
@slot('subcopy')
|
@slot('subcopy')
|
||||||
@component('mail::subcopy')
|
@component('mail::subcopy')
|
||||||
{{ $subcopy }}
|
{{ $subcopy }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
@endisset
|
@endisset
|
||||||
|
|
||||||
{{-- Footer --}}
|
{{-- Footer --}}
|
||||||
@slot('footer')
|
@slot('footer')
|
||||||
@component('mail::footer')
|
@component('mail::footer')
|
||||||
© {{ date('Y') }} {{ config('app.display_name') }}. @lang('All rights reserved.')
|
© {{ date('Y') }} {{ config('app.display_name') }}. @lang('All rights reserved.')
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
@endcomponent
|
@endcomponent
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<div class="table">
|
<div class="table">
|
||||||
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
{{ Illuminate\Mail\Markdown::parse($slot) }}
|
||||||
</div>
|
</div>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
{!! strip_tags($slot) !!}
|
{!! strip_tags($slot) !!}
|
||||||
@isset($subcopy)
|
@isset($subcopy)
|
||||||
|
|
||||||
{!! strip_tags($subcopy) !!}
|
{!! strip_tags($subcopy) !!}
|
||||||
@endisset
|
@endisset
|
||||||
|
|
||||||
{!! strip_tags($footer) !!}
|
{!! strip_tags($footer) !!}
|
||||||
|
106
resources/views/vendor/notifications/email.blade.php
vendored
106
resources/views/vendor/notifications/email.blade.php
vendored
@ -1,58 +1,58 @@
|
|||||||
@component('mail::message')
|
@component('mail::message')
|
||||||
{{-- Greeting --}}
|
{{-- Greeting --}}
|
||||||
@if (! empty($greeting))
|
@if (! empty($greeting))
|
||||||
# {{ $greeting }}
|
# {{ $greeting }}
|
||||||
@else
|
@else
|
||||||
@if ($level === 'error')
|
@if ($level === 'error')
|
||||||
# @lang('Whoops!')
|
# @lang('Whoops!')
|
||||||
@else
|
@else
|
||||||
# @lang('Hello!')
|
# @lang('Hello!')
|
||||||
@endif
|
@endif
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{-- Intro Lines --}}
|
{{-- Intro Lines --}}
|
||||||
@foreach ($introLines as $line)
|
@foreach ($introLines as $line)
|
||||||
{{ $line }}
|
{{ $line }}
|
||||||
|
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
||||||
{{-- Action Button --}}
|
{{-- Action Button --}}
|
||||||
@isset($actionText)
|
@isset($actionText)
|
||||||
<?php
|
<?php
|
||||||
$color = match ($level) {
|
$color = match ($level) {
|
||||||
'success', 'error' => $level,
|
'success', 'error' => $level,
|
||||||
default => 'primary',
|
default => 'primary',
|
||||||
};
|
};
|
||||||
?>
|
?>
|
||||||
@component('mail::button', ['url' => $actionUrl, 'color' => $color])
|
@component('mail::button', ['url' => $actionUrl, 'color' => $color])
|
||||||
{{ $actionText }}
|
{{ $actionText }}
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endisset
|
@endisset
|
||||||
|
|
||||||
{{-- Outro Lines --}}
|
{{-- Outro Lines --}}
|
||||||
@foreach ($outroLines as $line)
|
@foreach ($outroLines as $line)
|
||||||
{{ $line }}
|
{{ $line }}
|
||||||
|
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
||||||
{{-- Salutation --}}
|
{{-- Salutation --}}
|
||||||
@if (! empty($salutation))
|
@if (! empty($salutation))
|
||||||
{{ $salutation }}
|
{{ $salutation }}
|
||||||
@else
|
@else
|
||||||
@lang('Regards'),<br>
|
@lang('Regards'),<br>
|
||||||
{{ config('app.name') }}
|
{{ config('app.name') }}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{-- Subcopy --}}
|
{{-- Subcopy --}}
|
||||||
@isset($actionText)
|
@isset($actionText)
|
||||||
@slot('subcopy')
|
@slot('subcopy')
|
||||||
@lang(
|
@lang(
|
||||||
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
|
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
|
||||||
'into your web browser:',
|
'into your web browser:',
|
||||||
[
|
[
|
||||||
'actionText' => $actionText,
|
'actionText' => $actionText,
|
||||||
]
|
]
|
||||||
) <span class="break-all">[{{ $displayableActionUrl }}]({{ $actionUrl }})</span>
|
) <span class="break-all">[{{ $displayableActionUrl }}]({{ $actionUrl }})</span>
|
||||||
@endslot
|
@endslot
|
||||||
@endisset
|
@endisset
|
||||||
@endcomponent
|
@endcomponent
|
||||||
|
Loading…
Reference in New Issue
Block a user