Skip to content

Commit 9188fb0

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 607eb6c + 36bb91c commit 9188fb0

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

‎resources/views/hardware/view.blade.php‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
<span class="hidden-lg hidden-md">
5656
<x-icon type="info-circle" class="fa-2x" />
5757
</span>
58-
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
58+
<span class="hidden-xs hidden-sm">
59+
{{ trans('admin/users/general.info') }}
60+
</span>
5961
</a>
6062
</li>
6163

@@ -64,9 +66,11 @@
6466
<span class="hidden-lg hidden-md">
6567
<x-icon type="licenses" class="fa-2x" />
6668
</span>
67-
<span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
68-
{!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
69-
</span>
69+
<span class="hidden-xs hidden-sm">
70+
{{ trans('general.licenses') }}
71+
</span>
72+
{!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
73+
7074
</a>
7175
</li>
7276

@@ -75,9 +79,11 @@
7579
<span class="hidden-lg hidden-md">
7680
<x-icon type="components" class="fa-2x" />
7781
</span>
78-
<span class="hidden-xs hidden-sm">{{ trans('general.components') }}
79-
{!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
80-
</span>
82+
<span class="hidden-xs hidden-sm">
83+
{{ trans('general.components') }}
84+
</span>
85+
{!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
86+
8187
</a>
8288
</li>
8389

@@ -88,24 +94,22 @@
8894
</span>
8995
<span class="hidden-xs hidden-sm">
9096
{{ trans('general.assets') }}
91-
{!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
97+
</span>
98+
{!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
9299

93-
</span>
94100
</a>
95101
</li>
96102

97103
@if ($asset->assignedAccessories->count() > 0)
98104
<li>
99105
<a href="#accessories_assigned" data-toggle="tab" data-tooltip="true">
100-
101106
<span class="hidden-lg hidden-md">
102107
<i class="fas fa-keyboard fa-2x"></i>
103108
</span>
104109
<span class="hidden-xs hidden-sm">
105110
{{ trans('general.accessories_assigned') }}
106-
{!! ($asset->assignedAccessories()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAccessories()->count()).'</span>' : '' !!}
107-
108111
</span>
112+
{!! ($asset->assignedAccessories()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAccessories()->count()).'</span>' : '' !!}
109113
</a>
110114
</li>
111115
@endif
@@ -114,15 +118,13 @@
114118
@if ($asset->audits->count() > 0)
115119
<li>
116120
<a href="#audits" data-toggle="tab" data-tooltip="true">
117-
118121
<span class="hidden-lg hidden-md">
119122
<i class="fas fa-clipboard-check fa-2x"></i>
120123
</span>
121124
<span class="hidden-xs hidden-sm">
122125
{{ trans('general.audits') }}
123-
{!! ($asset->audits()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->audits()->count()).'</span>' : '' !!}
124-
125126
</span>
127+
{!! ($asset->audits()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->audits()->count()).'</span>' : '' !!}
126128
</a>
127129
</li>
128130
@endif
@@ -142,9 +144,10 @@
142144
<span class="hidden-lg hidden-md">
143145
<x-icon type="maintenances" class="fa-2x" />
144146
</span>
145-
<span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
146-
{!! ($asset->maintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->maintenances()->count()).'</span>' : '' !!}
147-
</span>
147+
<span class="hidden-xs hidden-sm">
148+
{{ trans('general.maintenances') }}
149+
</span>
150+
{!! ($asset->maintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->maintenances()->count()).'</span>' : '' !!}
148151
</a>
149152
</li>
150153

@@ -153,9 +156,10 @@
153156
<span class="hidden-lg hidden-md">
154157
<x-icon type="files" class="fa-2x" />
155158
</span>
156-
<span class="hidden-xs hidden-sm">{{ trans('general.files') }}
157-
{!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
158-
</span>
159+
<span class="hidden-xs hidden-sm">
160+
{{ trans('general.files') }}
161+
</span>
162+
{!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
159163
</a>
160164
</li>
161165

@@ -167,8 +171,8 @@
167171
</span>
168172
<span class="hidden-xs hidden-sm">
169173
{{ trans('general.additional_files') }}
170-
{!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
171-
</span>
174+
</span>
175+
{!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
172176
</a>
173177
</li>
174178
@endcan

0 commit comments

Comments
 (0)