From 3e7a9e45d1954531bbc3b73f2ed59dd16d59c657 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 23 Jun 2014 19:40:09 -0400 Subject: [PATCH] Fixes PR #168 and #167 --- app/views/backend/categories/edit.blade.php | 2 +- app/views/backend/categories/index.blade.php | 4 +- .../backend/depreciations/edit.blade.php | 4 +- .../backend/depreciations/index.blade.php | 2 +- app/views/backend/groups/create.blade.php | 8 +-- app/views/backend/groups/edit.blade.php | 8 +-- app/views/backend/hardware/checkin.blade.php | 6 +- app/views/backend/hardware/checkout.blade.php | 6 +- app/views/backend/hardware/clone.blade.php | 16 ++--- app/views/backend/hardware/edit.blade.php | 18 ++--- app/views/backend/hardware/index.blade.php | 10 +-- app/views/backend/hardware/view.blade.php | 65 +++++++++---------- app/views/backend/layouts/default.blade.php | 36 +++++----- app/views/backend/licenses/checkin.blade.php | 4 +- app/views/backend/locations/edit.blade.php | 14 ++-- app/views/backend/locations/index.blade.php | 6 +- .../backend/manufacturers/edit.blade.php | 2 +- .../backend/manufacturers/index.blade.php | 2 +- app/views/backend/models/edit.blade.php | 6 +- app/views/backend/models/index.blade.php | 12 ++-- app/views/backend/models/view.blade.php | 11 ++-- app/views/backend/reports/index.blade.php | 22 +++---- app/views/backend/settings/edit.blade.php | 8 +-- app/views/backend/settings/index.blade.php | 28 ++++---- app/views/backend/statuslabels/edit.blade.php | 2 +- .../backend/statuslabels/index.blade.php | 2 +- app/views/backend/users/create.blade.php | 18 ++--- app/views/backend/users/edit.blade.php | 30 ++++----- app/views/backend/users/index.blade.php | 8 +-- app/views/backend/users/view.blade.php | 34 +++++----- 30 files changed, 198 insertions(+), 196 deletions(-) diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php index 8a8ab51615..f9a44db43c 100755 --- a/app/views/backend/categories/edit.blade.php +++ b/app/views/backend/categories/edit.blade.php @@ -39,7 +39,7 @@
- + {{ $errors->first('name', ' :message') }}
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index e720c5cca2..fdcc58b95c 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -30,12 +30,12 @@ @foreach ($categories as $category) - {{ $category->name }} + {{{ $category->name }}} +{{{ htmlspecialchars($category->name) }}}?" onClick="return false;"> diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php index 0cef364a1a..3edfa05d71 100755 --- a/app/views/backend/depreciations/edit.blade.php +++ b/app/views/backend/depreciations/edit.blade.php @@ -37,7 +37,7 @@
- + {{ $errors->first('name', ' :message') }}
@@ -46,7 +46,7 @@
- + {{ $errors->first('months', ' :message') }}
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index 84b1436956..acde7ea32c 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -37,7 +37,7 @@ Asset Depreciations :: + {{{ htmlspecialchars($depreciation->name) }}}?" onClick="return false;"> diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php index 0263939467..a6e2056097 100755 --- a/app/views/backend/groups/create.blade.php +++ b/app/views/backend/groups/create.blade.php @@ -28,7 +28,7 @@
- + {{ $errors->first('name', ' :message') }}
@@ -43,14 +43,14 @@ @foreach ($permissions as $permission)
- +
diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php index e373d76a03..4a7d097917 100755 --- a/app/views/backend/groups/edit.blade.php +++ b/app/views/backend/groups/edit.blade.php @@ -28,7 +28,7 @@
- + {{ $errors->first('name', ' :message') }}
@@ -40,14 +40,14 @@ @foreach ($permissions as $permission)
- +
diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php index 49bd8d2fbe..771dbb9ada 100644 --- a/app/views/backend/hardware/checkin.blade.php +++ b/app/views/backend/hardware/checkin.blade.php @@ -28,7 +28,7 @@
-

{{ $asset->asset_tag }}

+

{{{ $asset->asset_tag }}}

@@ -36,14 +36,14 @@
-

{{ $asset->name }}

+

{{{ $asset->name }}}

