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

Use moar_scripts to limit unnecessary loading

Browse Source
This commit is contained in:
snipe
2015-10-20 18:51:21 -07:00
parent 9264e7bdc4
commit 58911cd10e
7 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0-227',
'hash_version' => 'v2.0-227-gb492ac4',
'app_version' => 'v2.0-229',
'hash_version' => 'v2.0-229-g78143cb',
);
app/controllers/admin/AssetsController.php
+13 -13
View File
@@ -1176,20 +1176,20 @@ class AssetsController extends AdminController
}
$rows[] = array(
'checkbox' =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
'name' => '<a title="'.$asset->name.'" href="hardware/'.$asset->id.'/view">'.$asset->name.'</a>',
'asset_tag' => '<a title="'.$asset->asset_tag.'" href="hardware/'.$asset->id.'/view">'.$asset->asset_tag.'</a>',
'serial' => $asset->serial,
'model' => ($asset->model) ? $asset->model->name : 'No model',
'status' => ($asset->assigneduser) ? link_to('../admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : (($asset->assetstatus) ? $asset->assetstatus->name : ''),
'location' => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/edit', $asset->assigneduser->userloc->name) : (($asset->defaultLoc!='') ? link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/edit', $asset->defaultLoc->name) : ''),
'category' => ($asset->model->category) ? $asset->model->category->name : 'No category',
'eol' => ($asset->eol_date()) ? $asset->eol_date() : '',
'notes' => $asset->notes,
'order_number' => ($asset->order_number!='') ? '<a href="../hardware/?order_number='.$asset->order_number.'">'.$asset->order_number.'</a>' : ' ',
'checkbox' =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
'name' => '<a title="'.$asset->name.'" href="hardware/'.$asset->id.'/view">'.$asset->name.'</a>',
'asset_tag' => '<a title="'.$asset->asset_tag.'" href="hardware/'.$asset->id.'/view">'.$asset->asset_tag.'</a>',
'serial' => $asset->serial,
'model' => ($asset->model) ? $asset->model->name : 'No model',
'status' => ($asset->assigneduser) ? link_to('../admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : (($asset->assetstatus) ? $asset->assetstatus->name : ''),
'location' => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/edit', $asset->assigneduser->userloc->name) : (($asset->defaultLoc!='') ? link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/edit', $asset->defaultLoc->name) : ''),
'category' => ($asset->model->category) ? $asset->model->category->name : 'No category',
'eol' => ($asset->eol_date()) ? $asset->eol_date() : '',
'notes' => $asset->notes,
'order_number' => ($asset->order_number!='') ? '<a href="../hardware/?order_number='.$asset->order_number.'">'.$asset->order_number.'</a>' : 'none',
'checkout_date' => (($asset->assigned_to!='')&&($asset->assetlog->first())) ? $asset->assetlog->first()->created_at->format('Y-m-d') : '',
'change' => ($inout) ? $inout : '',
'actions' => ($actions) ? $actions : ''
'change' => ($inout) ? $inout : '',
'actions' => ($actions) ? $actions : ''
);
}
app/views/backend/accessories/index.blade.php
+14
View File
@@ -42,6 +42,18 @@
</div>
</div>
@section('moar_scripts')
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
<script src="{{ asset('assets/js/libs/FileSaver/FileSaver.min.js') }}"></script>
<script src="{{ asset('assets/js/libs/html2canvas/html2canvas.min.js') }}"></script>
<script src="{{ asset('assets/js/libs/jsPDF/jspdf.min.js') }}"></script>
<script src="{{ asset('assets/js/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/tableExport.js?v=1"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/jquery.base64.js?v=1"></script>
<script type="text/javascript">
$('#table').bootstrapTable({
classes: 'table table-hover table-no-bordered',
@@ -70,5 +82,7 @@
},
});
</script>
@stop
@stop
app/views/backend/consumables/index.blade.php
+9
View File
@@ -41,6 +41,14 @@
</div>
</div>
@section('moar_scripts')
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js?v=1') }}"></script>
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js?v=1') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/tableExport.js?v=1') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/jquery.base64.js?v=1') }}"></script>
<script type="text/javascript">
$('#table').bootstrapTable({
classes: 'table table-hover table-no-bordered',
@@ -69,5 +77,6 @@
},
});
</script>
@stop
@stop
app/views/backend/hardware/index.blade.php
+14 -2
View File
@@ -85,7 +85,16 @@
</table>
{{ Form::close() }}
</div>
@section('moar_scripts')
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js?v=1') }}"></script>
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js?v=1') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/tableExport.js?v=1') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/jquery.base64.js?v=1') }}"></script>
<script type="text/javascript">
$('#table').bootstrapTable({
classes: 'table table-responsive table-no-bordered',
@@ -97,8 +106,11 @@
pagination: true,
sidePagination: 'server',
sortable: true,
cookie: true,
mobileResponsive: true,
columnsHidden: ['name'],
showExport: true,
exportLabel: 'Export',
showColumns: true,
maintainSelected: true,
paginationFirstText: "@lang('general.first')",
@@ -134,6 +146,6 @@
});
});
</script>
</div>
@stop
@stop
app/views/backend/layouts/default.blade.php
+8 -12
View File
@@ -5,7 +5,7 @@
<!-- Basic Page Needs
================================================== -->
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta charset="utf-8" />
<title>
@section('title')
@@ -43,16 +43,6 @@
<!-- global header javascripts -->
<script src="{{ asset('assets/js/jquery-latest.js') }}"></script>
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
<script src="{{ asset('assets/js/libs/FileSaver/FileSaver.min.js') }}"></script>
<script src="{{ asset('assets/js/libs/html2canvas/html2canvas.min.js') }}"></script>
<script src="{{ asset('assets/js/libs/jsPDF/jspdf.min.js') }}"></script>
<script src="{{ asset('assets/js/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js') }}"></script>
<script>
window.snipeit = {
settings: {
@@ -464,12 +454,18 @@
</div>
<!-- scripts -->
<script src="{{ asset('assets/js/bootstrap.min.js') }}"></script>
<script src="{{ asset('assets/js/jquery-latest.js') }}"></script>
<script src="{{ asset('assets/js/bootstrap.min.js') }}"></script>
<script src="{{ asset('assets/js/jquery.knob.js') }}"></script>
<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/theme.js') }}"></script>
<script src="{{ asset('assets/js/snipeit.js') }}"></script>
@section('moar_scripts')
@show
</body>
</html>
app/views/backend/licenses/index.blade.php
+10
View File
@@ -31,6 +31,14 @@
</table>
</div>
@section('moar_scripts')
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js?v=1') }}"></script>
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js?v=1') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/tableExport.js?v=1') }}"></script>
<script src="//rawgit.com/kayalshri/tableExport.jquery.plugin/master/jquery.base64.js?v=1') }}"></script>
<script type="text/javascript">
$('#table').bootstrapTable({
classes: 'table table-hover table-no-bordered',
@@ -60,3 +68,5 @@
});
</script>
@stop
@stop