Merge pull request #10388 from snipe/features/switch_to_dusk

WIP - Fixing unit tests, switching to dusk

resources/lang/en/general.php

@@ -135,7 +135,7 @@
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading',
+    'loading'				=> 'Loading... please wait....',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',

resources/views/auth/login.blade.php

@@ -64,7 +64,7 @@
 
                             @if ($snipeSettings->saml_enabled)
                             <div class="row ">
-                                <div class="col-md-12 text-right">
+                                <div class="text-right col-md-12">
                                     <a href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
                                 </div>
                             </div>
@@ -73,7 +73,7 @@
                         <div class="box-footer">
                             <button class="btn btn-lg btn-primary btn-block">{{ trans('auth/general.login')  }}</button>
                         </div>
-                        <div class="col-md-12 col-sm-12 col-xs-12 text-right" style="padding-top: 10px;">
+                        <div class="text-right col-md-12 col-sm-12 col-xs-12" style="padding-top: 10px;">
                             @if ($snipeSettings->custom_forgot_pass_url)
                                 <a href="{{ $snipeSettings->custom_forgot_pass_url  }}" rel="noopener">{{ trans('auth/general.forgot_password')  }}</a>
                             @else

resources/views/partials/bootstrap-table.blade.php

@@ -64,7 +64,7 @@
                 return newParams;
             },
             formatLoadingMessage: function () {
-                return '<h2><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';
+                return '<h2><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> {{ trans('general.loading') }} </h4>';
             },
             icons: {
                 advancedSearchIcon: 'fas fa-search-plus',