From aab0933856d0de4b46d252a538fd93c2db4b6d5b Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 15 Dec 2016 16:41:36 -0800 Subject: [PATCH] Use url() helper over URL::to --- .../Controllers/AccessoriesController.php | 4 +- .../Controllers/AssetModelsController.php | 2 +- app/Http/Controllers/AssetsController.php | 10 +-- app/Http/Controllers/ComponentsController.php | 2 +- .../Controllers/ConsumablesController.php | 2 +- app/Http/Controllers/LicensesController.php | 6 +- app/Http/Controllers/LocationsController.php | 2 +- app/Http/Controllers/SettingsController.php | 4 +- app/Http/Controllers/UsersController.php | 6 +- app/Http/Controllers/ViewAssetsController.php | 6 +- app/Http/Middleware/CheckForSetup.php | 4 +- resources/views/account/profile.blade.php | 2 +- resources/views/account/view-assets.blade.php | 4 +- resources/views/auth/login.blade.php | 2 +- resources/views/categories/edit.blade.php | 7 +- resources/views/categories/view.blade.php | 6 +- .../views/emails/accept-accessory.blade.php | 2 +- resources/views/emails/accept-asset.blade.php | 2 +- .../views/emails/asset-canceled.blade.php | 4 +- .../views/emails/asset-requested.blade.php | 4 +- .../views/emails/auth/reminder.blade.php | 2 +- resources/views/emails/firstadmin.blade.php | 2 +- .../views/emails/low-inventory.blade.php | 2 +- resources/views/emails/send-login.blade.php | 2 +- resources/views/errors/403.blade.php | 2 +- resources/views/errors/404.blade.php | 2 +- resources/views/errors/503.blade.php | 2 +- resources/views/groups/view.blade.php | 2 +- .../views/hardware/bulk-checkout.blade.php | 6 +- resources/views/hardware/checkout.blade.php | 6 +- resources/views/hardware/edit.blade.php | 8 +- resources/views/hardware/import.blade.php | 2 +- resources/views/hardware/view.blade.php | 8 +- resources/views/layouts/basic.blade.php | 2 +- resources/views/layouts/default.blade.php | 82 +++++++++---------- resources/views/locations/edit.blade.php | 2 +- resources/views/models/edit.blade.php | 2 +- resources/views/models/index.blade.php | 4 +- resources/views/models/view.blade.php | 4 +- .../views/reports/unaccepted_assets.blade.php | 4 +- resources/views/setup/done.blade.php | 2 +- resources/views/suppliers/edit.blade.php | 2 +- resources/views/suppliers/view.blade.php | 2 +- .../views/users/confirm-bulk-delete.blade.php | 2 +- resources/views/users/index.blade.php | 6 +- resources/views/users/view.blade.php | 2 +- 46 files changed, 123 insertions(+), 120 deletions(-) diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php index 5ece59e2ca..5244578fa5 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 <'.\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().'>.' + 'value' => 'Accessory <'.url('/').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.url('/').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.url('/').'/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)).' <'.\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()).'>.' + 'value' => class_basename(strtoupper($logaction->item_type)).' <'.url('/').'/admin/accessories/'.e($accessory->id).'/view'.'|'.e($accessory->name).'> checked in by <'.url('/').'/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 235c194ee3..8cd2d8a63b 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_route('models.show',$model->name, ['model' => $model->id]), - '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 01473bb0a6..0b2b7e70ad 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 = \URL::to('/').'/api/models/'.e(Input::get('model_id')).'/check'; + $checkModel = url('/').'/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 <'.\URL::to('/').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.\URL::to('/').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.' + 'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.url('/').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.url('/').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.' ], [ 'title' => 'Note:', @@ -1793,14 +1793,14 @@ class AssetsController extends Controller $row = array( 'checkbox' =>'
', 'id' => $asset->id, - 'image' => (($asset->image) && ($asset->image!='')) ? '' : ((($asset->model) && ($asset->model->image!='')) ? '' : ''), + 'image' => (($asset->image) && ($asset->image!='')) ? '' : ((($asset->model) && ($asset->model->image!='')) ? '' : ''), 'name' => ''.e($asset->name).'', 'asset_tag' => ''.e($asset->asset_tag).'', 'serial' => e($asset->serial), 'model' => ($asset->model) ? (string)link_to('/hardware/models/'.$asset->model->id.'/view', e($asset->model->name)) : 'No model', 'model_number' => ($asset->model && $asset->model->model_number) ? (string)$asset->model->model_number : '', 'status_label' => ($asset->assigneduser) ? 'Deployed' : ((e($asset->assetstatus)) ? e($asset->assetstatus->name) : ''), - 'assigned_to' => ($asset->assigneduser) ? (string)link_to(\URL::to('/').'/admin/users/'.$asset->assigned_to.'/view', e($asset->assigneduser->fullName())) : '', + 'assigned_to' => ($asset->assigneduser) ? (string)link_to(url('/').'/admin/users/'.$asset->assigned_to.'/view', e($asset->assigneduser->fullName())) : '', 'location' => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? (string)link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/view', e($asset->assigneduser->userloc->name)) : (($asset->defaultLoc!='') ? (string)link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/view', e($asset->defaultLoc->name)) : ''), 'category' => (($asset->model) && ($asset->model->category)) ?(string)link_to('/admin/settings/categories/'.$asset->model->category->id.'/view', e($asset->model->category->name)) : '', 'manufacturer' => (($asset->model) && ($asset->model->manufacturer)) ? (string)link_to('/admin/settings/manufacturers/'.$asset->model->manufacturer->id.'/view', e($asset->model->manufacturer->name)) : '', @@ -1808,7 +1808,7 @@ class AssetsController extends Controller 'purchase_cost' => $purchase_cost, 'purchase_date' => ($asset->purchase_date) ? $asset->purchase_date : '', 'notes' => e($asset->notes), - 'order_number' => ($asset->order_number!='') ? ''.e($asset->order_number).'' : '', + 'order_number' => ($asset->order_number!='') ? ''.e($asset->order_number).'' : '', 'last_checkout' => ($asset->last_checkout!='') ? e($asset->last_checkout) : '', 'expected_checkin' => ($asset->expected_checkin!='') ? e($asset->expected_checkin) : '', 'created_at' => ($asset->created_at!='') ? e($asset->created_at->format('F j, Y h:iA')) : '', diff --git a/app/Http/Controllers/ComponentsController.php b/app/Http/Controllers/ComponentsController.php index 148a973e92..314940d0e4 100644 --- a/app/Http/Controllers/ComponentsController.php +++ b/app/Http/Controllers/ComponentsController.php @@ -372,7 +372,7 @@ class ComponentsController extends Controller 'fields' => [ [ 'title' => 'Checked Out:', - 'value' => class_basename(strtoupper($logaction->item_type)).' <'.\URL::to('/').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.\URL::to('/').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.\URL::to('/').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.' + 'value' => class_basename(strtoupper($logaction->item_type)).' <'.url('/').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.url('/').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.url('/').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.' ], [ 'title' => 'Note:', diff --git a/app/Http/Controllers/ConsumablesController.php b/app/Http/Controllers/ConsumablesController.php index 8c39a903e6..7ab589d89c 100644 --- a/app/Http/Controllers/ConsumablesController.php +++ b/app/Http/Controllers/ConsumablesController.php @@ -337,7 +337,7 @@ class ConsumablesController extends Controller 'fields' => [ [ 'title' => 'Checked Out:', - 'value' => 'Consumable <'.\URL::to('/').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->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().'>.' + 'value' => 'Consumable <'.url('/').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->name.'> checked out to <'.url('/').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.url('/').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.' ], [ 'title' => 'Note:', diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php index b97ebd2412..849916c6bb 100755 --- a/app/Http/Controllers/LicensesController.php +++ b/app/Http/Controllers/LicensesController.php @@ -545,9 +545,9 @@ class LicensesController extends Controller // Update the asset data if (e($request->input('assigned_to')) == '') { - $slack_msg = 'License <'.\URL::to('/').'/licenses/'.$license->id.'|'.$license->name.'> checked out to <'.\URL::to('/').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.\URL::to('/').'/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'; + $slack_msg = 'License <'.url('/').'/licenses/'.$license->id.'|'.$license->name.'> checked out to <'.url('/').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.url('/').'/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'; } else { - $slack_msg = 'License <'.\URL::to('/').'/licenses/'.$license->id.'|'.$license->name.'> checked out to <'.\URL::to('/').'/users/'.$user->id.'/view|'.$is_assigned_to->fullName().'> by <'.\URL::to('/').'/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'; + $slack_msg = 'License <'.url('/').'/licenses/'.$license->id.'|'.$license->name.'> checked out to <'.url('/').'/users/'.$user->id.'/view|'.$is_assigned_to->fullName().'> by <'.url('/').'/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'; } @@ -697,7 +697,7 @@ class LicensesController extends Controller 'fields' => [ [ 'title' => 'Checked In:', - 'value' => 'License: <'.\URL::to('/').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked in by <'.\URL::to('/').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.' + 'value' => 'License: <'.url('/').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked in by <'.url('/').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.' ], [ 'title' => 'Note:', diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index 90f73a595b..0daaeb390b 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -419,7 +419,7 @@ class LocationsController extends Controller foreach ($assets as $asset) { $rows[] = array( - 'name' => (string)link_to(\URL::to('/').'/hardware/'.$asset->id.'/view', e($asset->showAssetName())), + 'name' => (string)link_to_route('hardware.show', e($asset->showAssetName()), ['hardware' => $asset->id]), 'asset_tag' => e($asset->asset_tag), 'serial' => e($asset->serial), 'model' => e($asset->model->name), diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 192a67961d..1e7d855042 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -59,9 +59,9 @@ class SettingsController extends Controller } $pageURL = $protocol . $host . $_SERVER['REQUEST_URI']; - $start_settings['url_valid'] = (\URL::to('/').'/setup' === $pageURL); + $start_settings['url_valid'] = (\url('/').'/setup' === $pageURL); - $start_settings['url_config'] = \URL::to('/'); + $start_settings['url_config'] = \url('/'); $start_settings['real_url'] = $pageURL; $exposed_env = @file_get_contents($protocol . $host.'/.env'); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 792bcb943a..68c1263017 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -974,7 +974,7 @@ class UsersController extends Controller $actions = ''; foreach ($user->groups as $group) { - $group_names .= '' . $group->name . ' '; + $group_names .= '' . $group->name . ' '; } @@ -1015,7 +1015,7 @@ class UsersController extends Controller $rows[] = array( 'id' => $user->id, 'checkbox' => ($status!='deleted') ? '' : '', - 'name' => ''.e($user->fullName()).'', + 'name' => ''.e($user->fullName()).'', 'jobtitle' => e($user->jobtitle), 'email' => ($user->email!='') ? '' @@ -1023,7 +1023,7 @@ class UsersController extends Controller .'' : '', 'username' => e($user->username), 'location' => ($user->userloc) ? e($user->userloc->name) : '', - 'manager' => ($user->manager) ? '' . e($user->manager->fullName()) . '' : '', + 'manager' => ($user->manager) ? '' . e($user->manager->fullName()) . '' : '', 'assets' => $user->assets->count(), 'employee_num' => e($user->employee_num), 'licenses' => $user->licenses->count(), diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 33772dd638..d7cf2e5296 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -109,10 +109,10 @@ class ViewAssetsController extends Controller if ($fullItemType == Asset::class) { $data['item_url'] = route('view/hardware', $item->id); - $slackMessage = ' Asset <'.\URL::to('/').'/hardware/'.$item->id.'/view'.'|'.$item->showAssetName().'> requested by <'.\URL::to('/').'/users/'.$item->user_id.'/view'.'|'.$user->fullName().'>.'; + $slackMessage = ' Asset <'.url('/').'/hardware/'.$item->id.'/view'.'|'.$item->showAssetName().'> requested by <'.url('/').'/users/'.$item->user_id.'/view'.'|'.$user->fullName().'>.'; } else { $data['item_url'] = route("view/${itemType}", $item->id); - $slackMessage = $quantity. ' ' . class_basename(strtoupper($logaction->item_type)).' <'.$data['item_url'].'|'.$item->name.'> requested by <'.\URL::to('/').'/user/'.$item->id.'/view'.'|'.$user->fullName().'>.'; + $slackMessage = $quantity. ' ' . class_basename(strtoupper($logaction->item_type)).' <'.$data['item_url'].'|'.$item->name.'> requested by <'.url('/').'/user/'.$item->id.'/view'.'|'.$user->fullName().'>.'; } $settings = Setting::getSettings(); @@ -259,7 +259,7 @@ class ViewAssetsController extends Controller 'fields' => [ [ 'title' => 'REQUESTED:', - 'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.\URL::to('/').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.\URL::to('/').'/hardware/'.$asset->id.'/view'.'|'.Auth::user()->fullName().'>.' + 'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.url('/').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.url('/').'/hardware/'.$asset->id.'/view'.'|'.Auth::user()->fullName().'>.' ] ] diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php index 349d3ddac9..a07a72baf3 100644 --- a/app/Http/Middleware/CheckForSetup.php +++ b/app/Http/Middleware/CheckForSetup.php @@ -22,14 +22,14 @@ class CheckForSetup if (Setting::setupCompleted()) { if ($request->is('setup*')) { - return redirect(\URL::to('/')); + return redirect(url('/')); } else { return $next($request); } } else { if (!($request->is('setup*')) && !($request->is('.env'))) { - return redirect(\URL::to('/').'/setup')->with('Request', $request); + return redirect(url('/').'/setup')->with('Request', $request); } return $next($request); diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 7f8e40fa87..08c471635a 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -87,7 +87,7 @@
{{ Form::checkbox('avatar_delete') }} - + {!! $errors->first('avatar_delete', ':message') !!}
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index a21ab5152a..d1c8b3c975 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -46,10 +46,10 @@ View Assets for {{ $user->fullName() }} @if (($asset->image) && ($asset->image!='')) - + @elseif (($asset->model) && ($asset->model->image!='')) - + @endif diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 1d0900c71e..c69fe6f079 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -52,7 +52,7 @@
- {{ trans('auth/general.forgot_password') }} + {{ trans('auth/general.forgot_password') }}
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index a4187de7a3..14a4d3caae 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -2,7 +2,8 @@ 'createText' => trans('admin/categories/general.create') , 'updateText' => trans('admin/categories/general.update'), 'helpTitle' => trans('admin/categories/general.about_categories_title'), - 'helpText' => trans('admin/categories/general.about_categories') + 'helpText' => trans('admin/categories/general.about_categories'), + 'formAction' => ($item) ? route('categories.update', ['category' => $item->id]) : route('categories.store'), ]) @section('inputFields') @@ -64,6 +65,8 @@ @section('content') @parent + + @if ($snipeSettings->default_eula_text!='') @endif -@stop \ No newline at end of file +@stop diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php index a0011dae16..53ec159d2f 100644 --- a/resources/views/categories/view.blade.php +++ b/resources/views/categories/view.blade.php @@ -14,8 +14,8 @@ @stop @@ -60,7 +60,7 @@ -@stop +@stop @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'category-' . $category->name . '-export', 'search' => false]) diff --git a/resources/views/emails/accept-accessory.blade.php b/resources/views/emails/accept-accessory.blade.php index 94e94d8e26..f5d0bc1dc2 100644 --- a/resources/views/emails/accept-accessory.blade.php +++ b/resources/views/emails/accept-accessory.blade.php @@ -54,7 +54,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/accept-asset.blade.php b/resources/views/emails/accept-asset.blade.php index c0bd7cc7a9..e87f6987b0 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 ee2359ebfc..8ce2419d94 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 }}

