Skip to content

Commit 9f3a05a

Browse files
lfarrelllfarrell
committed
Fix issue with modals not displaying
1 parent fd4a874 commit 9f3a05a

File tree

12 files changed

+22
-22
lines changed

12 files changed

+22
-22
lines changed

‎resources/views/dashboard/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<div class="marks-module">
7070

7171
<div class="marks-controls">
72-
<div id="marks-filters" class="btn-group" data-toggle="buttons">
72+
<div id="marks-filters" class="btn-group" data-bs-toggle="buttons">
7373
<label class="btn btn-sm btn-secondary form-label" data-filter='all' title="Show all marks">
7474
<input class="btn-check" type="radio" name="marks-filter" value="all" checked="checked"><i class="fa fa-bookmark" aria-hidden="true"></i>
7575
</label>
@@ -85,7 +85,7 @@
8585
</div>
8686

8787
<div class="btn-group" style="margin-top: .3rem; float: right;">
88-
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user" data-toggle="dropdown" aria-hidden="true"></i>&nbsp; <span id="selected-marks-user">{{str_limit($currentUser->fullName(), 13)}}</span></button>
88+
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user" data-bs-toggle="dropdown" aria-hidden="true"></i>&nbsp; <span id="selected-marks-user">{{str_limit($currentUser->fullName(), 13)}}</span></button>
8989
<div id="user-dropdown" class="dropdown-menu dropdown-menu-right dropdown-scrollable">
9090
@foreach ($marksUsers as $user)
9191
<a class="dropdown-item marks-user @if ($currentUser->id === $user->id) current-user @endif" href="#" data-user-id="{{$user->id}}">{{$user->fullName()}}</a>

‎resources/views/instances/cuts/show.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@
121121
<div class="row last">
122122
<div class="col-sm-12 actions">
123123
<a class="btn btn-sm btn-secondary" role="button" href="{{ route('cuts.edit', $cut->id) }}"><i class="fa fa-pencil" aria-hidden="true"></i> Edit</a>
124-
<button class="btn btn-sm btn-secondary" data-toggle="modal" data-target=".confirm-delete-modal" style="outline: none; float: right;"><i class="fa fa-trash fa-fw" aria-hidden="true"></i></button>
124+
<button class="btn btn-sm btn-secondary" data-bs-toggle="modal" data-bs-target=".confirm-delete-modal" style="outline: none; float: right;"><i class="fa fa-trash fa-fw" aria-hidden="true"></i></button>
125125

126126
{{ html()->form('DELETE', route('cuts.destroy', [$cut->id]))->style('display: inline;')->open() }}
127127
<div class="modal fade confirm-delete-modal" tabindex="-1" role="dialog" aria-labelledby="confirmDelete" aria-hidden="true">
128128
<div class="modal-dialog modal-sm">
129129
<div class="modal-content">
130130

131131
<div class="modal-header">
132-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
132+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
133133
<span aria-hidden="true">&times;</span>
134134
</button>
135135
<h4 id="confirmDelete" class="modal-title">Confirm Delete</h4>

‎resources/views/instances/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div style="float: left;">
1414
<a id="instances-new" class="btn btn-sm btn-secondary" style="margin-right: 5px;" href="{{ route('instances.create') }}" role="button"><i class="fa fa-plus" aria-hidden="true"></i> New</a>
1515
<div class="btn-group">
16-
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-cubes" data-toggle="dropdown" aria-hidden="true"></i> Batch</button>
16+
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-cubes" data-bs-toggle="dropdown" aria-hidden="true"></i> Batch</button>
1717
<ul class="dropdown-menu">
1818
<li><a id="instances-batch-edit" class="dropdown-item" href="#" data-max-edit-limit="{{$maxEditLimit}}">Edit</a></li>
1919
<li><a id="instances-batch-export" class="dropdown-item" href="#">Export</a></li>
@@ -32,7 +32,7 @@
3232
<div class="modal-content">
3333