- + {{ $errors->first('note', ' :message') }}
diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index 44dc59c6a6..0b41d73cae 100644 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -29,7 +29,7 @@
-

{{ $asset->asset_tag }}

+

{{{ $asset->asset_tag }}}

@@ -37,7 +37,7 @@
-

{{ $asset->name }}

+

{{{ $asset->name }}}

@@ -54,7 +54,7 @@
- + {{ $errors->first('note', ' :message') }}
diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php index 4cac405d89..9da76e20ba 100644 --- a/app/views/backend/hardware/clone.blade.php +++ b/app/views/backend/hardware/clone.blade.php @@ -26,7 +26,7 @@
- + {{ $errors->first('asset_tag', ' :message') }}
@@ -34,7 +34,7 @@
- + {{ $errors->first('name', ' :message') }}
@@ -44,7 +44,7 @@
- + {{ $errors->first('serial', ' :message') }}
@@ -53,7 +53,7 @@
- + {{ $errors->first('order_number', ' :message') }}
@@ -71,7 +71,7 @@
- + {{ $errors->first('purchase_date', ' :message') }}
@@ -83,7 +83,7 @@
$ - + {{ $errors->first('purchase_cost', ' :message') }}
@@ -93,7 +93,7 @@
- + @lang('admin/hardware/form.months') {{ $errors->first('warranty_months', ' :message') }}
@@ -126,7 +126,7 @@
- + {{ $errors->first('notes', ' :message') }}
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index e034b3dcbe..2820aeca13 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -39,7 +39,7 @@
- + {{ $errors->first('asset_tag', ' :message') }}
@@ -48,7 +48,7 @@
- + {{ $errors->first('name', ' :message') }}
@@ -56,7 +56,7 @@
- + {{ $errors->first('serial', ' :message') }}
@@ -65,7 +65,7 @@
- + {{ $errors->first('order_number', ' :message') }}
@@ -82,8 +82,8 @@
-
- +
+ {{ $errors->first('purchase_date', ' :message') }}
@@ -95,7 +95,7 @@
@lang('general.currency') - + {{ $errors->first('purchase_cost', ' :message') }}
@@ -106,7 +106,7 @@
- @lang('admin/hardware/form.months') + @lang('admin/hardware/form.months') {{ $errors->first('warranty_months', ' :message') }}
@@ -125,7 +125,7 @@
- + {{ $errors->first('notes', ' :message') }}
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 9c24f4ec49..b464dd7a24 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -77,7 +77,7 @@ @lang('general.ready_to_deploy') @elseif (Input::get('Undeployable')) @if ($asset->assetstatus) - {{ $asset->assetstatus->name }} + {{{ $asset->assetstatus->name }}} @endif @endif @@ -85,16 +85,16 @@ @if ($asset->assigneduser) - {{ $asset->assigneduser->fullName() }} + {{{ $asset->assigneduser->fullName() }}} @endif @if ($asset->assigneduser && $asset->assetloc) - {{ $asset->assetloc->name }} + {{{ $asset->assetloc->name }}} @else @if ($asset->assetstatus) - {{ $asset->assetstatus->name }} + {{{ $asset->assetstatus->name }}} @endif @endif @@ -103,7 +103,7 @@ @if ($asset->model->eol) - {{ $asset->eol_date() }} + {{{ $asset->eol_date() }}} @endif diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index 599889c327..d407bb6f9e 100644 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -31,11 +31,10 @@

- @lang('admin/hardware/general.view') {{ $asset->asset_tag }} - - {{ $asset->asset_tag }} + @lang('admin/hardware/general.view') + {{{ $asset->asset_tag }}} @if ($asset->name) - ({{ $asset->name }}) + ({{{ $asset->name }}}) @endif

