Merge branch 'refs/heads/develop'

Author: snipe

app/views/backend/assets/checkout.blade.php

@@ -56,7 +56,8 @@
 			<div class="control-group {{ $errors->has('assigned_to') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Checkout to</label>
 				<div class="controls">
-					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to)) }}
+
+					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }}
 					{{ $errors->first('assigned_to', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>

app/views/backend/licenses/checkout.blade.php

@@ -55,7 +55,7 @@
 			<div class="control-group {{ $errors->has('assigned_to') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Checkout to</label>
 				<div class="controls">
-					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to')) }}
+					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to'), array('class'=>'select2', 'style'=>'min-width:350px')) }}
 					{{ $errors->first('user_id', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>

app/views/backend/models/index.blade.php

@@ -48,7 +48,7 @@
 			@endif</td>
 			<td>
 				<a href="{{ route('update/model', $model->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/model', $model->id) }}" data-content="Are you sure you wish to delete this model?" data-title="Delete {{ htmlspecialchars($model->name) }}}?" onClick="return false;">@lang('button.delete')</a>
+				<a data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/model', $model->id) }}" data-content="Are you sure you wish to delete this model?" data-title="Delete {{ htmlspecialchars($model->name) }}?" onClick="return false;">@lang('button.delete')</a>
 
 			</td>
 		</tr>

app/views/backend/users/view.blade.php

@@ -96,7 +96,7 @@
 										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a></td>
 
-										<td> <a href="{{ route('checkin/license', $asset->id) }}" class="btn-flat info">Checkin</a></td>
+										<td> <a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a></td>
 									</tr>
 									@endforeach
                                 </tbody>