- @if ($debug_in_production)
@@ -825,25 +826,72 @@ dir="{{ Helper::determineLanguageDirection() }}"> @endif -
-

@yield('title')

+
- @if (isset($helpText)) - @include ('partials.more-info', - [ - 'helpText' => $helpText, - 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' - ]) - @endif -
- @yield('header_right') + +
+
+ + + +

+ + @if (Breadcrumbs::has() && (Breadcrumbs::current()->count() > 1)) + + @else + @yield('title') + @endif + +

+ + @if (isset($helpText)) + @include ('partials.more-info', + [ + 'helpText' => $helpText, + 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' + ]) + @endif +
+ @yield('header_right') +
+ +
- -
-
+
diff --git a/resources/views/licenses/checkin.blade.php b/resources/views/licenses/checkin.blade.php index 5ef915954..a300b2a01 100755 --- a/resources/views/licenses/checkin.blade.php +++ b/resources/views/licenses/checkin.blade.php @@ -16,7 +16,7 @@ @section('content')
-
+
{{csrf_field()}} @@ -28,31 +28,41 @@
- -
+ +

{{ $licenseSeat->license->name }}

- +
- -
-

- @can('viewKeys', $licenseSeat->license) - {{ $licenseSeat->license->serial }} - @else - ------------ - @endcan -

+ +
+

{{ $licenseSeat->license->category->name }}

+ + @can('viewKeys', $licenseSeat->license) +
+ +
+

+ {{ $licenseSeat->license->serial }} +

+
+
+ @endcan +
- -
- + +
+ {!! $errors->first('notes', '') !!}
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php index ef6b87fc0..af090a7c4 100755 --- a/resources/views/licenses/checkout.blade.php +++ b/resources/views/licenses/checkout.blade.php @@ -15,7 +15,7 @@ @section('content')
-
+
{{csrf_field()}} @@ -26,7 +26,7 @@
- +
@@ -42,18 +42,19 @@
+ @can('viewKeys', $license)
- +
-

- @can('viewKeys', $license) - {{ $license->serial }} - @else - ------------ - @endcan +

{{ $license->serial }}

+ @endcan @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true']) @@ -64,9 +65,9 @@
- +
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php index 4dbde2935..092c323a6 100755 --- a/resources/views/licenses/edit.blade.php +++ b/resources/views/licenses/edit.blade.php @@ -34,7 +34,7 @@
- + {!! $errors->first('serial', '') !!}
@@ -68,7 +68,7 @@
@@ -124,7 +124,7 @@
{{ trans('admin/licenses/form.maintained') }}
diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php index 82e34b190..94d94d1d4 100755 --- a/resources/views/licenses/index.blade.php +++ b/resources/views/licenses/index.blade.php @@ -33,6 +33,7 @@ data-pagination="true" data-search="true" data-side-pagination="server" + data-footer-style="footerStyle" data-show-columns="true" data-show-fullscreen="true" data-show-export="true" diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 2de0f9d6e..6d7b406df 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -124,13 +124,13 @@
{{ trans('admin/licenses/form.license_key') }} +
@can('viewKeys', $license) - {!! nl2br(e($license->serial)) !!} - + {!! nl2br(e($license->serial)) !!} @else ------------ @endcan @@ -498,7 +498,7 @@