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

Merge pull request #108 from desmondmorris/disable-sortable-actions

Browse Source 
Removes sorting from actions column.  Fixes #56
This commit is contained in:
snipe
2013-12-01 18:04:22 -08:00
parent 1f2b3f8505 c11510fdca
commit d19721d17a
11 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/backend/categories/index.blade.php
+2 -2
View File
@@ -24,7 +24,7 @@ Asset Categories ::
<thead>
<tr role="row">
<th class="col-md-7">@lang('admin/categories/table.title')</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@@ -57,4 +57,4 @@ Asset Categories ::
</div>
</div>
</div>
@stop
@stop
app/views/backend/depreciations/index.blade.php
+2 -2
View File
@@ -25,7 +25,7 @@ Asset Depreciations ::
<tr role="row">
<th class="col-md-4">@lang('admin/depreciations/table.title')</th>
<th class="col-md-2">@lang('admin/depreciations/table.term')</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
@@ -57,4 +57,4 @@ Asset Depreciations ::
</div>
</div>
</div>
@stop
@stop
app/views/backend/groups/index.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@ Group Management ::
<th class="col-md-6">@lang('admin/groups/table.name')</th>
<th class="col-md-1">@lang('admin/groups/table.users')</th>
<th class="col-md-2">@lang('admin/groups/table.created_at')</th>
<th class="col-md-3">@lang('table.actions')</th>
<th class="col-md-3 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/hardware/index.blade.php
+1 -1
View File
@@ -65,7 +65,7 @@ Assets ::
@endif
<th class="col-md-1">@lang('admin/hardware/table.change')</th>
<th class="col-md-2" bSortable="false">@lang('table.actions')</th>
<th class="col-md-2 actions" bSortable="false">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/layouts/default.blade.php
+2 -1
View File
@@ -294,7 +294,8 @@
$('#example').dataTable({
"sPaginationType": "full_numbers",
"iDisplayLength": {{ Setting::getSettings()->per_page }},
"aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]]
"aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]],
"aoColumnDefs": [{ 'bSortable': false, 'aTargets': [ 'actions' ] }]
});
});
app/views/backend/licenses/index.blade.php
+1 -1
View File
@@ -24,7 +24,7 @@ Licenses ::
<th class="col-md-3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
<th class="col-md-3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
<th class="col-md-3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
<th class="col-md-2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
<th class="col-md-2 actions" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/locations/index.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@ Locations ::
<th class="col-md-2">@lang('admin/locations/table.city'),
@lang('admin/locations/table.state')
@lang('admin/locations/table.country')</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/manufacturers/index.blade.php
+1 -1
View File
@@ -25,7 +25,7 @@ Asset Manufacturers ::
<thead>
<tr role="row">
<th class="col-md-7">@lang('admin/manufacturers/table.title')</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/models/index.blade.php
+1 -1
View File
@@ -25,7 +25,7 @@ Asset Models ::
<th class="col-md-1">@lang('admin/models/table.numassets')</th>
<th class="col-md-2">Depreciation</th>
<th class="col-md-2">Category</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/statuslabels/index.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@ Status Labels
<thead>
<tr role="row">
<th class="col-md-4">@lang('admin/statuslabels/table.name')</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>
app/views/backend/users/index.blade.php
+1 -1
View File
@@ -41,7 +41,7 @@ User Management ::
<th class="col-md-1">Assets</th>
<th class="col-md-1">Licenses</th>
<th class="col-md-1">@lang('admin/users/table.activated')</th>
<th class="col-md-2">@lang('table.actions')</th>
<th class="col-md-2 actions">@lang('table.actions')</th>
</tr>
</thead>
<tbody>