From 6aeb3c0a47d1fc98572f70069c5d61e6e6828576 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 31 Mar 2020 19:27:21 -0700 Subject: [PATCH] Use divs instead of layout table on view --- resources/views/licenses/view.blade.php | 484 ++++++++++++++---------- 1 file changed, 284 insertions(+), 200 deletions(-) diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 147c540e95..8573bc33e2 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -30,15 +30,297 @@
+
-
+
+
+ + @if (!is_null($license->company)) +
+
+ {{ trans('general.company') }} +
+
+ {{ $license->company->name }} +
+
+ @endif + + @if ($license->manufacturer) +
+
+ {{ trans('admin/hardware/form.manufacturer') }} +
+
+ @can('view', \App\Models\Manufacturer::class) + + {{ $license->manufacturer->name }} + + @else + {{ $license->manufacturer->name }} + @endcan + + @if ($license->manufacturer->url) +
{{ $license->manufacturer->url }} + @endif + + @if ($license->manufacturer->support_url) +
+ {{ $license->manufacturer->support_url }} + @endif + + @if ($license->manufacturer->support_phone) +
+ {{ $license->manufacturer->support_phone }} + @endif + + @if ($license->manufacturer->support_email) +
{{ $license->manufacturer->support_email }} + @endif +
+
+ @endif + + + @if (!is_null($license->serial)) +
+
+ {{ trans('admin/licenses/form.license_key') }} +
+
+ @can('viewKeys', $license) + {!! nl2br(e($license->serial)) !!} + @else + ------------ + @endcan +
+
+ @endif + + + @if ($license->category) +
+
+ {{ trans('general.category') }} +
+
+ {{ $license->category->name }} +
+
+ @endif + + + @if ($license->license_name!='') +
+
+ {{ trans('admin/licenses/form.to_name') }} +
+
+ {{ $license->license_name }} +
+
+ @endif + + @if ($license->license_email!='') +
+
+ + {{ trans('admin/licenses/form.to_email') }} + +
+
+ {{ $license->license_email }} +
+
+ @endif + + + @if ($license->supplier_id) +
+
+ + {{ trans('general.supplier') }} + +
+
+ + {{ $license->supplier->name }} + +
+
+ @endif + + + @if (isset($license->expiration_date)) +
+
+ + {{ trans('admin/licenses/form.expiration') }} + +
+
+ {{ $license->expiration_date }} +
+
+ @endif + + + @if ($license->depreciation) +
+
+ + {{ trans('admin/hardware/form.depreciation') }} + +
+
+ {{ $license->depreciation->name }} + ({{ $license->depreciation->months }} + {{ trans('admin/hardware/form.months') }} + ) +
+
+ + + +
+
+ + {{ trans('admin/hardware/form.depreciates_on') }} + +
+
+ {{ $license->depreciated_date()->format("Y-m-d") }} +
+
+ + +
+
+ + {{ trans('admin/hardware/form.fully_depreciated') }} + +
+
+ @if ($license->time_until_depreciated()->y > 0) + {{ $license->time_until_depreciated()->y }} + {{ trans('admin/hardware/form.years') }}, + @endif + {{ $license->time_until_depreciated()->m }} + {{ trans('admin/hardware/form.months') }} +
+
+ @endif + + @if ($license->purchase_order) +
+
+ + {{ trans('admin/licenses/form.purchase_order') }} + +
+
+ {{ $license->purchase_order }} +
+
+ @endif + + + @if (isset($license->purchase_date)) +
+
+ {{ trans('general.purchase_date') }} +
+
+ {{ $license->purchase_date }} +
+
+ @endif + + @if ($license->purchase_cost > 0) +
+
+ + {{ trans('general.purchase_cost') }} + +
+
+ {{ $snipeSettings->default_currency }} + {{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }} +
+
+ @endif + + @if ($license->order_number) +
+
+ + {{ trans('general.order_number') }} + +
+
+ {{ $license->order_number }} +
+
+ @endif + + @if (($license->seats) && ($license->seats) > 0) +
+
+ + {{ trans('admin/licenses/form.seats') }} + +
+
+ {{ $license->seats }} +
+
+ @endif + + + +
+
+ + {{ trans('admin/licenses/form.reassignable') }} + +
+
+ {{ $license->reassignable ? 'Yes' : 'No' }} +
+
+ + + @if ($license->notes) +
+
+ + {{ trans('general.notes') }} + +
+
+ {!! nl2br(e($license->notes)) !!} +
+
+ @endif + +
+
+
+
+ + + +
+
+
@@ -67,204 +349,6 @@
-
-
- - - @if (!is_null($license->company)) - - - - - @endif - - @if ($license->manufacturer) - - - - - @endif - - - @if (!is_null($license->serial)) - - - - - @endif - - @if ($license->category) - - - - - @endif - - - @if ($license->license_name!='') - - - - - @endif - - @if ($license->license_email!='') - - - - - @endif - - @if ($license->supplier_id) - - - - - @endif - - @if (isset($license->expiration_date)) - - - - - @endif - - @if ($license->depreciation) - - - - - - - - - - - - - - @endif - - @if ($license->purchase_order) - - - - - @endif - - @if (isset($license->purchase_date)) - - - - - @endif - - @if ($license->purchase_cost > 0) - - - - - @endif - - @if ($license->order_number) - - - - - @endif - - @if (($license->seats) && ($license->seats) > 0) - - - - - @endif - - - - - - - @if ($license->notes) - - - - - @endif - -
{{ trans('general.company') }}{{ $license->company->name }}
{{ trans('admin/hardware/form.manufacturer') }}:

