Skip to content

Commit a757d96

Browse files
authored
Merge pull request #345 from dbarzin/dev
Dev
2 parents a39e326 + 06a35dc commit a757d96

File tree

5 files changed

+378
-397
lines changed

5 files changed

+378
-397
lines changed
Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,63 @@
11
@extends("layout")
22

33
@section("content")
4-
<div class="p-3">
5-
<div data-role="panel" data-title-caption="{{ trans('cruds.domain.add') }}" data-collapsible="true" data-title-icon="<span class='mif-pencil'></span>">
6-
@if (count($errors))
7-
<div class="grid">
8-
<div class="cell-3 bg-red fg-white">
9-
<ul>
10-
@foreach ($errors->all() as $error)
11-
<li>{{ $error }}</li>
12-
@endforeach
13-
</ul>
14-
</div>
15-
</div>
16-
@endif
4+
<div data-role="panel" data-title-caption="{{ trans('cruds.domain.add') }}" data-collapsible="true" data-title-icon="<span class='mif-library'></span>">
175

18-
<form method="POST" action="/domains">
19-
@csrf
20-
<div class="grid">
21-
<div class="row">
22-
<div class="cell-1">
23-
<strong>{{ trans('cruds.domain.fields.framework') }}</strong>
24-
</div>
25-
<div class="cell-5">
26-
<input type="text" name="framework" value="{{ old('framework') }}" maxlength='32'>
27-
</div>
6+
@if (count($errors))
7+
<div class="remark alert">
8+
<span class="mif-report icon"></span>
9+
@foreach ($errors->all() as $error)
10+
{{ $error }}<br>
11+
@endforeach
12+
</div>
13+
@endif
14+
15+
<form method="POST" action="/domains">
16+
@csrf
17+
<div class="grid">
18+
<div class="row">
19+
<div class="cell-1">
20+
<strong>{{ trans('cruds.domain.fields.framework') }}</strong>
21+
</div>
22+
<div class="cell-5">
23+
<input type="text" name="framework" value="{{ old('framework') }}" maxlength='32'>
2824
</div>
25+
</div>
2926

30-
<div class="row">
31-
<div class="cell-1">
32-
<strong>{{ trans('cruds.domain.fields.name') }}</strong>
33-
</div>
34-
<div class="cell-5">
35-
<input type="text" name="title" value="{{ old('title') }}" maxlength='32'>
36-
</div>
27+
<div class="row">
28+
<div class="cell-1">
29+
<strong>{{ trans('cruds.domain.fields.name') }}</strong>
30+
</div>
31+
<div class="cell-5">
32+
<input type="text" name="title" value="{{ old('title') }}" maxlength='32'>
3733
</div>
34+
</div>
3835

39-
<div class="row">
40-
<div class="cell-1">
41-
<strong>{{ trans('cruds.domain.fields.description') }}</strong>
42-
</div>
43-
<div class="cell-5">
44-
<input type="text" name="description" value="{{ old('description') }}" maxlength='255'>
45-
</div>
36+
<div class="row">
37+
<div class="cell-1">
38+
<strong>{{ trans('cruds.domain.fields.description') }}</strong>
39+
</div>
40+
<div class="cell-5">
41+
<input type="text" name="description" value="{{ old('description') }}" maxlength='255'>
4642
</div>
43+
</div>
4744

48-
<div class="row">
49-
<div class="cell-5">
50-
<button type="submit" class="button success">
51-
<span class="mif-floppy-disk"></span>
52-
&nbsp;
53-
{{ trans('common.save') }}
54-
</button>
55-
</form>
56-
&nbsp;
57-
<form action="/domains">
58-
<button type="submit" class="button">
59-
<span class="mif-cancel"></span>
60-
&nbsp;
61-
{{ trans('common.cancel') }}
62-
</button>
63-
</form>
64-
</div>
45+
<div class="row">
46+
<div class="cell-5">
47+
<button type="submit" class="button success">
48+
<span class="mif-floppy-disk2"></span>
49+
&nbsp;
50+
{{ trans('common.save') }}
51+
</button>
52+
<a href="/domains" class="button">
53+
<span class="mif-cancel"></span>
54+
&nbsp;
55+
{{ trans('common.cancel') }}
56+
</a>
6557
</div>
6658
</div>
67-
</form>
68-
</div>
59+
</div>
60+
</form>
6961
</div>
7062

7163
@endsection
Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,60 @@
11
@extends("layout")
22

