Skip to content

Commit

Permalink
Fixes #87 - made datatables responsive
Browse files Browse the repository at this point in the history
  • Loading branch information
@snipe
snipe committed Oct 16, 2014
1 parent 7c97477 commit bf1e075
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 12,141 deletions.
64 changes: 37 additions & 27 deletions app/views/backend/hardware/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

@if ($assets->count() > 0)


<div class="table-responsive">
<table id="example">
<thead>
<tr role="row">
Expand All @@ -57,12 +57,10 @@
<th class="col-md-3" bSortable="true">@lang('general.name')</th>
@endif
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.serial')</th>
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))

<th class="col-md-2" bSortable="true">@lang('general.status')</th>
@else
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.checkoutto')</th>

<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.location')</th>
@endif
<th class="col-md-2">@lang('admin/hardware/table.eol')</th>
<th class="col-md-1">@lang('admin/hardware/table.change')</th>
<th class="col-md-2 actions" bSortable="false">@lang('table.actions')</th>
Expand All @@ -72,43 +70,53 @@

@foreach ($assets as $asset)
<tr>
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->asset_tag }}</a></td>
<td><a href="{{ route('view/model', $asset->model->id) }}">{{ $asset->model->name }}</a></td>
<td><a href="{{ route('view/hardware', $asset->id) }}">{{{ $asset->asset_tag }}}</a></td>
<td><a href="{{ route('view/model', $asset->model->id) }}">{{{ $asset->model->name }}}</a></td>

@if (Setting::getSettings()->display_asset_name)
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->name }}</a></td>
<td><a href="{{ route('view/hardware', $asset->id) }}">{{{ $asset->name }}}</a></td>
@endif
<td>{{ $asset->serial }}</td>
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))

<td>{{{ $asset->serial }}}</td>


<td>
@if (Input::get('Pending'))
@lang('general.pending')
@elseif (Input::get('RTD'))
@lang('general.ready_to_deploy')
@elseif (Input::get('Undeployable'))
@if ($asset->assetstatus) {{{ $asset->assetstatus->name }}}
@if ($asset->assetstatus)
{{{ $asset->assetstatus->name }}}
@endif
@else
@if ($asset->assigneduser)
<a href="{{ route('view/user', $asset->assigned_to) }}">
{{{ $asset->assigneduser->fullName() }}}
</a>
@else
@if ($asset->assetstatus)
{{{ $asset->assetstatus->name }}}
@endif
@endif
@endif
</td>
@else
<td>
@if ($asset->assigneduser)
<a href="{{ route('view/user', $asset->assigned_to) }}">
{{{ $asset->assigneduser->fullName() }}}
</a>
@endif
</td>
<td>
@if ($asset->assigneduser && $asset->assetloc) <a href="{{ route('update/location', $asset->assetloc->id) }}">{{{ $asset->assetloc->name }}}</a>
@else
@if ($asset->assetstatus) {{{ $asset->assetstatus->name }}}
@endif



<td>
@if ($asset->assigneduser && $asset->assetloc)
<a href="{{ route('update/location', $asset->assetloc->id) }}">{{{ $asset->assetloc->name }}}</a>
@elseif ($asset->defaultLoc)
<a href="{{ route('update/location', $asset->defaultLoc->id) }}">{{{ $asset->defaultLoc->name }}}</a>

@endif
</td>

@endif
</td>

<td>
@if ($asset->model->eol) {{{ $asset->eol_date() }}}
@if ($asset->model->eol)
{{{ $asset->eol_date() }}}
@endif
</td>

Expand All @@ -131,6 +139,7 @@
@endforeach
</tbody>
</table>
</div>
@else
<div class="col-md-9">
<div class="alert alert-info alert-block">
Expand All @@ -140,6 +149,7 @@
</div>

</div>

@endif


Expand Down
24 changes: 15 additions & 9 deletions app/views/backend/layouts/default.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<html lang="en">
<head>

