ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-05-14 17:39:30 +02:00
parent d49878371d 5c7b74e17e
commit 320edac286
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/lang/en-US/admin/statuslabels/table.php
View File

@@ -1,14 +1,14 @@
<?php
return array(
'about' => 'About Status Labels',
'about' => 'About Status Types',
'archived' => 'Archived',
'create' => 'Create Status Label',
'color' => 'Chart Color',
'default_label' => 'Default Label',
'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
'deployable' => 'Deployable',
'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
'info' => 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
'name' => 'Status Name',
'pending' => 'Pending',
'status_type' => 'Status Type',

14
resources/views/statuslabels/index.blade.php
View File

@@ -1,7 +1,4 @@
@extends('layouts/default', [
'helpText' => trans('admin/statuslabels/table.info') ,
'helpPosition' => 'right',
])
@extends('layouts/default')
{{-- Page title --}}
@section('title')
@@ -51,6 +48,13 @@
<div class="col-md-3">
<h2>{{ trans('admin/statuslabels/table.about') }}</h2>
<div class="box">
<div class="box-body">
<p>{!! trans('admin/statuslabels/table.info') !!}</p>
</div>
</div>
<div class="box box-success">
<div class="box-body">
<p><i class="fas fa-circle text-green"></i> <strong>{{ trans('admin/statuslabels/table.deployable') }}</strong>: {!! trans('admin/statuslabels/message.help.deployable') !!}</p>
@@ -125,7 +129,7 @@
var typename_lower = trans;
var typename = typename_lower.charAt(0).toUpperCase() + typename_lower.slice(1);
return '<i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + typename;
return '<nobr><i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + typename + '</nobr>';
}