@@ -49,49 +48,49 @@ @if ($asset->model->manufacturer)
@lang('admin/hardware/form.manufacturer'): - {{ $asset->model->manufacturer->name }}
+ {{{ $asset->model->manufacturer->name }}}
@lang('admin/hardware/form.model'): - {{ $asset->model->name }} / {{ $asset->model->modelno }}
+ {{{ $asset->model->name }}} / {{{ $asset->model->modelno }}}
@endif @if ($asset->purchase_date)
@lang('admin/hardware/form.date'): - {{ $asset->purchase_date }}
+ {{{ $asset->purchase_date }}} @endif @if ($asset->purchase_cost)
@lang('admin/hardware/form.cost'): @lang('general.currency') - {{ number_format($asset->purchase_cost,2) }}
+ {{{ number_format($asset->purchase_cost,2) }}} @endif @if ($asset->order_number)
@lang('admin/hardware/form.order'): - {{ $asset->order_number }}
+ {{{ $asset->order_number }}} @endif @if ($asset->warranty_months)
@lang('admin/hardware/form.warranty'): - {{ $asset->warranty_months }} + {{{ $asset->warranty_months }}} @lang('admin/hardware/form.months')
@lang('admin/hardware/form.expires'): - {{ $asset->warrantee_expires() }}
+ {{{ $asset->warrantee_expires() }}} @endif @if ($asset->depreciation)
@lang('admin/hardware/form.depreciation'): {{ $asset->depreciation->name }} - ({{ $asset->depreciation->months }} + ({{{ $asset->depreciation->months }}} @lang('admin/hardware/form.months') )
@lang('admin/hardware/form.depreciates_on'): - {{ $asset->depreciated_date() }}
+ {{{ $asset->depreciated_date() }}}
@lang('admin/hardware/form.fully_depreciated'): - {{ $asset->months_until_depreciated()->m }} + {{{ $asset->months_until_depreciated()->m }}} @lang('admin/hardware/form.months') @if ($asset->months_until_depreciated()->y > 0) - , {{ $asset->months_until_depreciated()->y }} + , {{{ $asset->months_until_depreciated()->y }}} @lang('admin/hardware/form.years') @endif
@@ -99,18 +98,18 @@ @if ($asset->model->eol)
@lang('admin/hardware/form.eol_rate'): - {{ $asset->model->eol }} + {{{ $asset->model->eol }}} @lang('admin/hardware/form.months')
@lang('admin/hardware/form.eol_date'): - {{ $asset->eol_date() }} + {{{ $asset->eol_date() }}} @if ($asset->months_until_eol()) ( @if ($asset->months_until_eol()->y > 0) - {{ $asset->months_until_eol()->y }} + {{{ $asset->months_until_eol()->y }}} @lang('general.years'), @endif - {{ $asset->months_until_eol()->m }} + {{{ $asset->months_until_eol()->m }}} @lang('general.months') ) @endif @@ -142,23 +141,23 @@ @endif - {{ $log->added_on }} + {{{ $log->added_on }}} @if (isset($log->user_id)) - {{ $log->adminlog->fullName() }} + {{{ $log->adminlog->fullName() }}} @endif {{ $log->action_type }} @if (isset($log->checkedout_to)) - {{ $log->userlog->fullName() }} + {{{ $log->userlog->fullName() }}} @endif @if ($log->note) - {{ $log->note }} + {{{ $log->note }}} @endif @@ -169,7 +168,7 @@ {{ $asset->created_at }} @if ($asset->adminuser->id) - {{ $asset->adminuser->fullName() }} + {{{ $asset->adminuser->fullName() }}} @else @lang('general.unknown_admin') @endif @@ -190,7 +189,7 @@ @if ($qr_code->display)
@lang('admin/hardware/form.qr')

- +

@endif @@ -198,28 +197,28 @@

@lang('admin/hardware/form.checkedout_to')
@@ -197,12 +197,12 @@ @@ -329,8 +329,8 @@ $('#example').dataTable({ "sPaginationType": "full_numbers", - "iDisplayLength": {{ Setting::getSettings()->per_page }}, - "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]], + "iDisplayLength": {{{ Setting::getSettings()->per_page }}}, + "aLengthMenu": [[{{{ Setting::getSettings()->per_page }}}, -1], [{{{ Setting::getSettings()->per_page }}}, "All"]], "aoColumnDefs": [{ 'bSortable': false, 'aTargets': [ 'actions' ] }] }); @@ -343,8 +343,8 @@ { "bSortable": false }, { "bSortable": false } ], - "iDisplayLength": {{ Setting::getSettings()->per_page }}, - "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]] + "iDisplayLength": {{{ Setting::getSettings()->per_page }}}, + "aLengthMenu": [[{{{ Setting::getSettings()->per_page }}}, -1], [{{{ Setting::getSettings()->per_page }}}, "All"]] }); diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php index de4987ae45..5fd97b2838 100644 --- a/app/views/backend/licenses/checkin.blade.php +++ b/app/views/backend/licenses/checkin.blade.php @@ -30,7 +30,7 @@
-