33
@section("content")
4-
<div class="p-3">
5-
<div data-role="panel" data-title-caption="{{ trans('cruds.domain.edit') }}" data-collapsible="true" data-title-icon="<span class='mif-pencil'></span>">
6-
@if (count($errors))
4+
<div data-role="panel" data-title-caption="{{ trans('cruds.domain.edit') }}" data-collapsible="true" data-title-icon="<span class='mif-library'></span>">
5+
6+
@if (count($errors))
7+
<div class="remark alert">
8+
<span class="mif-report icon"></span>
9+
@foreach ($errors->all() as $error)
10+
{{ $error }}<br>
11+
@endforeach
12+
</div>
13+
@endif
14+
15+
<form method="POST" action="/domains/{{ $domain->id }}">
16+
@method("PATCH")
17+
@csrf
718
<div class="grid">
8-
<div class="cell-3 bg-red fg-white">
9-
<ul>
10-
@foreach ($errors->all() as $error)
11-
<li>{{ $error }}</li>
12-
@endforeach
13-
</ul>
14-
</div>
15-
</div>
16-
@endif
17-
<form method="POST" action="/domains/{{ $domain->id }}">
18-
@method("PATCH")
19-
@csrf
20-
<div class="grid">
21-
<div class="row">
22-
<div class="cell-1">
23-
<label>{{ trans('cruds.domain.fields.framework') }}</label>
24-
</div>
25-
<div class="cell-3">
26-
<input type="text" class="input {{ $errors->has('framework') ? 'is-danger' : ''}}" name="framework" value="{{ $errors->has('framework') ? old('framework') : $domain->framework }}" maxlength='32'>
27-
</div>
19+
<div class="row">
20+
<div class="cell-1">
21+
<label>{{ trans('cruds.domain.fields.framework') }}</label>
22+
</div>
23+
<div class="cell-3">
24+
<input type="text" class="input {{ $errors->has('framework') ? 'is-danger' : ''}}" name="framework" value="{{ $errors->has('framework') ? old('framework') : $domain->framework }}" maxlength='32'>
2825
</div>
29-
<div class="row">
30-
<div class="cell-1">
31-
<label>{{ trans('cruds.domain.fields.name') }}</label>
32-
</div>
33-
<div class="cell-3">
34-
<input type="text" class="input {{ $errors->has('title') ? 'is-danger' : ''}}" name="title" value="{{ $errors->has('title') ? old('title') : $domain->title }}" maxlength='32'>
35-
</div>
26+
</div>
27+
<div class="row">
28+
<div class="cell-1">
29+
<label>{{ trans('cruds.domain.fields.name') }}</label>
30+
</div>
31+
<div class="cell-3">
32+
<input type="text" class="input {{ $errors->has('title') ? 'is-danger' : ''}}" name="title" value="{{ $errors->has('title') ? old('title') : $domain->title }}" maxlength='32'>
3633
</div>
37-
<div class="row">
38-
<div class="cell-1">
39-
<label class="label" for="description">{{ trans('cruds.domain.fields.description') }}</label>
40-
</div>
41-
<div class="cell-8">
42-
<input type="text" class="input {{ $errors->has('description') ? 'is-danger' : ''}}" name="description" value="{{ $errors->has('description') ? old('description') : $domain->description }}" maxlength='255'>
43-
</div>
34+
</div>
35+
<div class="row">
36+
<div class="cell-1">
37+
<label class="label" for="description">{{ trans('cruds.domain.fields.description') }}</label>
38+
</div>
39+
<div class="cell-8">
40+
<input type="text" class="input {{ $errors->has('description') ? 'is-danger' : ''}}" name="description" value="{{ $errors->has('description') ? old('description') : $domain->description }}" maxlength='255'>
4441
</div>
4542
</div>
46-
<button type="submit" class="button success">
47-
<span class="mif-floppy-disk"></span>
48-
&nbsp;
49-
{{ trans('common.save') }}
50-
</button>
51-
</form>
52-
&nbsp;
53-
<form action="/domains/{{ $domain->id }}">
54-
<button type="submit" class="button">
55-
<span class="mif-cancel"></span>
56-
&nbsp;
57-
{{ trans('common.cancel') }}
58-
</button>
59-
</form>
60-
</div>
43+
<div class="row">
44+
<div class="cell-6">
45+
<button type="submit" class="button success">
46+
<span class="mif-floppy-disk2"></span>
47+
&nbsp;
48+
{{ trans('common.save') }}
49+
</button>
50+
<a href="/domains/{{ $domain->id }}" class="button">
51+
<span class="mif-cancel"></span>
52+
&nbsp;
53+
{{ trans('common.cancel') }}
54+
</a>
55+
</div>
56+
</div>
57+
</div>
58+
</form>
6159
</div>
6260
@endsection
Lines changed: 58 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,76 @@
11
@extends("layout")
22

