Skip to content
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

Fixed #15330 - Cleaned up category title #15357

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Fixed #15330 - Cleaned up category title #15357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion resources/lang/en-US/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,6 @@
'expires' => 'Expires',
'map_fields'=> 'Map :item_type Field',
'remaining_var' => ':count Remaining',
'assets_in_var' => 'Assets in :name :type',
'label' => 'Label',
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',

Expand Down
19 changes: 16 additions & 3 deletions resources/views/categories/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{-- Page title --}}
@section('title')

{{ trans('general.assets_in_var', ['name'=> $category->name, 'type' => trans('general.category')]) }}
{{ $category->name }}

@parent
@stop
Expand Down Expand Up @@ -36,15 +36,28 @@
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active">
<a href="#items" data-toggle="tab" title="{{ trans('general.items') }}"> {{ ucwords($category_type_route) }}
<a href="#items" data-toggle="tab" title="{{ trans('general.items') }}">
@if ($category->category_type=='asset')
{{ trans('general.assets') }}
@elseif ($category->category_type=='accessory')
{{ trans('general.accessories') }}
@elseif ($category->category_type=='license')
{{ trans('general.licenses') }}
@elseif ($category->category_type=='consumable')
{{ trans('general.consumables') }}
@elseif ($category->category_type=='component')
{{ trans('general.components') }}
@endif

@if ($category->category_type=='asset')
<badge class="badge badge-secondary"> {{ $category->showableAssets()->count() }}</badge>
@endif
</a>
</li>
@if ($category->category_type=='asset')
<li>
<a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}
<a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">
{{ trans('general.asset_models') }}
<badge class="badge badge-secondary"> {{ $category->models->count()}}</badge>
</a>
</li>
Expand Down
Loading