From e2bac62e36e7999281b42824a132ee157b6e4b78 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Sat, 14 Oct 2017 17:44:22 +1030
Subject: [PATCH] Fix #4205 (#4213)

* Fixing various UI items

* Revert css change

* Dashboard icon CSS up 4px
---
 public/css/dist/all.css                    | Bin 253683 -> 253683 bytes
 resources/views/hardware/checkin.blade.php |   2 +-
 resources/views/hardware/history.blade.php |   2 +-
 resources/views/layouts/default.blade.php  |  11 +++++------
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 8f93662babd5c8bdb208116069d4c1aef5514f31..ec1e27d267085374daf3b352acc1003fbe5adc5b 100644
GIT binary patch
delta 25
hcmeyom;du#{)QIDEleJ6j3(`#ZcN)f-I!O+004_h37`M~

delta 25
hcmeyom;du#{)QIDEleJ6j0WwVZcN)f-I!O+004^~37h}`

diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index bf365b958c..cb89ee82b8 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -93,7 +93,7 @@
               </div>
             <div class="box-footer">
               <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
-              <button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
+              <button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkin') }}</button>
             </div>
           </form>
         </div> <!--/.col-md-12-->
diff --git a/resources/views/hardware/history.blade.php b/resources/views/hardware/history.blade.php
index ded1cdc3ca..ebab4fe7e6 100644
--- a/resources/views/hardware/history.blade.php
+++ b/resources/views/hardware/history.blade.php
@@ -61,7 +61,7 @@
                         @endif
 
                         <p>
-                           Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &lt; Settings.
+                           Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &gt; General Settings.
                         </p>
 
                         <p>Fields included in the CSV must match the headers: <strong>Date, Tag, Name</strong>. Any additional fields will be ignored. </p>
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 5f9b415a7b..7d327edb5b 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -379,18 +379,17 @@
 
 
                   <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
-                    <a href="{{ url('hardware?status=Deployed') }}"><i class="fa fa-circle-o text-blue"></i>All  @lang('general.deployed')
+                    <a href="{{ url('hardware?status=Deployed') }}"><i class="fa fa-circle-o text-blue"></i>All @lang('general.deployed')
                     </a>
                   </li>
                   <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
                     <a href="{{ url('hardware?status=RTD') }}">
-                        <i class="fa fa-circle-o text-green"></i>
-                        All  @lang('general.ready_to_deploy')</a>
+                        <i class="fa fa-circle-o text-green"></i>All @lang('general.ready_to_deploy')</a>
                   </li>
-                  <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="fa fa-circle-o text-orange"></i>All  @lang('general.pending')</a></li>
+                  <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="fa fa-circle-o text-orange"></i>All @lang('general.pending')</a></li>
                   <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ url('hardware?status=Undeployable') }}"><i class="fa fa-times text-red"></i>All @lang('general.undeployable')</a></li>
-                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fa fa-times text-red"></i>All  @lang('admin/hardware/general.archived')</a></li>
-                    <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Requestable') }}"><i class="fa fa-check text-blue"></i> @lang('admin/hardware/general.requestable')</a></li>
+                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fa fa-times text-red"></i>All @lang('admin/hardware/general.archived')</a></li>
+                    <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Requestable') }}"><i class="fa fa-check text-blue"></i>@lang('admin/hardware/general.requestable')</a></li>
 
                   <li class="divider">&nbsp;</li>
                     @can('checkout', \App\Models\Asset::class)