33
@section("content")
4-
<div class="p-3">
5-
<div data-role="panel" data-title-caption="{{ trans('cruds.domain.show') }}" data-collapsible="true" data-title-icon="<span class='mif-library'></span>">
6-
@if (count($errors))
7-
<div class="grid">
8-
<div class="cell-5 bg-red fg-white">
9-
<ul>
10-
@foreach ($errors->all() as $error)
11-
<li>{{ $error }}</li>
12-
@endforeach
13-
</ul>
14-
</div>
4+
<div data-role="panel" data-title-caption="{{ trans('cruds.domain.show') }}" data-collapsible="true" data-title-icon="<span class='mif-library'></span>">
5+
@if (count($errors))
6+
<div class="grid">
7+
<div class="cell-5 bg-red fg-white">
8+
<ul>
9+
@foreach ($errors->all() as $error)
10+
<li>{{ $error }}</li>
11+
@endforeach
12+
</ul>
1513
</div>
16-
@endif
17-
<div class="grid">
18-
<div class="row">
19-
<div class="cell-1">
20-
<strong>{{ trans('cruds.domain.fields.framework') }}</strong>
21-
</div>
22-
<div class="cell">
23-
{{ $domain->framework }}
24-
</div>
25-
</div>
26-
27-
<div class="row">
28-
<div class="cell-1">
29-
<strong>{{ trans('cruds.domain.fields.name') }}</strong>
30-
</div>
31-
<div class="cell">
32-
{{ $domain->title }}
33-
</div>
34-
</div>
14+
</div>
15+
@endif
16+
<div class="grid">
17+
<div class="row">
18+
<div class="cell-1">
19+
<strong>{{ trans('cruds.domain.fields.framework') }}</strong>
20+
</div>
21+
<div class="cell-6">
22+
{{ $domain->framework }}
23+
</div>
24+
</div>
3525

36-
<div class="row">
37-
<div class="cell-1">
38-
<strong>{{ trans('cruds.domain.fields.description') }}</strong>
39-
</div>
40-
<div class="cell">
41-
{{ $domain->description }}
42-
</div>
26+
<div class="row">
27+
<div class="cell-1">
28+
<strong>{{ trans('cruds.domain.fields.name') }}</strong>
4329
</div>
30+
<div class="cell-6">
31+
{{ $domain->title }}
32+
</div>
4433
</div>
4534

4635
<div class="row">
4736
<div class="cell-1">
37+
<strong>{{ trans('cruds.domain.fields.description') }}</strong>
38+
</div>
39+
<div class="cell-6">
40+
{{ $domain->description }}
4841
</div>
4942
</div>
43+
</div>
5044

51-
<div class="form-group">
52-
@if (Auth::User()->role==1)
53-
<form action="/domains/{{ $domain->id }}/edit">
54-
<button class="button primary">
55-
<span class="mif-wrench"></span>
56-
&nbsp;
57-
{{ trans('common.edit') }}
58-
</button>
59-
&nbsp;
60-
</form>
61-
<form action="/domains/{{ $domain->id }}" method="post" onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
62-
{{ method_field('delete') }}
63-
@csrf
64-
<button class="button alert" type="submit">
65-
<span class="mif-fire"></span>
66-
&nbsp;
67-
{{ trans('common.delete') }}
68-
</button>
69-
</form>
70-
&nbsp;
71-
@endif
72-
<form action="/domains">
73-
<button class="button">
45+
<div class="row">
46+
<div class="cell-1">
47+
</div>
48+
</div>
49+
50+
<div class="row">
51+
<div class="cell-6">
52+
@if (Auth::User()->role==1)
53+
<a href="/domains/{{ $domain->id }}/edit" class="button primary">
54+
<span class="mif-wrench"></span>
55+
&nbsp;
56+
{{ trans('common.edit') }}
57+
</a>
58+
<form action="/domains/{{ $domain->id }}" class="d-inline" method="post" onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
59+
{{ method_field('delete') }}
60+
@csrf
61+
<button class="button alert" type="submit">
62+
<span class="mif-fire"></span>
63+
&nbsp;
64+
{{ trans('common.delete') }}
65+
</button>
66+
</form>
67+
@endif
68+
<a href="/domains" class="button">
7469
<span class="mif-cancel"></span>
7570
&nbsp;
7671
{{ trans('common.cancel') }}
77-
</button>
78-
</form>
79-
</div>
80-
</div>
72+
</a>
73+
</div>
74+
</div>
8175
</div>
8276
@endsection

0 commit comments

Comments
 (0)