DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-03 18:07:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-20 20:22:42 -07:00
parent 387351d7ed c0f8b3773c
commit 59c0b63ad0
5 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/account/view-assets.blade.php
View file

@ -30,6 +30,7 @@ View Assets for {{ $user->present()->fullName() }}
<tr>
<th class="col-md-4">{{ trans('admin/hardware/table.asset_model') }}</th>
<th class="col-md-2">{{ trans('admin/hardware/table.asset_tag') }}</th>
<th class="col-md-3">{{ trans('admin/hardware/table.serial') }}</th>
<th class="col-md-3">{{ trans('general.name') }}</th>
<th></th>
</tr>
@ -43,6 +44,7 @@ View Assets for {{ $user->present()->fullName() }}
@endif
</td>
<td>{{ $asset->asset_tag }}</td>
<td>{{ $asset->serial }}</td>
<td>{{ $asset->name }}</td>
<td>
@if (($asset->image) && ($asset->image!=''))

4
resources/views/emails/accept-asset.blade.php
View file

@ -38,7 +38,7 @@
@if (isset($model_name))
<tr>
<td>
{{ trans('general.model_no') }}:
{{ trans('general.asset_model') }}:
</td>
<td>
<strong>{{ $model_name }}</strong>
@ -48,7 +48,7 @@
@if (isset($model_number))
<tr>
<td>
{{ trans('general.asset_model') }}:
{{ trans('general.model_no') }}:
</td>
<td>
<strong>{{ $model_number }}</strong>

8
resources/views/emails/checkin-asset.blade.php
View file

@ -35,23 +35,23 @@
</td>
</tr>
@endif
@if (isset($model_name))
@if (isset($model_number))
<tr>
<td style="background-color:#ccc">
{{ trans('general.model_no') }}:
</td>
<td>
<strong>{{ $model_name }}</strong>
<strong>{{ $model_number }}</strong>
</td>
</tr>
@endif
@if (isset($model_number))
@if (isset($model_name))
<tr>
<td style="background-color:#ccc">
{{ trans('general.asset_model') }}:
</td>
<td>
<strong>{{ $model_number }}</strong>
<strong>{{ $model_name }}</strong>
</td>
</tr>
@endif

4
resources/views/vendor/mail/markdown/footer.blade.php vendored
View file

@ -1,5 +1 @@
@if ($show_url_in_emails=='1')
[{{ $slot }}]({{ $url }})
@else
{{ $slot }}
@endif

5
resources/views/vendor/mail/markdown/header.blade.php vendored
View file

@ -1,6 +1 @@
@if ($show_url_in_emails=='1')
[{{ $slot }}]({{ $url }})
@else
{{ $slot }}
@endif