Merge pull request #30 from azorpax/master

 Fix undefined variable $userActivities when datatables is true

Author: jeremykenedy

README.md

@@ -118,7 +118,6 @@ LARAVEL_LOGGER_DATABASE_CONNECTION=mysql
 LARAVEL_LOGGER_DATABASE_TABLE=laravel_logger_activity
 LARAVEL_LOGGER_ROLES_ENABLED=true
 LARAVEL_LOGGER_ROLES_MIDDLWARE=role:admin
-LARAVEL_LOGGER_ROLE_MODEL=jeremykenedy\LaravelRoles\Models\Role
 LARAVEL_LOGGER_MIDDLEWARE_ENABLED=true
 LARAVEL_LOGGER_MIDDLEWARE_EXCEPT=
 LARAVEL_LOGGER_USER_MODEL=App\User
@@ -129,18 +128,21 @@ LARAVEL_LOGGER_DASHBOARD_MENU_ENABLED=true
 LARAVEL_LOGGER_DASHBOARD_DRILLABLE=true
 LARAVEL_LOGGER_LOG_RECORD_FAILURES_TO_FILE=true
 LARAVEL_LOGGER_FLASH_MESSAGE_BLADE_ENABLED=true
+LARAVEL_LOGGER_LAYOUT=layouts.app
+LARAVEL_LOGGER_BOOTSTRAP_VERSION=4
+LARAVEL_LOGGER_BLADE_PLACEMENT=stack                    #option: yield or stack
+LARAVEL_LOGGER_BLADE_PLACEMENT_CSS=css-header           #placement name
+LARAVEL_LOGGER_BLADE_PLACEMENT_JS=scripts-footer        #placement name
 LARAVEL_LOGGER_JQUERY_CDN_ENABLED=true
 LARAVEL_LOGGER_JQUERY_CDN_URL=https://code.jquery.com/jquery-2.2.4.min.js
-LARAVEL_LOGGER_BLADE_PLACEMENT=yield                    #option: yield or stack
-LARAVEL_LOGGER_BLADE_PLACEMENT_CSS=template_linked_css  #placement name
-LARAVEL_LOGGER_BLADE_PLACEMENT_JS=footer_scripts        #placement name
+LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED=true
+LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
 LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_ENABLED=true
 LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js
+LARAVEL_LOGGER_POPPER_JS_CDN_ENABLED=true
+LARAVEL_LOGGER_POPPER_JS_CDN_URL=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js
 LARAVEL_LOGGER_FONT_AWESOME_CDN_ENABLED=true
 LARAVEL_LOGGER_FONT_AWESOME_CDN_URL=https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css
-LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED=true
-LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
-LARAVEL_LOGGER_POPPER_JS_CDN_URL=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js
 ```
 
 ### Usage
@@ -262,8 +264,8 @@ To use the trait:
     │       │   └── confirm-modal.blade.php
     │       ├── partials
     │       │   ├── form-status.blade.php
-    │       │   ├── styles.blade.php
-    |       |   └── scripts.blade.php
+    │       │   ├── scripts.blade.php
+    |       |   └── styles.blade.php
     │       └── scripts
     │           ├── clickable-row.blade.php
     │           ├── confirm-modal.blade.php

src/config/laravel-logger.php

@@ -26,8 +26,8 @@
     |--------------------------------------------------------------------------
     */
 
-    'loggerMiddlewareEnabled' => env('LARAVEL_LOGGER_MIDDLEWARE_ENABLED', true),
-    'loggerMiddlewareExcept'  => array_filter(explode(',', trim(env('LARAVEL_LOGGER_MIDDLEWARE_EXCEPT')))),
+    'loggerMiddlewareEnabled'   => env('LARAVEL_LOGGER_MIDDLEWARE_ENABLED', true),
+    'loggerMiddlewareExcept'    => array_filter(explode(',', trim(env('LARAVEL_LOGGER_MIDDLEWARE_EXCEPT')))),
 
     /*
     |--------------------------------------------------------------------------
@@ -101,15 +101,15 @@
     */
 
     // The parent Blade file
-    'loggerBladeExtended'       => 'layouts.app',
+    'loggerBladeExtended'       => env('LARAVEL_LOGGER_LAYOUT', 'layouts.app'),
 
     // Switch Between bootstrap 3 `panel` and bootstrap 4 `card` classes
-    'bootstapVersion'           => '4',
+    'bootstapVersion'           =>  env('LARAVEL_LOGGER_BOOTSTRAP_VERSION', '4'),
 
     // Additional Card classes for styling -
     // See: https://getbootstrap.com/docs/4.0/components/card/#background-and-color
     // Example classes: 'text-white bg-primary mb-3'
-    'bootstrapCardClasses'          => '',
+    'bootstrapCardClasses'      => '',
 
     // Blade Extension Placement
     'bladePlacement'            => env('LARAVEL_LOGGER_BLADE_PLACEMENT', 'yield'),
@@ -138,4 +138,4 @@
     'enableFontAwesomeCDN'      => env('LARAVEL_LOGGER_FONT_AWESOME_CDN_ENABLED', true),
     'fontAwesomeCDN'            => env('LARAVEL_LOGGER_FONT_AWESOME_CDN_URL', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'),
 
-];
+];

src/resources/views/logger/activity-log-cleared.blade.php

@@ -20,7 +20,7 @@
     @push(config('LaravelLogger.bladePlacementJs'))
 @endif
 
-        @include('LaravelLogger::partials.scripts')
+        @include('LaravelLogger::partials.scripts', ['activities' => $activities])
         @include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
         @include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmRestore'])
 

src/resources/views/logger/activity-log-item.blade.php

@@ -20,7 +20,7 @@
     @push(config('LaravelLogger.bladePlacementJs'))
 @endif
 
-        @include('LaravelLogger::partials.scripts')
+        @include('LaravelLogger::partials.scripts', ['activities' => $userActivities])
 
 @if(config('LaravelLogger.bladePlacement') == 'yield')
     @endsection
@@ -381,4 +381,4 @@
         </div>
     </div>
   </div>
-@endsection
+@endsection

src/resources/views/logger/activity-log.blade.php

@@ -20,7 +20,7 @@
     @push(config('LaravelLogger.bladePlacementJs'))
 @endif
 
-    @include('LaravelLogger::partials.scripts')
+    @include('LaravelLogger::partials.scripts', ['activities' => $activities])
     @include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
 
     @if(config('LaravelLogger.enableDrillDown'))

src/resources/views/partials/scripts.blade.php

@@ -12,7 +12,7 @@
 @endif
 
 @if(config('LaravelLogger.loggerDatatables'))
-    @if (count($userActivities) > 10)
+    @if (count($activities) > 10)
         @include('LaravelLogger::scripts.datatables')
     @endif
 @endif

src/resources/views/partials/styles.blade.php

@@ -20,7 +20,7 @@
         border: none;
     }
 
-    .activity-table > table > tbody td.ellipsis {
+    table > tbody td.ellipsis {
         max-width: 350px;
         white-space: nowrap;
         overflow: hidden;