{{ $licenseseat->license->name }}

+

{{{ $licenseseat->license->name }}}

@@ -38,7 +38,7 @@
-

{{ $licenseseat->license->serial }}

+

{{{ $licenseseat->license->serial }}}

diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php index 92fc7193fb..5fade315bc 100755 --- a/app/views/backend/locations/edit.blade.php +++ b/app/views/backend/locations/edit.blade.php @@ -39,7 +39,7 @@
- +
{{ $errors->first('name', ' :message') }}
@@ -50,7 +50,7 @@
- +
{{ $errors->first('address', ' :message') }}
@@ -61,7 +61,7 @@
- +
{{ $errors->first('address2', ' :message') }}
@@ -72,7 +72,7 @@
- +
{{ $errors->first('city', ' :message') }}
@@ -83,7 +83,7 @@
- +
{{ $errors->first('state', ' :message') }}
@@ -94,7 +94,7 @@
- +
{{ $errors->first('zip', ' :message') }}
@@ -105,7 +105,7 @@
- +
{{ $errors->first('country', ' :message') }}
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index 0a538cef5f..c6ec7ac6e1 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -32,9 +32,9 @@ Locations :: @foreach ($locations as $location) - {{ $location->name }} - {{ $location->address }}, {{ $location->address2 }} - {{ $location->city }}, {{ $location->state }} {{ $location->country }} + {{{ $location->name }}} + {{{ $location->address }}}, {{{ $location->address2 }}} + {{{ $location->city }}}, {{{ $location->state }}} {{{ $location->country }}}
- + {{ $errors->first('name', ' :message') }}
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index bc6225515c..9cebfa6053 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -31,7 +31,7 @@ @foreach ($manufacturers as $manufacturer) - {{ $manufacturer->name }} + {{{ $manufacturer->name }}} diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index 233f5953f1..ca2ebfac95 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -38,7 +38,7 @@
- + {{ $errors->first('name', ' :message') }}
@@ -47,7 +47,7 @@
- + {{ $errors->first('modelno', ' :message') }}
@@ -83,7 +83,7 @@
- + @lang('general.months') {{ $errors->first('eol', ' :message') }} diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index 0467cbedff..8c5143768d 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -33,13 +33,15 @@ @foreach ($models as $model) {{{ $model->name }}} - {{ $model->modelno }} + {{{ $model->modelno }}} {{ ($model->assets->count()) }} @if (($model->depreciation) && ($model->depreciation->id > 0)) - {{ $model->depreciation->name }} - ({{ $model->depreciation->months }} months) + {{{ $model->depreciation->name }}} + ({{{ $model->depreciation->months }}} + @lang('general.months') + ) @else @lang('general.no_depreciation') @endif @@ -47,14 +49,14 @@ @if ($model->category) - {{ $model->category->name }} + {{{ $model->category->name }}} @endif @if ($model->eol) - {{ $model->eol }} + {{{ $model->eol }}} @lang('general.months') @else -- diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index b6b6d71263..8f9b4b8e1d 100644 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -3,7 +3,7 @@ {{-- Page title --}} @section('title') @lang('admin/models/table.view') -{{ $model->model_tag }} :: +{{{ $model->model_tag }}} :: @parent @stop @@ -14,7 +14,8 @@
@lang('admin/models/table.update') -

@lang('general.history_for') {{ $model->name }}

+

@lang('general.history_for') + {{{ $model->name }}}