<!-- Basic Page Needs
================================================== -->
<meta charset="utf-8" />
Expand Down Expand Up @@ -41,10 +41,15 @@
<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-profile.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/compiled/form-showcase.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/lib/jquery.dataTables.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="//cdn.datatables.net/responsive/1.0.2/css/dataTables.responsive.css" type="text/css" media="screen" />



<!-- global header javascripts -->
<script src="//code.jquery.com/jquery-latest.js"></script>
<script src="{{ asset('assets/js/jquery.dataTables.js') }}"></script>
<script src="//cdn.datatables.net/1.10.3/js/jquery.dataTables.min.js"></script>
<script src="//cdn.datatables.net/responsive/1.0.2/js/dataTables.responsive.js"></script>

<script>
window.snipeit = {
settings: {
Expand All @@ -70,14 +75,14 @@
}
@show
</style>


</head>

<body>

<!-- navbar -->


Expand Down Expand Up @@ -206,7 +211,7 @@
<i class="icon-cog"></i> @lang('general.settings')
</a>
</li>

</ul>
</li>
@endif
Expand Down Expand Up @@ -248,9 +253,9 @@
<a href="{{ URL::to('admin/licenses') }}" >
<i class="icon-certificate"></i>
<span>@lang('general.licenses')</span>

</a>

</li>
<li{{ (Request::is('admin/users*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
<a href="{{ URL::to('admin/users') }}">
Expand Down Expand Up @@ -338,7 +343,7 @@

<div class="muted credit" style="position:absolute;margin-top:1px;left:80px;margin-right:100px;"><a target="_blank" href="http://snipeitapp.com">Snipe IT</a> is a free open source
project by <a target="_blank" href="http://twitter.com/snipeyhead">@snipeyhead</a>.</div>
<div class="muted credit" style="position:absolute;margin-top:1px;right:80px;margin-left:100px;"><a target="_blank" href="https://github.com/snipe/snipe-it">Fork it</a> | <a target="_blank" href="http://docs.snipeitapp.com/">Documentation</a> |
<div class="muted credit" style="position:absolute;margin-top:1px;right:80px;margin-left:100px;"><a target="_blank" href="https://github.com/snipe/snipe-it">Fork it</a> | <a target="_blank" href="http://docs.snipeitapp.com/">Documentation</a> |
<a target="_blank" href="https://github.com/snipe/snipe-it/issues?state=open">Report a Bug</a> &nbsp; &nbsp; (alpha-0.4.3)</p>
</div>
</div>
Expand Down Expand Up @@ -373,5 +378,6 @@
<script src="{{ asset('assets/js/snipeit.js') }}"></script>



</body>
</html>
4 changes: 2 additions & 2 deletions app/views/backend/licenses/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>

<div class="row form-wrapper">

<div class="table-responsive">
<table id="example">
<thead>
<tr role="row">
Expand Down Expand Up @@ -112,5 +112,5 @@

</tbody>
</table>

</div>
@stop
7 changes: 4 additions & 3 deletions app/views/backend/reports/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
<h3>@lang('general.depreciation_report')</h3>
</div>

<div class="row table">
<div class="col-md-12">
<div class="row">

<div class="table-responsive">
<table id="example">
<thead>
<tr role="row">
Expand Down Expand Up @@ -88,7 +89,7 @@
@endforeach
</tbody>
</table>
</div>

</div>

@stop
3 changes: 2 additions & 1 deletion app/views/backend/users/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

@if ($users->getTotal() > 0)
<div class="row-fluid table users-list">
<div class="table-responsive">
<table id="example">
<thead>
<tr role="row">
Expand Down Expand Up @@ -92,7 +93,7 @@
</tbody>
</table>
</div>

</div>
<!-- {{
Datatable::table()
->addColumn(Lang::get('name'))
Expand Down
Loading

0 comments on commit bf1e075

Please sign in to comment.