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

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse Source
This commit is contained in:
snipe
2015-03-16 14:49:32 -07:00
parent ae2d2ca2be 61f1b145b7
commit 3ad17d64b0
3 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/ReportsController.php
+8 -13
View File
@@ -45,13 +45,13 @@ class ReportsController extends AdminController
Lang::get('general.model_no'),
Lang::get('general.name'),
Lang::get('admin/hardware/table.serial'),
Lang::get('general.status'),
Lang::get('admin/hardware/table.purchase_date'),
Lang::get('admin/hardware/table.purchase_cost'),
Lang::get('admin/hardware/form.order'),
Lang::get('admin/hardware/form.supplier'),
Lang::get('admin/hardware/table.checkoutto'),
Lang::get('admin/hardware/table.location'),
Lang::get('general.status')
Lang::get('admin/hardware/table.location')
);
$header = array_map('trim', $header);
$rows[] = implode($header, ',');
@@ -69,6 +69,11 @@ class ReportsController extends AdminController
$row[] = '"'.$asset->model->modelno.'"';
$row[] = $asset->name;
$row[] = $asset->serial;
if ($asset->assetstatus) {
$row[] = $asset->assetstatus->name;
} else {
$row[] = '';
}
$row[] = $asset->purchase_date;
$row[] = '"'.number_format($asset->purchase_cost).'"';
if ($asset->order_number) {
@@ -107,16 +112,6 @@ class ReportsController extends AdminController
$row[] = ''; // Empty string if location is not set
}
if (($asset->status_id == '0') && ($asset->assigned_to == '0')) {
$row[] = Lang::get('general.ready_to_deploy');
} elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) {
$row[] = Lang::get('general.pending');
} elseif ($asset->assetstatus) {
$row[] = $asset->assetstatus->name;
} else {
$row[] = '';
}
$rows[] = implode($row, ',');
}
@@ -456,4 +451,4 @@ class ReportsController extends AdminController
return Redirect::to("reports/custom")->with('error', Lang::get('admin/reports/message.error'));
}
}
}
}
app/views/backend/reports/asset.blade.php
+1 -12
View File
@@ -41,7 +41,6 @@
<th class="col-sm-1">@lang('admin/hardware/form.supplier')</th>
<th class="col-sm-1">@lang('admin/hardware/table.checkoutto')</th>
<th class="col-sm-1">@lang('admin/hardware/table.location')</th>
<th class="col-sm-1">@lang('general.status')</th>
</tr>
</thead>
<tbody>
@@ -103,16 +102,6 @@
{{{ $asset->defaultLoc->name }}}
@endif
</td>
<td>
@if (($asset->status_id == '0') && ($asset->assigned_to == '0'))
@lang('general.ready_to_deploy')
@elseif (($asset->status_id == '') && ($asset->assigned_to == '0'))
@lang('general.pending')
@elseif ($asset->assetstatus)
{{{ $asset->assetstatus->name }}}
@endif
</td>
</tr>
@endforeach
</tbody>
@@ -120,4 +109,4 @@
</div>
@stop
@stop
app/views/frontend/auth/signin.blade.php
+16 -26
View File
@@ -20,14 +20,7 @@ Account Sign in ::
<form method="post" action="{{ route('signin') }}" class="form-horizontal">
<!-- CSRF Token -->
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<div class="form-group">
<label class="col-md-6 control-label"></label>
<div class="col-md-5">
<br><a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
</div>
</div>
<!-- Email -->
<div class="form-group{{ $errors->first('email', ' error') }}">
<label for="email" class="col-md-3 control-label">Email</label>
@@ -45,27 +38,24 @@ Account Sign in ::
{{ $errors->first('password', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
</div>
<div class="checkbox col-md-offset-3">
<label>
{{ Form::checkbox('remember-me', '1', Input::old('remember-me')) }}
Remember me
</label>
</div>
<!-- Form actions -->
<div class="form-group">
<label class="col-md-6 control-label"></label>
<div class="col-md-5">
<a class="btn btn-link" href="{{ route('home') }}">Cancel</a>
<!-- Form Actions -->
<div class="form-group checkbox">
<div class="checkbox col-md-offset-3 col-md-3 col-sm-12">
<label>
{{ Form::checkbox('remember-me', '1', Input::old('remember-me')) }}
Remember me
</label>
</div>
<div class="col-md-6 col-sm-12">
<div class="col-md-1">
<button type="submit" class="btn btn-success"><i class="fa fa-ok icon-white"></i> Sign in</button>
</div>
<div class="col-md-4 col-sm-12">
<a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
</div>
</div>
</div>
</form>
</div>
@stop