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

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
snipe
2013-11-25 07:47:18 -05:00
parent 79f93ab475 051ef0a218
commit ffcfc853b3
41 changed files with 216 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+10 -9
View File
@@ -32,33 +32,34 @@ class AssetsController extends AdminController {
// Filter results
if (Input::get('Pending'))
{
$assets = Asset::orderBy('asset_tag', 'ASC')->whereNull('status_id','and')->where('assigned_to','=','0')->where('physical', '=', 1);
$assets = Asset::orderBy('asset_tag', 'ASC')->whereNull('status_id','and')->where('assigned_to','=','0')->where('physical', '=', 1)->get();
}
else if (Input::get('RTD'))
{
$assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','=','0')->where('physical', '=', 1);
$assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','=','0')->where('physical', '=', 1)->get();
}
else if (Input::get('Undeployable'))
{
$assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '>', 1)->where('physical', '=', 1);
$assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '>', 1)->where('physical', '=', 1)->get();
}
else if (Input::get('Deployed'))
{
$assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','>','0')->where('physical', '=', 1);
$assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','>','0')->where('physical', '=', 1)->get();
}
else
{
$assets = Asset::orderBy('asset_tag', 'ASC')->where('physical', '=', 1);
$assets = Asset::orderBy('asset_tag', 'ASC')->where('physical', '=', 1)->get();
}
// Paginate the users
$assets = $assets->paginate(Setting::getSettings()->per_page)
/**$assets = $assets->paginate(Setting::getSettings()->per_page)
->appends(array(
'Pending' => Input::get('Pending'),
'RTD' => Input::get('RTD'),
'Undeployable' => Input::get('Undeployable'),
'Deployed' => Input::get('Deployed'),
));
**/
return View::make('backend/assets/index', compact('assets'));
}
@@ -117,7 +118,7 @@ class AssetsController extends AdminController {
$asset->notes = e(Input::get('notes'));
$asset->asset_tag = e(Input::get('asset_tag'));
$asset->status_id = e(Input::get('status_id'));
$asset->warrantee_months = e(Input::get('warrantee_months'));
$asset->warranty_months = e(Input::get('warranty_months'));
$asset->user_id = Sentry::getId();
$asset->physical = '1';
@@ -192,7 +193,7 @@ class AssetsController extends AdminController {
'asset_tag' => 'required|min:3',
'model_id' => 'required',
'serial' => 'required|min:3',
'warrantee_months' => 'integer|min:1',
'warranty_months' => 'integer|min:1',
);
// Create a new validator instance from our validation rules
@@ -215,7 +216,7 @@ class AssetsController extends AdminController {
$asset->order_number = e(Input::get('order_number'));
$asset->asset_tag = e(Input::get('asset_tag'));
$asset->status_id = e(Input::get('status_id'));
$asset->warrantee_months = e(Input::get('warrantee_months'));
$asset->warranty_months = e(Input::get('warranty_months'));
$asset->notes = e(Input::get('notes'));
$asset->physical = '1';
app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
+27
View File
@@ -0,0 +1,27 @@
<?php
use Illuminate\Database\Migrations\Migration;
class AlterWarrantyColumnOnAssets extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
DB::statement('ALTER TABLE assets CHANGE warrantee_months warranty_months int (3)');
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}
app/models/Asset.php
+2 -2
View File
@@ -9,7 +9,7 @@ class Asset extends Elegant {
'asset_tag' => 'required|min:3|unique:assets',
'model_id' => 'required',
'serial' => 'required|min:3',
'warrantee_months' => 'integer|min:1',
'warranty_months' => 'integer|min:1',
);
@@ -110,7 +110,7 @@ class Asset extends Elegant {
$date = date_create($this->purchase_date);
date_add($date, date_interval_create_from_date_string($this->warrantee_months.' months'));
date_add($date, date_interval_create_from_date_string($this->warranty_months.' months'));
return date_format($date, 'Y-m-d');
}
app/views/backend/assets/edit.blade.php
+4 -4
View File
@@ -106,11 +106,11 @@
</div>
<!-- Warrantee -->
<div class="control-group {{ $errors->has('warrantee_months') ? 'error' : '' }}">
<label class="control-label" for="serial">Warrantee</label>
<div class="control-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
<label class="control-label" for="serial">Warranty</label>
<div class="controls">
<input class="span1" type="text" name="warrantee_months" id="warrantee_months" value="{{ Input::old('warrantee_months', $asset->warrantee_months) }}" /> months
{{ $errors->first('warrantee_months', '<span class="help-inline">:message</span>') }}
<input class="span1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" /> months
{{ $errors->first('warranty_months', '<span class="help-inline">:message</span>') }}
</div>
</div>
app/views/backend/assets/index.blade.php
+24 -34
View File
@@ -24,19 +24,19 @@ Assets ::
@section('content')
<div class="page-header">
<h3>
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed'))
@if (Input::get('Pending'))
Pending
@elseif (Input::get('RTD'))
Ready to Deploy
@elseif (Input::get('Undeployable'))
Un-deployable
@elseif (Input::get('Deployed'))
Deployed
@endif
@else
All
@endif
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed'))
@if (Input::get('Pending'))
Pending
@elseif (Input::get('RTD'))
Ready to Deploy
@elseif (Input::get('Undeployable'))
Un-deployable
@elseif (Input::get('Deployed'))
Deployed
@endif
@else
All
@endif
Assets
@@ -53,30 +53,24 @@ Assets ::
</div>
<br><br>
@if ($assets->count() > 0)
@if ($assets && $assets->getTotal() && $assets->getTotal() > Setting::getSettings()->per_page)
{{ $assets->links() }}
@endif
<div class="row-fluid table">
@if ($assets->getTotal() > 0)
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<th class="span2">@lang('admin/assets/table.asset_tag')</th>
<th class="span2"><span class="line"></span>@lang('admin/assets/table.title')</th>
<th class="span2"><span class="line"></span>@lang('admin/assets/table.serial')</th>
<tr role="row">
<th class="span2" bSortable="true">@lang('admin/assets/table.asset_tag')</th>
<th class="span2" bSortable="true"><span class="line"></span>@lang('admin/assets/table.title')</th>
<th class="span2" bSortable="true"><span class="line"></span>@lang('admin/assets/table.serial')</th>
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
<th class="span2"><span class="line"></span>Status</th>
<th class="span2" bSortable="true">Status</th>
@else
<th class="span2"><span class="line"></span>@lang('admin/assets/table.checkoutto')</th>
<th class="span2"><span class="line"></span>@lang('admin/assets/table.location')</th>
<th class="span2" bSortable="true">@lang('admin/assets/table.checkoutto')</th>
<th class="span2" bSortable="true">@lang('admin/assets/table.location')</th>
@endif
<th class="span1"><span class="line"></span>@lang('admin/assets/table.change')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
<th class="span1">@lang('admin/assets/table.change')</th>
<th class="span2" bSortable="false">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@@ -144,10 +138,6 @@ Assets ::
</div>
@endif
</div>
@if ($assets && $assets->getTotal() && $assets->getTotal() > Setting::getSettings()->per_page)
{{ $assets->links() }}
@endif
@stop
app/views/backend/assets/view.blade.php
+3 -3
View File
@@ -110,8 +110,8 @@ View Asset {{ $asset->asset_tag }} ::
@if ($asset->order_number)
<li>Order #: {{ $asset->order_number }} </li>
@endif
@if ($asset->warrantee_months)
<li>Warrantee: {{ $asset->warrantee_months }} months</li>
@if ($asset->warranty_months)
<li>Warranty: {{ $asset->warranty_months }} months</li>
<li>Expires: {{ $asset->warrantee_expires() }}</li>
@endif
</ul>
@@ -153,7 +153,7 @@ View Asset {{ $asset->asset_tag }} ::
@else
<ul>
<li><br><br />This asset is not currently assigned to anyone. You may check it into inventory
using the button below, or mark it as lost/stolen using the menu above.</li>
using the button below.</li>
<li><br><br /><a href="{{ route('checkout/asset', $asset->id) }}" class="btn-flat large success">Checkout Asset</a></li>
</ul>
@endif
app/views/backend/depreciations/index.blade.php
+45 -38
View File
@@ -8,46 +8,53 @@ Asset Depreciations ::
{{-- Page content --}}
@section('content')
<div class="page-header">
<h3>
Asset Depreciations
<div id="pad-wrapper" class="user-profile">
<!-- header -->
<h3 class="name">Asset Depreciations
<div class="pull-right">
<a href="{{ route('create/depreciations') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
</div>
</h3>
<div class="pull-right">
<a href="{{ route('create/depreciations') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
</div>
</h3>
</div>
@if ($depreciations->getTotal() > Setting::getSettings()->per_page)
{{ $depreciations->links() }}
@endif
<div class="row-fluid profile">
<!-- bio, new note & orders column -->
<div class="span9 bio">
<div class="profile-box">
<br>
<!-- checked out assets table -->
<div class="row-fluid table">
<table class="table table-hover">
<thead>
<tr>
<th class="span6">@lang('admin/depreciations/table.title')</th>
<th class="span2"><span class="line"></span>@lang('admin/depreciations/table.term')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@foreach ($depreciations as $depreciation)
<tr>
<td>{{ $depreciation->name }}</td>
<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
<td>
<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn-flat white">@lang('button.edit')</a>
<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="Are you sure you wish to delete the {{ $depreciation->name }} depreciation class?" data-title="Delete {{ $depreciation->name }}?" onClick="return false;">@lang('button.delete')</a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<table id="example">
<thead>
<tr role="row">
<th class="span4">@lang('admin/depreciations/table.title')</th>
<th class="span2">@lang('admin/depreciations/table.term')</th>
<th class="span3">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@foreach ($depreciations as $depreciation)
<tr>
<td>{{ $depreciation->name }}</td>
<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
<td>
<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn-flat white">@lang('button.edit')</a>
<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="Are you sure you wish to delete the {{ $depreciation->name }} depreciation class?" data-title="Delete {{ $depreciation->name }}?" onClick="return false;">@lang('button.delete')</a>
</td>
</tr>
@endforeach
</tbody>
</table>
@if ($depreciations->getTotal() > Setting::getSettings()->per_page)
{{ $depreciations->links() }}
@endif
@stop
</div>
</div>
<!-- side address column -->
<div class="span3 address pull-right">
<br /><br />
<h6>About Asset Depreciations</h6>
<p>You can set up asset depreciations to depreciate assets based on straight-line depreciation. </p>
</div>
@stop
app/views/backend/groups/index.blade.php
+6 -12
View File
@@ -18,19 +18,16 @@ Group Management ::
</h3>
</div>
@if (count($groups) > Setting::getSettings()->per_page)
{{ $groups->links() }}
@endif
<div class="row-fluid table">
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<tr role="row">
<th class="span1">@lang('admin/groups/table.id')</th>
<th class="span6"><span class="line"></span>@lang('admin/groups/table.name')</th>
<th class="span2"><span class="line"></span>@lang('admin/groups/table.users')</th>
<th class="span2"><span class="line"></span>@lang('admin/groups/table.created_at')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
<th class="span6">@lang('admin/groups/table.name')</th>
<th class="span2">@lang('admin/groups/table.users')</th>
<th class="span2">@lang('admin/groups/table.created_at')</th>
<th class="span2">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@@ -56,8 +53,5 @@ Group Management ::
</table>
</div>
@if (count($groups) > Setting::getSettings()->per_page)
{{ $groups->links() }}
@endif
@stop
app/views/backend/layouts/default.blade.php
+31 -11
View File
@@ -22,6 +22,7 @@
<link href="{{ asset('assets/css/lib/bootstrap.datepicker.css') }}" type="text/css" rel="stylesheet">
<!-- libraries -->
<link href="{{ asset('assets/css/lib/jquery-ui-1.10.2.custom.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/css/lib/font-awesome.css') }}" type="text/css" rel="stylesheet" />
@@ -36,6 +37,8 @@
<link rel="stylesheet" href="{{ asset('assets/css/compiled/index.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-list.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-profile.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/lib/jquery.dataTables.css') }}" type="text/css" media="screen" />
<!-- open sans font -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
@@ -80,9 +83,9 @@
<ul class="nav pull-right">
@if (Sentry::check())
<li class="hidden-phone">
<!-- <li class="hidden-phone">
<input class="search" type="text" />
</li>
</li> -->
<li class="dropdown">
<a href="#" class="dropdown-toggle hidden-phone" data-toggle="dropdown">
@@ -288,11 +291,33 @@
<script src="{{ asset('assets/js/select2.min.js') }}"></script>
<script src="{{ asset('assets/js/jquery.uniform.min.js') }}"></script>
<script src="{{ asset('assets/js/bootstrap.datepicker.js') }}"></script>
<script src="{{ asset('assets/js/jquery.dataTables.js') }}"></script>
<script type="text/javascript">
$(function () {
$(document).ready(function() {
$('#example').dataTable({
"sPaginationType": "full_numbers"
});
});
$('#nosorting').dataTable({
"sPaginationType": "full_numbers",
"fnSort": [1,'asc'],
"aoColumns": [
{ "bSortable": false },
{ "bSortable": false },
{ "bSortable": false },
{ "bSortable": false }
]
});
// add uniform plugin styles to html elements
$("input:checkbox, input:radio").uniform();
@@ -327,22 +352,17 @@
$('#dataConfirmModal').find('.modal-body').text(message);
$('#dataConfirmOK').attr('href', href);
$('#dataConfirmModal').modal({show:true});
})
})
});
});
</script>
</script>
</body>
</html>
app/views/backend/licenses/index.blade.php
+28 -22
View File
@@ -16,31 +16,40 @@ Licenses ::
</div>
</h3>
</div>
@if ($licenses->getTotal() > Setting::getSettings()->per_page)
{{ $licenses->links() }}
@endif
<div class="row-fluid table">
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<th class="span1">@lang('admin/licenses/table.seats')</th>
<th class="span2"><span class="line"></span>@lang('admin/licenses/table.title')</th>
<th class="span2"><span class="line"></span>@lang('admin/licenses/table.serial')</th>
<th class="span2"><span class="line"></span>@lang('admin/licenses/table.assigned_to')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
<tr role="row">
<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
<th class="span2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
</tr>
</thead>
<tfoot>
<tr>
<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
<th class="span2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
</tr>
</tfoot>
<tbody>
@foreach ($licenses as $license)
<tr>
<td>{{ $license->seats }}</td>
<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a></td>
<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a>
@if ($license->seats ==1)
({{ $license->seats }} seat)
@else
({{ $license->seats }} seats)
@endif
</td>
<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
<td></td>
<td>
@@ -51,12 +60,12 @@ Licenses ::
</td>
</tr>
@if ($license->licenseseats)
<?php $count=1; ?>
@foreach ($license->licenseseats as $licensedto)
<tr>
<td></td>
<td>
@if ($licensedto->assigned_to)
<a href="{{ route('checkin/license', $licensedto->id) }}" class="btn-flat info"> Checkin </a>
@@ -64,7 +73,7 @@ Licenses ::
<a href="{{ route('checkout/license', $licensedto->id) }}" class="btn-flat success">Checkout</a>
@endif
</td>
<td><i class="icon-arrow-right"></i> {{ $license->serial }}</td>
<td>{{ $license->name }} Seat {{ $count }}</td>
@@ -80,6 +89,7 @@ Licenses ::
</tr>
<?php $count++; ?>
@endforeach
@endif
@@ -94,9 +104,5 @@ Licenses ::
</tbody>
</table>
</div>
@if ($licenses->getTotal() > Setting::getSettings()->per_page)
{{ $licenses->links() }}
@endif
@stop
app/views/backend/locations/index.blade.php
+5 -12
View File
@@ -18,20 +18,16 @@ Locations ::
</h3>
</div>
@if ($locations->getTotal() > 10)
{{ $locations->links() }}
@endif
<div class="row-fluid table">
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<tr role="row">
<th class="span4">@lang('admin/locations/table.name')</th>
<th class="span2"><span class="line"></span>Address</th>
<th class="span2"><span class="line"></span>@lang('admin/locations/table.city'),
<th class="span2">Address</th>
<th class="span2">@lang('admin/locations/table.city'),
@lang('admin/locations/table.state')
@lang('admin/locations/table.country')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
<th class="span2">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@@ -50,8 +46,5 @@ Locations ::
</table>
</div>
@if ($locations->getTotal() > 10)
{{ $locations->links() }}
@endif
@stop
app/views/backend/manufacturers/index.blade.php
+3 -10
View File
@@ -18,16 +18,13 @@ Asset Manufacturers ::
</h3>
</div>
@if ($manufacturers->getTotal() > Setting::getSettings()->per_page)
{{ $manufacturers->links() }}
@endif
<div class="row-fluid table">
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<tr role="row">
<th class="span10">@lang('admin/manufacturers/table.title')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
<th class="span2">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@@ -44,8 +41,4 @@ Asset Manufacturers ::
</table>
</div>
@if ($manufacturers->getTotal() > Setting::getSettings()->per_page)
{{ $manufacturers->links() }}
@endif
@stop
app/views/backend/models/index.blade.php
+2 -11
View File
@@ -17,14 +17,10 @@ Asset Models ::
</div>
</h3>
</div>
@if ($models->getTotal() > Setting::getSettings()->per_page)
{{ $models->links() }}
@endif
<div class="row-fluid table">
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<tr role="row">
<th class="span3">@lang('admin/models/table.title')</th>
<th class="span3"><span class="line"></span>@lang('admin/models/table.modelnumber')</th>
<th class="span1"><span class="line"></span>@lang('admin/models/table.numassets')</th>
@@ -49,9 +45,4 @@ Asset Models ::
</tbody>
</table>
@if ($models->getTotal() > Setting::getSettings()->per_page)
{{ $models->links() }}
@endif
@stop
app/views/backend/statuslabels/index.blade.php
+2 -2
View File
@@ -24,9 +24,9 @@ Status Labels
<br>
<!-- checked out assets table -->
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<tr role="row">
<th class="span4">@lang('admin/statuslabels/table.name')</th>
<th class="span2"><span class="line"></span>@lang('table.actions')</th>
</tr>
app/views/backend/users/index.blade.php
+12 -11
View File
@@ -22,21 +22,21 @@ User Management ::
<a class="btn-flat white" href="{{ URL::to('admin/users?onlyTrashed=true') }}">Include Only Deleted Users</a>
<br><br>
@if ($users->getTotal() > Setting::getSettings()->per_page)
@if ($users->getTotal() > 10)
{{ $users->links() }}
@endif
@if ($users->getTotal() > 0)
<div class="row-fluid table users-list">
<table class="table table-hover">
<table id="example">
<thead>
<tr>
<tr role="row">
<th class="span3">@lang('admin/users/table.name')</th>
<th class="span2"><span class="line"></span>@lang('admin/users/table.email')</th>
<th class="span1"><span class="line"></span>@lang('admin/users/table.checkedout')</th>
<th class="span1"><span class="line"></span>@lang('admin/users/table.activated')</th>
<th class="span2"><span class="line"></span>@lang('admin/users/table.last_login')</th>
<th class="span1"><span class="line"></span>@lang('admin/users/table.created_at')</th>
<th class="span2">@lang('admin/users/table.email')</th>
<th class="span1">@lang('admin/users/table.checkedout')</th>
<th class="span1">@lang('admin/users/table.activated')</th>
<th class="span2">@lang('admin/users/table.last_login')</th>
<th class="span1">@lang('admin/users/table.created_at')</th>
<th class="span2">@lang('table.actions')</th>
</tr>
</thead>
@@ -47,7 +47,7 @@ User Management ::
<td>
<img src="{{ $user->gravatar() }}" class="img-circle avatar hidden-phone" style="max-width: 45px;" />
<a href="{{ route('view/user', $user->id) }}" class="name">{{ $user->fullName() }}</a>
<span class="subtext">{{ $user->jobtitle }}</span>
</td>
<td>{{ $user->email }}</td>
<td>
@@ -71,7 +71,8 @@ User Management ::
@else
<a href="{{ route('update/user', $user->id) }}" class="btn-flat white"><i class="icon-pencil"></i> @lang('button.edit')</a>
@if (Sentry::getId() !== $user->id)
<a href="{{ route('delete/user', $user->id) }}" class="btn-flat danger"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/user', $user->id) }}" data-content="Are you sure you wish to delete the user {{ $user->fullName() }}?" data-title="Delete {{ $user->first_name }}?" onClick="return false;"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
@else
<span class="btn-flat danger disabled"><i class="icon-remove icon-white"></i> @lang('button.delete')</span>
@endif
@@ -93,7 +94,7 @@ User Management ::
</div>
@endif
@if ($users->getTotal() > Setting::getSettings()->per_page)
@if ($users->getTotal() > 10)
{{ $users->links() }}
@endif
public/assets/css/lib/jquery.dataTables.css
+12 -12
View File
@@ -143,13 +143,13 @@ table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
margin-left: 25px;
}
.paginate_enabled_previous { background: url('../../img/datatables/back_enabled.png') no-repeat top left; }
.paginate_enabled_previous:hover { background: url('../../img/datatables/back_enabled_hover.png') no-repeat top left; }
.paginate_disabled_previous { background: url('../../img/datatables/back_disabled.png') no-repeat top left; }
.paginate_enabled_previous { background: url('/assets/img/datatables/back_enabled.png') no-repeat top left; }
.paginate_enabled_previous:hover { background: url('/assets/img/datatables/back_enabled_hover.png') no-repeat top left; }
.paginate_disabled_previous { background: url('/assets/img/datatables/back_disabled.png') no-repeat top left; }
.paginate_enabled_next { background: url('../../img/datatables/forward_enabled.png') no-repeat top right; }
.paginate_enabled_next:hover { background: url('../../img/datatables/forward_enabled_hover.png') no-repeat top right; }
.paginate_disabled_next { background: url('../../img/datatables/forward_disabled.png') no-repeat top right; }
.paginate_enabled_next { background: url('/assets/img/datatables/forward_enabled.png') no-repeat top right; }
.paginate_enabled_next:hover { background: url('/assets/img/datatables/forward_enabled_hover.png') no-repeat top right; }
.paginate_disabled_next { background: url('/assets/img/datatables/forward_disabled.png') no-repeat top right; }
/* Full number pagination */
.paging_full_numbers {
@@ -228,13 +228,13 @@ table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
/*
* Sorting
*/
.sorting { background: url('../../img/datatables/sort_both.png') no-repeat center right; }
.sorting_asc { background: url('../../img/datatables/sort_asc.png') no-repeat center right; }
.sorting_desc { background: url('../../img/datatables/sort_desc.png') no-repeat center right; }
.sorting { background: url('/assets/img/datatables/sort_both.png') no-repeat center right; }
.sorting_asc { background: url('/assets/img/datatables/sort_asc.png') no-repeat center right; }
.sorting_desc { background: url('/assets/img/datatables/sort_desc.png') no-repeat center right; }
.sorting_asc_disabled { background: url('/assets/img/datatables/sort_asc_disabled.png') no-repeat center right; }
.sorting_desc_disabled { background: url('/assets/img/datatables/sort_desc_disabled.png') no-repeat center right; }
.sorting_asc_disabled { background: url('../../img/datatables/sort_asc_disabled.png') no-repeat center right; }
.sorting_desc_disabled { background: url('../../img/datatables/sort_desc_disabled.png') no-repeat center right; }
table.dataTable thead th:active,
table.dataTable thead td:active {
outline: none;
public/assets/img/datatables/back_disabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

public/assets/img/datatables/back_enabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

public/assets/img/datatables/back_enabled_hover.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

public/assets/img/datatables/forward_disabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

public/assets/img/datatables/forward_enabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

public/assets/img/datatables/forward_enabled_hover.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

public/assets/img/datatables/sort_asc.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

public/assets/img/datatables/sort_asc_disabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

public/assets/img/datatables/sort_both.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

public/assets/img/datatables/sort_desc.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

public/assets/img/datatables/sort_desc_disabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

public/img/bgs/10.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 144 KiB

public/img/bgs/11.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 143 KiB

public/img/bgs/12.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 105 KiB

public/img/bgs/13.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 102 KiB

public/img/bgs/14.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 267 KiB

public/img/bgs/6.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 150 KiB

public/img/bgs/7.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 138 KiB

public/img/bgs/8.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 151 KiB

public/img/bgs/9.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 144 KiB

public/img/bgs/back-blue.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

public/img/bgs/back-green.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

public/img/bgs/back-orange.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

public/img/bgs/blueish.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 647 KiB

public/img/bgs/landscape.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB