diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php
index 58e5a721b5..6a4d403d8e 100755
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -336,7 +336,7 @@ class AccessoriesController extends Controller
'fields' => [
[
'title' => 'Checked Out:',
- 'value' => 'Accessory <'.config('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+ 'value' => 'Accessory <'.\URL::to('/').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.\URL::to('/').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.\URL::to('/').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
],
[
'title' => 'Note:',
@@ -456,7 +456,7 @@ class AccessoriesController extends Controller
'fields' => [
[
'title' => 'Checked In:',
- 'value' => class_basename(strtoupper($logaction->item_type)).' <'.config('app.url').'/admin/accessories/'.e($accessory->id).'/view'.'|'.e($accessory->name).'> checked in by <'.config('app.url').'/admin/users/'.e($admin_user->id).'/view'.'|'.e($admin_user->fullName()).'>.'
+ 'value' => class_basename(strtoupper($logaction->item_type)).' <'.\URL::to('/').'/admin/accessories/'.e($accessory->id).'/view'.'|'.e($accessory->name).'> checked in by <'.\URL::to('/').'/admin/users/'.e($admin_user->id).'/view'.'|'.e($admin_user->fullName()).'>.'
],
[
'title' => 'Note:',
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index e4cec1fcc0..73b0e5f690 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -461,7 +461,7 @@ class AssetModelsController extends Controller
'id' => $model->id,
'manufacturer' => (string)link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name),
'name' => (string)link_to('/hardware/models/'.$model->id.'/view', $model->name),
- 'image' => ($model->image!='') ? '' : '',
+ 'image' => ($model->image!='') ? '
' : '',
'modelnumber' => $model->model_number,
'numassets' => $model->assets->count(),
'depreciation' => (($model->depreciation) && ($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : trans('general.no_depreciation'),
diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 8ad41b9ccb..f151bfb6d9 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -150,7 +150,7 @@ class AssetsController extends Controller
$asset = new Asset();
$asset->model()->associate(AssetModel::find(e(Input::get('model_id'))));
- $checkModel = config('app.url').'/api/models/'.e(Input::get('model_id')).'/check';
+ $checkModel = \URL::to('/').'/api/models/'.e(Input::get('model_id')).'/check';
$asset->name = e(Input::get('name'));
$asset->serial = e(Input::get('serial'));
@@ -659,7 +659,7 @@ class AssetsController extends Controller
'fields' => [
[
'title' => 'Checked In:',
- 'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.config('app.url').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.'
+ 'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.\URL::to('/').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.\URL::to('/').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.'
],
[
'title' => 'Note:',
@@ -1793,14 +1793,14 @@ class AssetsController extends Controller
$row = array(
'checkbox' =>'
{!! $eula !!}@if ($require_acceptance==1) -
{{ trans('mail.i_have_read') }}
+{{ trans('mail.i_have_read') }}
@endif{{ $snipeSettings->site_name }}
diff --git a/resources/views/emails/accept-asset.blade.php b/resources/views/emails/accept-asset.blade.php index 8b8b5eba83..c0bd7cc7a9 100755 --- a/resources/views/emails/accept-asset.blade.php +++ b/resources/views/emails/accept-asset.blade.php @@ -84,7 +84,7 @@{!! $eula !!}@if ($require_acceptance==1) -
{{ trans('mail.i_have_read') }}
+{{ trans('mail.i_have_read') }}
@endif{{ $snipeSettings->site_name }}
diff --git a/resources/views/emails/asset-canceled.blade.php b/resources/views/emails/asset-canceled.blade.php index beb6a7f585..ee2359ebfc 100644 --- a/resources/views/emails/asset-canceled.blade.php +++ b/resources/views/emails/asset-canceled.blade.php @@ -2,9 +2,9 @@ @section('content') -{{ trans('mail.a_user_canceled') }} {{ $snipeSettings->site_name }}.
+{{ trans('mail.a_user_canceled') }} {{ $snipeSettings->site_name }}.
-{{ trans('mail.user') }} {{ $requested_by }}
+
{{ trans('mail.user') }} {{ $requested_by }}
{{ trans('mail.item') }} {{ $item_name }} ({{ $item_type }})
{{ trans('mail.canceled') }} {{ $requested_date }}
{{ trans('mail.a_user_requested') }} {{ $snipeSettings->site_name }}.
+{{ trans('mail.a_user_requested') }} {{ $snipeSettings->site_name }}.
-{{ trans('mail.user') }} {{ $requested_by }}
+
{{ trans('mail.user') }} {{ $requested_by }}
{{ trans('mail.item') }} {{ $item_name }} ({{ $item_type }})
{{ trans('mail.requested') }} {{ $requested_date }}
@if ($item_quantity > 1)
diff --git a/resources/views/emails/firstadmin.blade.php b/resources/views/emails/firstadmin.blade.php
index 16f610de28..0c1c430ac4 100644
--- a/resources/views/emails/firstadmin.blade.php
+++ b/resources/views/emails/firstadmin.blade.php
@@ -2,6 +2,6 @@
{{ trans('mail.login_first_admin') }}
-URL: {{ config('app.url') }}
+URL: {{ URL::to('/') }}
{{ trans('mail.username') }} {{ $username }}
{{ trans('mail.password') }} {{ $password }}
diff --git a/resources/views/emails/low-inventory.blade.php b/resources/views/emails/low-inventory.blade.php
index 7707c37cc3..a5e9b961ad 100644
--- a/resources/views/emails/low-inventory.blade.php
+++ b/resources/views/emails/low-inventory.blade.php
@@ -15,7 +15,7 @@
@for($i=0; $count > $i; $i++)
{{ trans('mail.admin_has_created', ['web' => $snipeSettings->site_name]) }}
-URL: {{ config('app.url') }}
+
URL: {{ URL::to('/') }}
{{ trans('mail.login') }} {{ $username }}
{{ trans('mail.password') }} {{ $password }}
+
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index d92d7f9ce0..f1671714ba 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -16,7 +16,7 @@
+
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 226729ad82..e22c6b9209 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -14,9 +14,9 @@ System Unavailable
+
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index 08823f1bc3..968eabb7ab 100644 --- a/resources/views/hardware/bulk-checkout.blade.php +++ b/resources/views/hardware/bulk-checkout.blade.php @@ -223,7 +223,7 @@ }); data._token = '{{ csrf_token() }}', // console.dir(data); - $.post("{{config('app.url') }}/api/"+model+"s",data,function (result) { + $.post("{{URL::to('/') }}/api/"+model+"s",data,function (result) { var id=result.id; var name=result.name || (result.first_name+" "+result.last_name); $('.modal-body input:visible').val(""); @@ -252,7 +252,7 @@ $(function() { $('#current_assets_box').fadeOut(); $('#current_assets_content').html(""); } else { - $.get("{{config('app.url') }}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) { + $.get("{{URL::to('/') }}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) { // console.warn("Ajax call came back okay for user " + userid + "! " + data.length + " Data is: "+data); if (data.length > 0) { $('#current_assets_box').fadeIn(); @@ -260,7 +260,7 @@ $(function() { $('#current_assets_content').append(''); for (var i in data) { var asset = data[i]; - table_html += "
Click here to go to your app login! {{ config('app.url') }}
+Click here to go to your app login! {{ URL::to('/') }}
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php index d9215b87dc..5805d088c9 100755 --- a/resources/views/suppliers/edit.blade.php +++ b/resources/views/suppliers/edit.blade.php @@ -47,7 +47,7 @@