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-12-01 21:44:06 -05:00
parent 1af24827bd 775ec10114
commit edf71a7692
13 changed files with 24 additions and 25 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>
composer.json
+5 -6
View File
@@ -9,9 +9,8 @@
"chumper/datatable": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "*"
},
"phpunit/phpunit": "*"
},
"autoload": {
"classmap": [
"app/commands",
@@ -27,11 +26,11 @@
"php artisan clear-compiled"
],
"post-update-cmd": [
"php artisan optimize"
"php artisan debugbar:publish"
"php artisan optimize",
"php artisan debugbar:publish"
],
"post-install-cmd": [
"php artisan debugbar:publish"
"php artisan debugbar:publish"
],
"post-create-project-cmd": [
"php artisan key:generate"
public/assets/css/lib/jquery.dataTables.css
+5 -6
View File
@@ -13,8 +13,7 @@ table.dataTable thead th {
padding: 10px 18px 15px 18px;
border-top: 1px solid #dee3ea;
font-weight: 600;
cursor: pointer;
*cursor: hand;
}
table.dataTable tfoot th {
@@ -228,13 +227,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('../../img/datatables/sort_both.png') no-repeat center right; cursor: pointer; *cursor: hand; }
.sorting_asc { background: url('../../img/datatables/sort_asc.png') no-repeat center right; cursor: pointer; *cursor: hand;}
.sorting_desc { background: url('../../img/datatables/sort_desc.png') no-repeat center right; cursor: pointer; *cursor: hand;}
.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;