3434
<div class="modal-header">
35-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
35+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
3636
<span aria-hidden="true">&times;</span>
3737
</button>
3838
<h4 id="confirmDelete" class="modal-title">Confirm Delete</h4>

‎resources/views/instances/show.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@
278278
<div class="col-sm-12 actions">
279279
<a class="btn btn-sm btn-secondary" role="button" href="{{ route('instances.edit', $instance->id) }}" style="margin-right: .3rem;"><i class="fa fa-pencil" aria-hidden="true"></i> Edit</a>
280280
<a class="btn btn-sm btn-secondary" role="button" href="{{ route('transfers.create', array('instanceId' => $instance->id)) }}"><i class="fa fa-plus" aria-hidden="true"></i> Add Transfer</a>
281-
<button class="btn btn-sm btn-secondary" data-toggle="modal" data-target=".confirm-delete-modal" style="outline: none; float: right;"><i class="fa fa-trash fa-fw" aria-hidden="true"></i></button>
281+
<button class="btn btn-sm btn-secondary" data-bs-toggle="modal" data-bs-target=".confirm-delete-modal" style="outline: none; float: right;"><i class="fa fa-trash fa-fw" aria-hidden="true"></i></button>
282282

283283
{{ html()->form('DELETE', route('instances.destroy', [$instance->id]))->style('display: inline;')->open() }}
284284
<div class="modal fade confirm-delete-modal" tabindex="-1" role="dialog" aria-labelledby="confirmDelete" aria-hidden="true">
285285
<div class="modal-dialog modal-sm">
286286
<div class="modal-content">
287287

288288
<div class="modal-header">
289-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
289+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
290290
<span aria-hidden="true">&times;</span>
291291
</button>
292292
<h4 id="confirmDelete" class="modal-title">Confirm Delete</h4>

‎resources/views/items/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<a id="items-new" class="btn btn-sm btn-secondary" style="margin-right: 5px;" href="{{ route('items.create') }}" role="button"><i class="fa fa-plus" aria-hidden="true"></i> New</a>
1515
<div class="btn-group dropdown">
1616
<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
17-
<i class="fa fa-cubes" data-toggle="dropdown" aria-hidden="true"></i> Batch</button>
17+
<i class="fa fa-cubes" data-bs-toggle="dropdown" aria-hidden="true"></i> Batch</button>
1818
<ul id="items-batch-dropdown" class="dropdown-menu">
1919
<li><a id="items-batch-edit" class="dropdown-item" href="#" data-max-edit-limit="{{$maxEditLimit}}">Edit</a></li>
2020
<li><a id="items-batch-export" class="dropdown-item" href="#">Export</a></li>
@@ -35,7 +35,7 @@
3535
<div class="modal-content">
3636

3737
<div class="modal-header">
38-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
38+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
3939
<span aria-hidden="true">&times;</span>
4040
</button>
4141
<h4 id="confirmDelete" class="modal-title">Confirm Delete</h4>

‎resources/views/items/show.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,15 +443,15 @@
443443
<div class="col-sm-12 actions">
444444
<a class="btn btn-sm btn-secondary" role="button" href="{{ route('items.edit', $item->id) }}" style="margin-right: .3rem;"><i class="fa fa-pencil" aria-hidden="true"></i> Edit</a>
445445
<a class="btn btn-sm btn-secondary" role="button" href="{{ route('instances.create', array('itemId' => $item->id)) }}"><i class="fa fa-plus" aria-hidden="true"></i> Add Preservation Instance</a>
446-
<button class="btn btn-sm btn-secondary" data-toggle="modal" data-target=".confirm-delete-modal" style="outline: none; float: right;"><i class="fa fa-trash fa-fw" aria-hidden="true"></i></button>
446+
<button class="btn btn-sm btn-secondary" data-bs-toggle="modal" data-bs-target=".confirm-delete-modal" style="outline: none; float: right;"><i class="fa fa-trash fa-fw" aria-hidden="true"></i></button>
447447

