DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 15:01:02 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2017-03-10 20:07:49 -08:00
parent ad510cecd5 4af2a8eb35
commit bf99534f8d
5 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/admin/users/general.php
View file

@ -12,6 +12,7 @@ return array(
'edit' => 'Edit User', 'edit' => 'Edit User',
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name', 'history_user' => 'History for :name',
'info' => 'Info',
'last_login' => 'Last Login', 'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name', 'software_user' => 'Software Checked out to :name',

3
resources/lang/en/admin/users/table.php
View file

@ -1,7 +1,6 @@
<?php <?php
return array( return array(
'activated' => 'Active', 'activated' => 'Active',
'allow' => 'Allow', 'allow' => 'Allow',
'checkedout' => 'Assets', 'checkedout' => 'Assets',
@ -28,8 +27,10 @@ return array(
'show_current' => 'Show Current Users', 'show_current' => 'Show Current Users',
'show_deleted' => 'Show Deleted Users', 'show_deleted' => 'Show Deleted Users',
'title' => 'Title', 'title' => 'Title',
'to_restore_them' => 'to restore them.',
'updateuser' => 'Update User', 'updateuser' => 'Update User',
'username' => 'Username', 'username' => 'Username',
'user_deleted_text' => 'This user has been marked as deleted.',
'username_note' => '(This is used for Active Directory binding only, not for login.)', 'username_note' => '(This is used for Active Directory binding only, not for login.)',
'cloneuser' => 'Clone User', 'cloneuser' => 'Clone User',
'viewusers' => 'View Users', 'viewusers' => 'View Users',

3
resources/lang/en/button.php
View file

@ -1,7 +1,6 @@
<?php <?php
return array( return array(
'actions' => 'Actions', 'actions' => 'Actions',
'add' => 'Add New', 'add' => 'Add New',
'cancel' => 'Cancel', 'cancel' => 'Cancel',
@ -12,5 +11,5 @@ return array(
'request' => 'Request', 'request' => 'Request',
'submit' => 'Submit', 'submit' => 'Submit',
'upload' => 'Upload', 'upload' => 'Upload',
'select_file' => 'Select File...',
); );

2
resources/lang/en/general.php
View file

@ -33,10 +33,12 @@
'checkin_from' => 'Checkin from', 'checkin_from' => 'Checkin from',
'checkout' => 'Checkout', 'checkout' => 'Checkout',
'city' => 'City', 'city' => 'City',
'click_here' => 'Click here',
'companies' => 'Companies', 'companies' => 'Companies',
'company' => 'Company', 'company' => 'Company',
'component' => 'Component', 'component' => 'Component',
'components' => 'Components', 'components' => 'Components',
'complete' => 'Complete',
'consumable' => 'Consumable', 'consumable' => 'Consumable',
'consumables' => 'Consumables', 'consumables' => 'Consumables',
'country' => 'Country', 'country' => 'Country',

40
resources/views/users/view.blade.php
View file

@ -19,7 +19,7 @@
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fa fa-info-circle"></i> <i class="fa fa-info-circle"></i>
</span> </span>
<span class="hidden-xs hidden-sm">Info</span> <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
</a> </a>
</li> </li>
@ -97,9 +97,9 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="callout callout-warning"> <div class="callout callout-warning">
<i class="icon fa fa-warning"></i> <i class="icon fa fa-warning"></i>
This user has been marked as deleted. {{ trans('general.user_deleted_text') }}
@can('update', $user) @can('update', $user)
<a href="{{ route('restore/user', $user->id) }}">Click here</a> to restore them. <a href="{{ route('restore/user', $user->id) }}">{{ trans('general.click_here') }}</a> {{ trans('general.to_restore_them') }}
@endcan @endcan
</div> </div>
</div> </div>
@ -117,13 +117,13 @@
<table class="table table-striped"> <table class="table table-striped">
@if (!is_null($user->company)) @if (!is_null($user->company))
<tr> <tr>
<td>Company</td> <td>{{ trans('general.company') }}</td>
<td>{{ $user->company->name }}</td> <td>{{ $user->company->name }}</td>
</tr> </tr>
@endif @endif
<tr> <tr>
<td>Name</td> <td>{{ trans('admin/users/table.name') }}</td>
<td>{{ $user->present()->fullName() }}</td> <td>{{ $user->present()->fullName() }}</td>
</tr> </tr>
@ -136,42 +136,42 @@
@if ($user->jobtitle) @if ($user->jobtitle)
<tr> <tr>
<td>Title</td> <td>{{ trans('admin/users/table.job') }}</td>
<td>{{ $user->jobtitle }}</td> <td>{{ $user->jobtitle }}</td>
</tr> </tr>
@endif @endif
@if ($user->employee_num) @if ($user->employee_num)
<tr> <tr>
<td>Employee No.</td> <td>{{ trans('admin/users/table.employee_num') }}</td>
<td>{{ $user->employee_num }}</td> <td>{{ $user->employee_num }}</td>
</tr> </tr>
@endif @endif
@if ($user->manager) @if ($user->manager)
<tr> <tr>
<td>Manager</td> <td>{{ trans('admin/users/table.manager') }}</td>
<td>{{$user->manager->present()->nameUrl() }}</td> <td>{{$user->manager->present()->nameUrl() }}</td>
</tr> </tr>
@endif @endif
@if ($user->email) @if ($user->email)
<tr> <tr>
<td>Email</td> <td>{{ trans('admin/users/table.email') }}</td>
<td><a href="mailto:{{ $user->email }}">{{ $user->email }}</a></td> <td><a href="mailto:{{ $user->email }}">{{ $user->email }}</a></td>
</tr> </tr>
@endif @endif
@if ($user->phone) @if ($user->phone)
<tr> <tr>
<td>Phone</td> <td>{{ trans('admin/users/table.phone') }}</td>
<td>{{ $user->phone }}</td> <td>{{ $user->phone }}</td>
</tr> </tr>
@endif @endif
@if ($user->userloc) @if ($user->userloc)
<tr> <tr>
<td>Location</td> <td>{{ trans('admin/users/table.location') }}</td>
<td>{{ $user->userloc->name }}</td> <td>{{ $user->userloc->name }}</td>
</tr> </tr>
@endif @endif
@ -251,7 +251,7 @@
<td>{!! $asset->present()->nameUrl() !!}</td> <td>{!! $asset->present()->nameUrl() !!}</td>
<td class="hidden-print"> <td class="hidden-print">
@can('checkin', $asset) @can('checkin', $asset)
<a href="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">Checkin</a> <a href="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
@endcan @endcan
</td> </td>
</tr> </tr>
@ -282,7 +282,7 @@
</td> </td>
<td class="hidden-print"> <td class="hidden-print">
@can('update', $license) @can('update', $license)
<a href="{{ route('licenses.checkin', array('licenseseat_id'=> $license->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">Checkin</a> <a href="{{ route('licenses.checkin', array('licenseseat_id'=> $license->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
@endcan @endcan
</td> </td>
</tr> </tr>
@ -297,8 +297,8 @@
<table class="display table table-hover"> <table class="display table table-hover">
<thead> <thead>
<tr> <tr>
<th class="col-md-5">Name</th> <th class="col-md-5">{{ trans('general.name') }}</th>
<th class="col-md-1 hidden-print">Actions</th> <th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -307,7 +307,7 @@
<td>{!!$accessory->present()->nameUrl()!!}</td> <td>{!!$accessory->present()->nameUrl()!!}</td>
<td class="hidden-print"> <td class="hidden-print">
@can('checkin', $accessory) @can('checkin', $accessory)
<a href="{{ route('checkin/accessory', array('accessory_id'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">Checkin</a> <a href="{{ route('checkin/accessory', array('accessory_id'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
@endcan @endcan
</td> </td>
</tr> </tr>
@ -348,7 +348,7 @@
@can('update', $user) @can('update', $user)
<span class="btn btn-info fileinput-button hidden-print"> <span class="btn btn-info fileinput-button hidden-print">
<i class="fa fa-plus icon-white"></i> <i class="fa fa-plus icon-white"></i>
<span>Select File...</span> <span>{{ trans('button.select_file') }}</span>
<!-- The file input field used as target for the file upload widget --> <!-- The file input field used as target for the file upload widget -->
<input id="fileupload" type="file" name="file[]" data-url="{{ route('upload/user', $user->id) }}"> <input id="fileupload" type="file" name="file[]" data-url="{{ route('upload/user', $user->id) }}">
</span> </span>
@ -362,7 +362,7 @@
<div class="col-md-11"> <div class="col-md-11">
<div id="progress" class="progress progress-striped active" style="margin-top: 8px;"> <div id="progress" class="progress progress-striped active" style="margin-top: 8px;">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"> <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%">
<span id="progress-bar-text">0% Complete</span> <span id="progress-bar-text">0% {{ trans('general.complete') }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -399,7 +399,7 @@
</td> </td>
<td> <td>
@if ($file->filename) @if ($file->filename)
<a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-default">Download</a> <a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-default">{{ trans('general.download') }}</a>
@endif @endif
</td> </td>
<td> <td>
@ -422,7 +422,7 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-1"></th> <th class="col-md-1"></th>
<th class="col-md-2">Date</th> <th class="col-md-2">{{ trans('general.date') }}</th>
<th class="col-md-2"><span class="line"></span>{{ trans('table.action') }}</th> <th class="col-md-2"><span class="line"></span>{{ trans('table.action') }}</th>
<th class="col-md-4"><span class="line"></span>{{ trans('general.asset') }}</th> <th class="col-md-4"><span class="line"></span>{{ trans('general.asset') }}</th>
<th class="col-md-3"><span class="line"></span>{{ trans('table.by') }}</th> <th class="col-md-3"><span class="line"></span>{{ trans('table.by') }}</th>