@@ -38,12 +39,12 @@ @foreach ($model->assets as $modelassets) - {{ $modelassets->name }} - {{ $modelassets->asset_tag }} + {{{ $modelassets->name }}} + {{{ $modelassets->asset_tag }}} @if ($modelassets->assigneduser) - {{ $modelassets->assigneduser->fullName() }} + {{{ $modelassets->assigneduser->fullName() }}} @endif diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php index 7d34ce5cd0..6f28bd23a8 100644 --- a/app/views/backend/reports/index.blade.php +++ b/app/views/backend/reports/index.blade.php @@ -44,41 +44,41 @@ @foreach ($assets as $asset) - {{ $asset->asset_tag }} - {{ $asset->model->name }} + {{{ $asset->asset_tag }}} + {{{ $asset->model->name }}} @if (Setting::getSettings()->display_asset_name) - {{ $asset->name }} + {{{ $asset->name }}} @endif {{ $asset->serial }} @if ($asset->assigned_to != 0) - {{ $asset->assigneduser->fullName() }} + {{{ $asset->assigneduser->fullName() }}} @endif @if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) - {{ Location::find($asset->assigneduser->location_id)->city }} + {{{ Location::find($asset->assigneduser->location_id)->city }}} , - {{ Location::find($asset->assigneduser->location_id)->state }} + {{{ Location::find($asset->assigneduser->location_id)->state }}} @endif - {{ $asset->purchase_date }} + {{{ $asset->purchase_date }}} @if ($asset->model->eol) - {{ $asset->eol_date() }} + {{{ $asset->eol_date() }}} @endif @if ($asset->purchase_cost > 0) @lang('general.currency') - {{ number_format($asset->purchase_cost) }} + {{{ number_format($asset->purchase_cost) }}} @lang('general.currency') - {{ number_format($asset->depreciate()) }} + {{{ number_format($asset->depreciate()) }}} @lang('general.currency') - -{{ number_format(($asset->purchase_cost - $asset->depreciate())) }} + -{{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}} @else diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php index 318598407c..80964ab064 100755 --- a/app/views/backend/settings/edit.blade.php +++ b/app/views/backend/settings/edit.blade.php @@ -35,7 +35,7 @@
- + {{ $errors->first('site_name', ':message') }}
@@ -46,7 +46,7 @@
- display_asset_name === '1' ? 'checked' : '' }} /> + display_asset_name === '1' ? 'checked' : '' }}} /> {{ $errors->first('display_asset_name', ':message') }}
@@ -57,7 +57,7 @@
- + {{ $errors->first('per_page', ':message') }}
@@ -84,7 +84,7 @@
@if ($setting->qr_code === '1') - + @else @lang('admin/settings/general.qr_help') diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index a05821144f..c974aa7e81 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -37,34 +37,34 @@ Settings :: @foreach ($settings as $setting) Site Name - {{ $setting->site_name }} + {{{ $setting->site_name }}} @lang('admin/settings/general.display_asset_name') -@if ($setting->display_asset_name === '1') - Yes -@else - No -@endif + @if ($setting->display_asset_name === '1') + Yes + @else + No + @endif Per Page - {{ $setting->per_page }} + {{{ $setting->per_page }}} Display QR Codes -@if ($setting->qr_code === '1') - Yes -@else - No -@endif + @if ($setting->qr_code === '1') + Yes + @else + No + @endif - + QR Code Text - {{ $setting->qr_text }} + {{{ $setting->qr_text }}} @endforeach diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php index 002234ffae..0d90949279 100755 --- a/app/views/backend/statuslabels/edit.blade.php +++ b/app/views/backend/statuslabels/edit.blade.php @@ -43,7 +43,7 @@
- + {{ $errors->first('name', ' :message') }}
diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php index 88b7ca7fef..2e1272dc3b 100755 --- a/app/views/backend/statuslabels/index.blade.php +++ b/app/views/backend/statuslabels/index.blade.php @@ -34,7 +34,7 @@ @foreach ($statuslabels as $statuslabel) - {{ $statuslabel->name }} + {{{ $statuslabel->name }}}
- + {{ $errors->first('first_name', ':message') }}
@@ -46,7 +46,7 @@ Create a User ::
- + {{ $errors->first('last_name', ':message') }}
@@ -57,7 +57,7 @@ Create a User ::
- + {{ $errors->first('jobtitle', ':message') }}
@@ -88,7 +88,7 @@ Create a User ::
- + {{ $errors->first('phone', ':message') }}
@@ -97,7 +97,7 @@ Create a User ::
- + {{ $errors->first('email', ':message') }}
@@ -163,15 +163,15 @@ Create a User ::
-
@@ -179,7 +179,7 @@ Create a User :: @if ($permission['can_inherit'])
diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php index f60e95985c..9b7ee05b04 100755 --- a/app/views/backend/users/edit.blade.php +++ b/app/views/backend/users/edit.blade.php @@ -14,7 +14,7 @@ Update User {{ $user->fullName() }} :: @lang('general.back')