- @can('view', \App\Models\Manufacturer::class) - - {{ $license->manufacturer->name }} - - @else - {{ $license->manufacturer->name }} - @endcan - - @if ($license->manufacturer->url) -
{{ $license->manufacturer->url }} - @endif - - @if ($license->manufacturer->support_url) -
- {{ $license->manufacturer->support_url }} - @endif - - @if ($license->manufacturer->support_phone) -
- {{ $license->manufacturer->support_phone }} - @endif - - @if ($license->manufacturer->support_email) -
{{ $license->manufacturer->support_email }} - @endif -

-
{{ trans('admin/licenses/form.license_key') }}: - @can('viewKeys', $license) - {!! nl2br(e($license->serial)) !!} - @else - ------------ - @endcan - -
{{ trans('general.category') }}: - {{ $license->category->name }} -
{{ trans('admin/licenses/form.to_name') }}: {{ $license->license_name }}
{{ trans('admin/licenses/form.to_email') }}:{{ $license->license_email }}
{{ trans('general.supplier') }}: - - - {{ $license->supplier->name }} - -
{{ trans('admin/licenses/form.expiration') }}:{{ $license->expiration_date }}
- {{ trans('admin/hardware/form.depreciation') }}: - - {{ $license->depreciation->name }} - ({{ $license->depreciation->months }} - {{ trans('admin/hardware/form.months') }} - ) -
- {{ trans('admin/hardware/form.depreciates_on') }}: - - {{ $license->depreciated_date()->format("Y-m-d") }} -
- {{ trans('admin/hardware/form.fully_depreciated') }}: - - @if ($license->time_until_depreciated()->y > 0) - {{ $license->time_until_depreciated()->y }} - {{ trans('admin/hardware/form.years') }}, - @endif - {{ $license->time_until_depreciated()->m }} - {{ trans('admin/hardware/form.months') }} -
- {{ trans('admin/licenses/form.purchase_order') }}: - - {{ $license->purchase_order }} -
{{ trans('general.purchase_date') }}:{{ $license->purchase_date }}
{{ trans('general.purchase_cost') }}: - {{ $snipeSettings->default_currency }} - {{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }} -
{{ trans('general.order_number') }}:{{ $license->order_number }}
{{ trans('admin/licenses/form.seats') }}:{{ $license->seats }}
{{ trans('admin/licenses/form.reassignable') }}:{{ $license->reassignable ? 'Yes' : 'No' }}
{{ trans('general.notes') }}: - {!! nl2br(e($license->notes)) !!} -
-
-