448448
{{ html()->form('DELETE', route('items.destroy', [$item->id]))->style('display: inline;')->open() }}
449449
<div class="modal fade confirm-delete-modal" tabindex="-1" role="dialog" aria-labelledby="confirmDelete" aria-hidden="true">
450450
<div class="modal-dialog modal-sm">
451451
<div class="modal-content">
452452

453453
<div class="modal-header">
454-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
454+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
455455
<span aria-hidden="true">&times;</span>
456456
</button>
457457
<h4 id="confirmDelete" class="modal-title">Confirm Delete</h4>

‎resources/views/shared/_data-export-modal.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div id="data-export-dialog-content" class="modal-content">
55

66
<div class="modal-header">
7-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
7+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
88
<span aria-hidden="true">&times;</span>
99
</button>
1010
<h4 class="modal-title">{{$title}}</h4>

‎resources/views/shared/_data-import-modal.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div id="{{$type}}-import-step-1">
66
{{ html()->form('POST', route("{$section}.batch.{$type}.import.upload"))->acceptsFiles()->id("{$type}-upload-form")->open() }}
77
<div class="modal-header">
8-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
8+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
99
<span aria-hidden="true">&times;</span>
1010
</button>
1111
<h4 class="modal-title">{{title_case($type)}} Import - Step 1 of 3</h4>
@@ -31,7 +31,7 @@
3131
<div id="{{$type}}-import-step-2" style="display: none;">
3232
{{ html()->form('POST', route("{$section}.batch.{$type}.import.execute"))->id("{$type}-import-form")->open() }}
3333
<div class="modal-header">
34-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
34+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
3535
<span aria-hidden="true">&times;</span>
3636
</button>
3737
<h4 class="modal-title">{{title_case($type)}} Import - Step 2 of 3</h4>
@@ -52,7 +52,7 @@
5252

5353
<div id="{{$type}}-import-step-3" style="display: none;">
5454
<div class="modal-header">
55-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
55+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
5656
<span aria-hidden="true">&times;</span>
5757
</button>
5858
<h4 class="modal-title">{{title_case($type)}} Import - Step 3 of 3</h4>

‎resources/views/shared/_import-errors.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tr>
1111
<td>{{$index+2}}</td>
1212
@foreach ($possibleDataKeys as $fieldName)
13-
<td @if ($bag->has($fieldName)) data-toggle="popover" data-trigger="hover" data-placement="bottom" data-content="{{$bag->first($fieldName)}}" tabindex="0" class="text-danger" @endif>{!! !empty($data[$index][$fieldName]) ? $data[$index][$fieldName] : ($bag->has($fieldName) ? '<div class="empty-required">&nbsp;</div>' : '') !!}</td>
13+
<td @if ($bag->has($fieldName)) data-bs-toggle="popover" data-bs-trigger="hover" data-bs-placement="bottom" data-bs-content="{{$bag->first($fieldName)}}" tabindex="0" class="text-danger" @endif>{!! !empty($data[$index][$fieldName]) ? $data[$index][$fieldName] : ($bag->has($fieldName) ? '<div class="empty-required">&nbsp;</div>' : '') !!}</td>
1414
@endforeach
1515
</tr>
1616
@endif

‎resources/views/transfers/_form-common.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="col-sm-7 detail-value">
3838
<div class="input-group date">
3939
{{ html()->text('transfer_date')->class('form-control form-control-sm')->data('input') }}
40-
<span class="input-group-addon" data-toggle><i class="fa fa-calendar" aria-hidden="true"></i></span>
40+
<span class="input-group-addon" data-bs-toggle><i class="fa fa-calendar" aria-hidden="true"></i></span>
4141
</div>
4242
@if ($errors->has('transfer_date'))
4343
<div class="form-control-label"><small>{!! $errors->first('transfer_date') !!}</small></div>

0 commit comments

Comments
 (0)