DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14158 from snipe/fixes/moved_url_string_again

Browse source 
Moved URL string to general
This commit is contained in:
snipe 2024-01-24 14:48:26 +00:00 committed by GitHub
parent 661cc2b460 e6f94cfebf
commit 684264dac7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en-US/admin/manufacturers/table.php
View file

@ -12,6 +12,5 @@ return array(
'support_url' => 'Support URL',
'warranty_lookup_url' => 'Warranty Lookup URL',
'update' => 'Update Manufacturer',
'url' => 'URL',
);

1
resources/lang/en-US/admin/suppliers/table.php
View file

@ -19,7 +19,6 @@ return array(
'state' => 'State',
'suppliers' => 'Suppliers',
'update' => 'Update Supplier',
'url' => 'URL',
'view' => 'View Supplier',
'view_assets_for' => 'View Assets for',
'zip' => 'Postal Code',

1
resources/lang/en-US/general.php
View file

@ -500,5 +500,6 @@ return [
'edit' => 'edit',
'action_source' => 'Action Source',
'or' => 'or',
'url' => 'URL',
];

2
resources/views/manufacturers/edit.blade.php
View file

@ -12,7 +12,7 @@
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/manufacturers/table.name')])
<!-- URL -->
<div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
<label for="url" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.url') }}
<label for="url" class="col-md-3 control-label">{{ trans('general.url') }}
</label>
<div class="col-md-6">
<input class="form-control" type="text" name="url" id="url" value="{{ old('url', $item->url) }}" />

2
resources/views/partials/label2-field-definitions.blade.php
View file

@ -322,7 +322,7 @@
<option value="model.manufacturer.name">{{trans('admin/hardware/form.manufacturer')}}</option>
<option value="model.manufacturer.support_email">{{trans('admin/manufacturers/table.support_email')}}</option>
<option value="model.manufacturer.support_phone">{{trans('admin/manufacturers/table.support_phone')}}</option>
<option value="model.manufacturer.support_url">{{trans('admin/manufacturers/table.url')}}</option>
<option value="model.manufacturer.support_url">{{trans('general.url')}}</option>
</optgroup>
<optgroup label="Category">
<option value="model.category.name">{{trans('admin/categories/general.category_name')}}</option>

2
resources/views/reports/custom.blade.php
View file

@ -183,7 +183,7 @@
<label class="form-control">
{{ Form::checkbox('url', '1', '1') }}
- {{ trans('admin/manufacturers/table.url') }}
- {{ trans('general.url') }}
</label>

2
resources/views/suppliers/edit.blade.php
View file

@ -26,7 +26,7 @@
@include ('partials.forms.edit.email')
<div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
{{ Form::label('url', trans('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('url', trans('general.url'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7">
{{Form::text('url', old('url', $item->url), array('class' => 'form-control')) }}
{!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

2
resources/views/suppliers/index.blade.php
View file

@ -50,7 +50,7 @@
<th data-searchable="true" data-sortable="true" data-field="email" data-formatter="emailFormatter">{{ trans('admin/suppliers/table.email') }}</th>
<th data-searchable="true" data-sortable="true" data-field="phone" data-formatter="phoneFormatter">{{ trans('admin/suppliers/table.phone') }}</th>
<th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th>
<th data-sortable="true" data-field="url" data-visible="false" data-formatter="externalLinkFormatter">{{ trans('admin/suppliers/table.url') }}</th>
<th data-sortable="true" data-field="url" data-visible="false" data-formatter="externalLinkFormatter">{{ trans('general.url') }}</th>
<th data-searchable="false" data-sortable="true" data-field="assets_count">{{ trans('admin/suppliers/table.assets') }}</th>
<th data-searchable="false" data-sortable="true" data-field="accessories_count">{{ trans('general.accessories') }}</th>
<th data-searchable="false" data-sortable="true" data-field="licenses_count">{{ trans('admin/suppliers/table.licenses') }}</th>