diff --git a/resources/views/emails/asset-requested.blade.php b/resources/views/emails/asset-requested.blade.php index 8784d1a071..b90b5a7b0a 100644 --- a/resources/views/emails/asset-requested.blade.php +++ b/resources/views/emails/asset-requested.blade.php @@ -2,9 +2,9 @@ @section('content') -

{{ 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/auth/reminder.blade.php b/resources/views/emails/auth/reminder.blade.php index d7ba2a808e..1adddf2d09 100755 --- a/resources/views/emails/auth/reminder.blade.php +++ b/resources/views/emails/auth/reminder.blade.php @@ -7,7 +7,7 @@

{{ trans('mail.password_reset') }}

- {{ trans('mail.to_reset', ['web' => $snipeSettings->site_name]) }} {{ URL::to('password/reset', array($token)) }}. + {{ trans('mail.to_reset', ['web' => $snipeSettings->site_name]) }} {{ url('password/reset', array($token)) }}.
diff --git a/resources/views/emails/firstadmin.blade.php b/resources/views/emails/firstadmin.blade.php index 0c1c430ac4..7a8397147e 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: {{ URL::to('/') }} +URL: {{ url('/') }} {{ 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 a5e9b961ad..62f5faee36 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++) - {{ $data[$i]['name'] }} + {{ $data[$i]['name'] }} {{ $data[$i]['type'] }} {{ $data[$i]['remaining'] }} diff --git a/resources/views/emails/send-login.blade.php b/resources/views/emails/send-login.blade.php index 595c40fd34..e2f8b8451e 100644 --- a/resources/views/emails/send-login.blade.php +++ b/resources/views/emails/send-login.blade.php @@ -5,7 +5,7 @@

{{ trans('mail.admin_has_created', ['web' => $snipeSettings->site_name]) }}

-

URL: {{ URL::to('/') }}
+

URL: {{ url('/') }}
{{ trans('mail.login') }} {{ $username }}
{{ trans('mail.password') }} {{ $password }}

diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php index 753aeaea60..a50f592271 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -16,7 +16,7 @@
- +

403 Forbidden.

diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index f1671714ba..54d05de26d 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -16,7 +16,7 @@

- +

404 Page not found.

diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index e22c6b9209..59d1df13dd 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -16,7 +16,7 @@ System Unavailable

- +

System Unavailable

diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php index 5374e5ef05..a2b68561b8 100644 --- a/resources/views/groups/view.blade.php +++ b/resources/views/groups/view.blade.php @@ -14,7 +14,7 @@

{{ trans('admin/groups/table.update') }} - {{ trans('general.back') }} + {{ trans('general.back') }}

{{ trans('admin/groups/titles.group_management') }} - {{ $group->name }}

diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index 968eabb7ab..a5839e027c 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("{{URL::to('/') }}/api/"+model+"s",data,function (result) { + $.post("{{url('/') }}/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("{{URL::to('/') }}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) { + $.get("{{url('/') }}/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 += "" + asset.name; + table_html += "" + asset.name; if (asset.model.name!='') { table_html += " (" + asset.model.name + ")"; } diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 1a14cf51b3..f107951c2f 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -274,7 +274,7 @@ data._token = '{{ csrf_token() }}', // console.dir(data); - $.post("{{URL::to('/') }}/api/"+model+"s",data,function (result) { + $.post("{{url('/') }}/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(""); @@ -309,7 +309,7 @@ $(function() { $('#current_assets_content').html(""); } else { - $.get("{{URL::to('/') }}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) { + $.get("{{url('/') }}/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(); @@ -320,7 +320,7 @@ $(function() { for (var i in data) { var asset = data[i]; - table_html += "" + asset.name; + table_html += "" + asset.name; if (asset.model.name!='') { table_html += " (" + asset.model.name + ")"; diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 570483a09a..92e2221403 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -118,7 +118,7 @@ if ($item->id && $item->assetloc) {
{{ Form::checkbox('image_delete'),array('class' => 'minimal') }} - + {!! $errors->first('image_delete', ':message') !!}
@@ -144,7 +144,7 @@ if ($item->id && $item->assetloc) { if(modelid=='') { $('#custom_fields_content').html(""); } else { - $.get("{{URL::to('/') }}/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) { + $.get("{{url('/') }}/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) { $('#custom_fields_content').html(data); }); } @@ -168,7 +168,7 @@ if ($item->id && $item->assetloc) { if(status_id!=''){ $(".status_spinner").css("display", "inline"); $.ajax({ - url: "{{URL::to('/') }}/api/v1/statuslabels/"+status_id+"/deployable", + url: "{{url('/') }}/api/v1/statuslabels/"+status_id+"/deployable", success: function(data) { $(".status_spinner").css("display", "none"); @@ -372,7 +372,7 @@ $(function () { data._token = '{{ csrf_token() }}', //console.dir(data); - $.post("{{URL::to('/') }}/api/v1/"+model+"s",data,function (result) { + $.post("{{url('/') }}/api/v1/"+model+"s",data,function (result) { var id=result.id; var name=result.name || (result.first_name+" "+result.last_name); $('.modal-body input:visible').val(""); diff --git a/resources/views/hardware/import.blade.php b/resources/views/hardware/import.blade.php index 62b99401e2..0283398206 100644 --- a/resources/views/hardware/import.blade.php +++ b/resources/views/hardware/import.blade.php @@ -100,7 +100,7 @@ Select Import File... - +
-

Click here to go to your app login! {{ URL::to('/') }}

+

Click here to go to your app login! {{ url('/') }}

diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php index 5805d088c9..f9e126f2ce 100755 --- a/resources/views/suppliers/edit.blade.php +++ b/resources/views/suppliers/edit.blade.php @@ -47,7 +47,7 @@
{{ Form::checkbox('image_delete') }} - + {!! $errors->first('image_delete', ':message') !!}
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index bc39fd8bf8..f4230e913c 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -119,7 +119,7 @@ @endif @if ($supplier->image) -

    • +

    • @endif diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php index da16c7b4de..fa55f369bd 100644 --- a/resources/views/users/confirm-bulk-delete.blade.php +++ b/resources/views/users/confirm-bulk-delete.blade.php @@ -82,7 +82,7 @@ Bulk Checkin & Delete @foreach ($user->groups as $group) - + {{ $group->name }} @endforeach diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index cfbb6ef55a..bbccfa0d80 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -24,12 +24,12 @@ @endcan @if (Input::get('status')=='deleted') - {{ trans('admin/users/table.show_current') }} + {{ trans('admin/users/table.show_current') }} @else - {{ trans('admin/users/table.show_deleted') }} + {{ trans('admin/users/table.show_deleted') }} @endif @can('users.view') - Export + Export @endcan @stop diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 7e3e249f21..90f90c9ff9 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -295,7 +295,7 @@ Select File... - + @endcan