- Update User {{ $user->fullName() }} + Update User {{{ $user->fullName() }}}

@@ -36,7 +36,7 @@ Update User {{ $user->fullName() }} ::
- + {{ $errors->first('first_name', ':message') }}
@@ -45,7 +45,7 @@ Update User {{ $user->fullName() }} ::
- + {{ $errors->first('last_name', ':message') }}
@@ -54,7 +54,7 @@ Update User {{ $user->fullName() }} ::
- + {{ $errors->first('jobtitle', ':message') }}
@@ -85,7 +85,7 @@ Update User {{ $user->fullName() }} ::
- + {{ $errors->first('phone', ':message') }}
@@ -95,7 +95,7 @@ Update User {{ $user->fullName() }} ::
- + {{ $errors->first('email', ':message') }}
@@ -123,8 +123,8 @@ Update User {{ $user->fullName() }} ::
id === Sentry::getId() ? ' disabled="disabled"' : '') }} name="activated" id="activated"> - - + + {{ $errors->first('activated', ':message') }}
@@ -136,7 +136,7 @@ Update User {{ $user->fullName() }} ::
@@ -161,23 +161,23 @@ Update User {{ $user->fullName() }} ::
-
-
@if ($permission['can_inherit'])
-
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index 72a0093aee..7990a245e6 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -54,14 +54,14 @@ {{ $user->fullName() }} - {{ $user->email }} + {{{ $user->email }}} @if ($user->manager) - {{ $user->manager->fullName() }} + {{{ $user->manager->fullName() }}} @endif - {{ $user->assets->count() }} - {{ $user->licenses->count() }} + {{{ $user->assets->count() }}} + {{{ $user->licenses->count() }}} {{ $user->isActivated() ? '' : ''}} diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php index 5036c7d208..755444683a 100644 --- a/app/views/backend/users/view.blade.php +++ b/app/views/backend/users/view.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -View User {{ $user->fullName() }} :: +View User {{{ $user->fullName() }}} :: @parent @stop @@ -13,9 +13,9 @@ View User {{ $user->fullName() }} ::
- -

{{ $user->fullName() }}

- {{ $user->jobtitle }} + +

{{{ $user->fullName() }}}

+ {{{ $user->jobtitle }}}
@if ($user->deleted_at != NULL) Restore This User @@ -62,11 +62,11 @@ View User {{ $user->fullName() }} :: @if ($asset->physical=='1') - {{ $asset->model->name }} + {{{ $asset->model->name }}} @endif - {{ $asset->asset_tag }} - {{ $asset->name }} + {{{ $asset->asset_tag }}} + {{{ $asset->name }}} Checkin @@ -98,8 +98,8 @@ View User {{ $user->fullName() }} :: @foreach ($user->licenses as $license) - {{ $license->name }} - {{ $license->serial }} + {{{ $license->name }}} + {{{ $license->serial }}} Checkin @@ -138,12 +138,12 @@ View User {{ $user->fullName() }} :: {{ $log->action_type }} @if ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at=='')) - {{ $log->assetlog->asset_tag }} + {{{ $log->assetlog->asset_tag }}} @elseif ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at!='')) - {{ $log->assetlog->name }} (deleted) + {{{ $log->assetlog->name }}} (deleted) @endif - {{ $log->adminlog->fullName() }} + {{{ $log->adminlog->fullName() }}} @endforeach @@ -174,17 +174,17 @@ View User {{ $user->fullName() }} :: @endif
    @if ($user->manager) - Manager: {{ $user->manager->fullName() }} + Manager: {{{ $user->manager->fullName() }}} @endif @if ($user->location_id) -
  • {{ $user->userloc->address }} {{ $user->userloc->address2 }}
    • -
  • {{ $user->userloc->city }}, {{ $user->userloc->state }} {{ $user->userloc->zip }}

    • +
  • {{{ $user->userloc->address }}} {{{ $user->userloc->address2 }}}
    • +
  • {{{ $user->userloc->city }}}, {{{ $user->userloc->state }}} {{{ $user->userloc->zip }}}

    • @endif @if ($user->phone) -
  • {{ $user->phone }}
    • +
  • {{{ $user->phone }}}
    • @endif -
  • {{ $user->email }}
    • +
  • {{{ $user->email }}}
@if ($user->last_login!='')