Skip to content

Fixed #18405: Clean up closing divs to fix footer position #18406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 2 commits into from
Jan 7, 2026
Merged

Fixed #18405: Clean up closing divs to fix footer position #18406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad94b6
Fix white space indention
dbakan Jan 7, 2026
1136ea0
Clean up stray closing div tags
dbakan Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions resources/views/hardware/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!-- Asset Tag -->
<div class="form-group {{ ($errors->has('asset_tag') || $errors->has('asset_tags.1')) ? ' has-error' : '' }}">
<label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
<label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>



Expand Down Expand Up @@ -134,7 +134,7 @@ class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} {{ $i }}</
</div>


<div class="col-md-12 col-sm-12">
<div class="col-md-12 col-sm-12">

<fieldset name="optional-details">

Expand Down Expand Up @@ -166,38 +166,36 @@ class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} {{ $i }}</
</div> <!-- end optional details -->
</fieldset>

</div><!-- end col-md-12 col-sm-12-->
</div><!-- end col-md-12 col-sm-12-->



<div class="col-md-12 col-sm-12">
<fieldset name="order-info">
<x-form-legend>
<a id="order_info">
<x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
{{ trans('admin/hardware/form.order_details') }}
</a>
</x-form-legend>
<div class="col-md-12 col-sm-12">
<fieldset name="order-info">
<x-form-legend>
<a id="order_info">
<x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
{{ trans('admin/hardware/form.order_details') }}
</a>
</x-form-legend>

<div id='order_details' class="col-md-12" style="display:none">
@include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
<div id='order_details' class="col-md-12" style="display:none">
@include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])

@php
$currency_type = null;
if ($item->id && $item->location) {
$currency_type = $item->location->currency;
}
@endphp
@php
$currency_type = null;
if ($item->id && $item->location) {
$currency_type = $item->location->currency;
}
@endphp

@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])

</div> <!-- end order details -->
</fieldset>
</div><!-- end col-md-12 col-sm-12-->
</div><!-- end col-md-12 col-sm-12-->
</div> <!-- end order details -->
</fieldset>
</div><!-- end col-md-12 col-sm-12-->

@stop
Expand Down
Loading