ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Localization on user's view page, new strings

Browse Source
This commit is contained in:
snipe
2014-11-12 16:22:30 -05:00
parent fc2d472ed3
commit 02feb69d5d
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/lang/en/admin/users/general.php
View File

@@ -3,6 +3,12 @@
return array(
'edit' => 'Edit User',
'assets_user' => 'Assets asigned to :name',
'clone' => 'Clone User',
'contact_user' => 'Contact :name',
'edit' => 'Edit User',
'history_user' => 'History for :name',
'last_login' => 'Last Login',
'software_user' => 'Software Checked out to :name',
'view_user' => 'View User :name',
);

12
app/lang/en/admin/users/message.php
View File

@@ -2,11 +2,13 @@
return array(
'user_exists' => 'User already exists!',
'user_not_found' => 'User [:id] does not exist.',
'user_login_required' => 'The login field is required',
'user_password_required' => 'The password is required.',
'insufficient_permissions' => 'Insufficient Permissions.',
'user_exists' => 'User already exists!',
'user_not_found' => 'User [:id] does not exist.',
'user_login_required' => 'The login field is required',
'user_password_required' => 'The password is required.',
'insufficient_permissions' => 'Insufficient Permissions.',
'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
'success' => array(
'create' => 'User was successfully created.',

4
app/lang/en/table.php
View File

@@ -2,6 +2,8 @@
return array(
'actions' => 'Actions'
'actions' => 'Actions',
'action' => 'Action',
'by' => 'By',
);

27
app/views/backend/users/view.blade.php
View File

@@ -2,7 +2,7 @@
{{-- Page title --}}
@section('title')
View User {{{ $user->fullName() }}} ::
@lang('admin/users/general.view_user', array('name' => $user->first_name)) ::
@parent
@stop
@@ -57,14 +57,15 @@ View User {{{ $user->fullName() }}} ::
<div class="col-md-12">
<div class="alert alert-danger">
<i class="icon-exclamation-sign"></i>
<strong>Warning: </strong>
This user has been deleted. You will have to restore this user to edit them or assign them new assets.
@lang('admin/users/messages.user_deleted_warning')
</div>
</div>
@endif
<h6>Assets Checked Out to {{{ $user->first_name }}}</h6>
<h6>@lang('admin/users/general.assets_user', array('name' => $user->first_name))</h6>
<br>
<!-- checked out assets table -->
@if (count($user->assets) > 0)
@@ -102,7 +103,7 @@ View User {{{ $user->fullName() }}} ::
</div>
@endif
<h6>Software Checked Out to {{{ $user->first_name }}}</h6>
<h6>@lang('admin/users/general.software_user', array('name' => $user->first_name))</h6>
<br>
<!-- checked out assets table -->
@if (count($user->licenses) > 0)
@@ -137,7 +138,7 @@ View User {{{ $user->fullName() }}} ::
<h6>History for {{{ $user->first_name }}}</h6>
<h6>@lang('admin/users/general.history_user', array('name' => $user->first_name))</h6>
<br>
<!-- checked out assets table -->
@if (count($user->userlog) > 0)
@@ -145,9 +146,9 @@ View User {{{ $user->fullName() }}} ::
<thead>
<tr>
<th class="col-md-3">Date</th>
<th class="col-md-3"><span class="line"></span>Action</th>
<th class="col-md-3"><span class="line"></span>Asset</th>
<th class="col-md-3"><span class="line"></span>By</th>
<th class="col-md-3"><span class="line"></span>@lang('table.action')</th>
<th class="col-md-3"><span class="line"></span>@lang('general.asset')</th>
<th class="col-md-3"><span class="line"></span>@lang('table.by')</th>
</tr>
</thead>
<tbody>
@@ -187,7 +188,7 @@ View User {{{ $user->fullName() }}} ::
<h6>Contact {{{ $user->first_name }}}</h6>
<h6> @lang('admin/users/general.contact_user', array('name' => $user->first_name)) </h6>
@if ($user->location_id)
@@ -197,7 +198,8 @@ View User {{{ $user->fullName() }}} ::
@endif
<ul>
@if ($user->manager)
<li><strong>Manager:</strong> {{{ $user->manager->fullName() }}}</li>
<li><strong> @lang('admin/users/table.manager'):</strong><br>
{{{ $user->manager->fullName() }}}</li>
@endif
@if ($user->location_id)
@@ -211,7 +213,8 @@ View User {{{ $user->fullName() }}} ::
</ul>
@if ($user->last_login!='')
<br /><h6>Last Login: {{{ $user->last_login->diffForHumans() }}}</h6>
<br /><h6>@lang('admin/users/general.last_login')
{{{ $user->last_login->diffForHumans() }}}</h6>
@endif
</div>
@stop