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

Nicer responsive display

Browse Source
This commit is contained in:
snipe
2015-10-20 22:11:06 -07:00
parent 644cfee086
commit 03e36736c2
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/UsersController.php
+2 -2
View File
@@ -902,9 +902,9 @@ class UsersController extends AdminController {
$actions .= '</nobr>';
$rows[] = array(
'checkbox' =>'<div class="text-center"><input type="checkbox" name="edit_user['.$user->id.']" class="one_required"></div>',
'checkbox' =>'<div class="text-center hidden-xs hidden-sm"><input type="checkbox" name="edit_user['.$user->id.']" class="one_required"></div>',
'name' => '<a title="'.$user->fullName().'" href="../admin/users/'.$user->id.'/view">'.$user->fullName().'</a>',
'email' => ($user->email!='') ? '<a href="mailto:'.$user->email.'"><i class="fa fa-envelope"></i></a>' : '',
'email' => ($user->email!='') ? '<span class="hidden-md hidden-lg" style="display: inline !important;"><a href="mailto:'.$user->email.'">'.$user->email.'</a></span> <span class="hidden-xs hidden-sm"><a href="mailto:'.$user->email.'"><i class="fa fa-envelope"></i></a></span>' : '',
'username' => $user->username,
'location' => ($user->location_id!='') ? $user->userloc->name : '',
'manager' => ($user->manager_id!='') ? '<a title="' . $user->manager->fullName() . '" href="users/' . $user->manager->id . '/view">' . $user->manager->fullName() . '</a>' : '',
app/views/backend/users/index.blade.php
+21 -6
View File
@@ -48,16 +48,31 @@
data-cookie-id-table="userTable">
<thead>
<tr>
<th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
<th data-class="hidden-xs hidden-sm" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;" style="hidden-xs hidden-sm"></div></th>
<th data-sortable="true" data-field="name">{{ Lang::get('admin/users/table.name') }}</th>
<th data-sortable="true" data-field="email"><i class="fa fa-envelope fa-lg"></i></th>
<th data-sortable="true" data-field="email">
<span class="hidden-md hidden-lg">Email</span>
<span class="hidden-xs"><i class="fa fa-envelope fa-lg"></i></span>
</th>
<th data-sortable="true" data-field="username">{{ Lang::get('admin/users/table.username') }}</th>
<th data-sortable="false" data-field="manager">{{ Lang::get('admin/users/table.manager') }}</th>
<th data-sortable="false" data-field="location">{{ Lang::get('admin/users/table.location') }}</th>
<th data-sortable="false" data-field="assets"><i class="fa fa-barcode fa-lg"></i></th>
<th data-sortable="false" data-field="licenses"><i class="fa fa-certificate fa-lg"></i></th>
<th data-sortable="false" data-field="accessories"><i class="fa fa-keyboard-o fa-lg"></i></th>
<th data-sortable="false" data-field="consumables"><i class="fa fa-tint fa-lg"></i></th>
<th data-sortable="false" data-field="assets">
<span class="hidden-md hidden-lg">Assets</span>
<span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span>
</th>
<th data-sortable="false" data-field="licenses">
<span class="hidden-md hidden-lg">Licenses</span>
<span class="hidden-xs"><i class="fa fa-certificate fa-lg"></i></span>
</th>
<th data-sortable="false" data-field="accessories">
<span class="hidden-md hidden-lg">Accessories</span>
<span class="hidden-xs"><i class="fa fa-keyboard-o fa-lg"></i></span>
</th>
<th data-sortable="false" data-field="consumables">
<span class="hidden-md hidden-lg">Consumables</span>
<span class="hidden-xs"><i class="fa fa-tint fa-lg"></i></span>
</th>
<th data-sortable="false" data-field="groups">{{ Lang::get('general.groups') }}</th>
<th data-sortable="true" data-field="notes">{{ Lang::get('general.notes') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ Lang::get('table.actions') }}</th>