From 35f3350ddf234cf978d6f6e6a061e4ec2b306c8a Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 13 Mar 2015 12:56:09 +1030
Subject: [PATCH 1/4] Remove duplicate status

---
 app/views/backend/reports/asset.blade.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/views/backend/reports/asset.blade.php b/app/views/backend/reports/asset.blade.php
index a4db5045ba..b520363484 100644
--- a/app/views/backend/reports/asset.blade.php
+++ b/app/views/backend/reports/asset.blade.php
@@ -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
\ No newline at end of file
+@stop

From f33844d4aff0d362769de649fcf4fc62adb91828 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 13 Mar 2015 13:01:30 +1030
Subject: [PATCH 2/4] move status around to match view

---
 app/controllers/admin/ReportsController.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/ReportsController.php b/app/controllers/admin/ReportsController.php
index dbb20c947b..919764ff80 100644
--- a/app/controllers/admin/ReportsController.php
+++ b/app/controllers/admin/ReportsController.php
@@ -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'));
         }
     }
-}
\ No newline at end of file
+}

From fc81e404cabb734ab90b8fd69ba33e78d2c89157 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Sat, 14 Mar 2015 15:00:02 +1030
Subject: [PATCH 3/4] Fix #652 - Change UX of signin form

---
 app/views/frontend/auth/signin.blade.php | 33 +++++++++++-------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/views/frontend/auth/signin.blade.php b/app/views/frontend/auth/signin.blade.php
index 38cc0cfc20..95a95a2e27 100755
--- a/app/views/frontend/auth/signin.blade.php
+++ b/app/views/frontend/auth/signin.blade.php
@@ -45,27 +45,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

From 1d3d41b80846e4e5e368e9c126f7b9aea7563d85 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Sat, 14 Mar 2015 15:01:04 +1030
Subject: [PATCH 4/4] Remove forgot password link from above form

---
 app/views/frontend/auth/signin.blade.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/views/frontend/auth/signin.blade.php b/app/views/frontend/auth/signin.blade.php
index 95a95a2e27..35d0914d01 100755
--- a/app/views/frontend/auth/signin.blade.php
+++ b/app/views/frontend/auth/signin.blade.php
@@ -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>