Skip to content

Commit 9899eef

Browse files
authored
Merge pull request #392 from dbarzin/dev
fix confirm and layout actions
2 parents 9c044b7 + a806acf commit 9899eef

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

resources/views/actions/close.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<div class="cell-1">
135135
<strong>{{ trans('cruds.action.fields.owners') }}</strong>
136136
</div>
137-
<div class="cell">
137+
<div class="cell-6">
138138
@foreach($action->owners as $owner)
139139
{{ $owner->name }}
140140
@if ($action->owners->last()!=$owner)

resources/views/actions/create.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<div class="cell-1">
107107
<strong>{{ trans('cruds.action.fields.owners') }}</strong>
108108
</div>
109-
<div class="cell-4">
109+
<div class="cell-6">
110110
<select data-role="select" name="owners[]" id="owners" multiple>
111111
@foreach($users as $user)
112112
<option value="{{ $user->id }}" {{ in_array($user->id, old('owners', [])) ? 'selected' : '' }}>{{ $user->name }}</option>

resources/views/actions/edit.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<div class="cell-1">
142142
<strong>{{ trans('cruds.action.fields.owners') }}</strong>
143143
</div>
144-
<div class="cell-4">
144+
<div class="cell-6">
145145
<select data-role="select" name="owners[]" id="owners" multiple>
146146
@foreach($users as $user)
147147
<option value="{{ $user->id }}" {{ (in_array($user->id, old('owners', [])) || $action->owners->contains($user->id)) ? 'selected' : '' }}>{{ $user->name }}</option>

resources/views/actions/show.blade.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<div class="cell-1">
138138
<strong>{{ trans('cruds.action.fields.owners') }}</strong>
139139
</div>
140-
<div class="cell">
140+
<div class="cell-6">
141141
@foreach($action->owners as $owner)
142142
{{ $owner->name }}
143143
@if ($action->owners->last()!=$owner)
@@ -174,12 +174,12 @@
174174
{{ trans('common.edit') }}
175175
</a>
176176
&nbsp;
177-
<button class="button alert" type="submit" onclick='this.form.action="/action/delete"'
178-
onSubmit="if(!confirm('{{ trans('common.confirm') }}')){return false;}">
179-
<span class="mif-fire"></span>
180-
&nbsp;
181-
{{ trans('common.delete') }}
182-
</button>
177+
<button class="button alert" type="submit"
178+
onclick="if (!confirm('{{ trans('common.confirm') }}')) return false; this.form.action='/action/delete';">
179+
<span class="mif-fire"></span>
180+
&nbsp;
181+
{{ trans('common.delete') }}
182+
</button>
183183
&nbsp;
184184
<a class="button dafault" href="/actions">
185185
<span class="mif-cancel"></span>

0 commit comments

Comments
 (0)