put integration errors together, modify lfm.css

Author: streamtw

public/css/lfm.css

@@ -1,23 +1,15 @@
 #wrapper {
-  height: 100vh;
+  min-height: 100vh;
   margin-bottom: 0px;
 }
 
-#tree {
-  height: calc(100vh - 70px);
-}
-
 #main {
   border-left: 1px solid silver;
-}
-
-#content {
-  height: calc(100vh - 140px);
-  overflow: scroll;
+  min-height: calc(100vh - 70px);
 }
 
 .img-row {
-  margin-bottom: 10px;
+  margin-bottom: 20px;
 }
 
 .clickable {
@@ -39,6 +31,7 @@
 .thumbnail {
   max-width: 210px;
   max-height: 210px;
+  margin-bottom: 10px;
 }
 
 .square {

src/controllers/LfmController.php

@@ -29,11 +29,20 @@ public function show()
             $default_folder_type = 'user';
         }
 
+        $type_key = $this->currentLfmType();
+        $mine_config = 'lfm.valid_' . $type_key . '_mimetypes';
+        $config_error = null;
+
+        if (!is_array(config($mine_config))) {
+            $config_error = 'Config : ' . $mine_config . ' is not set correctly';
+        }
+
         return view('laravel-filemanager::index')->with([
             'working_dir'  => $this->rootFolder($default_folder_type),
             'file_type'    => $this->currentLfmType(true),
             'startup_view' => config('lfm.' . $this->currentLfmType() . '_startup_view'),
-            'no_extension' => ! extension_loaded('gd') && ! extension_loaded('imagick')
+            'no_extension' => ! extension_loaded('gd') && ! extension_loaded('imagick'),
+            'config_error' => $config_error
         ]);
     }
 }

src/controllers/UploadController.php

@@ -104,10 +104,6 @@ private function uploadValidator($file)
         $valid_mimetypes = config($mine_config, $this->{"default_{$type_key}_types"});
         $max_size = config('lfm.max_' . $type_key . '_size', $this->{"default_max_{$type_key}_size"});
 
-        if (!is_array($valid_mimetypes)) {
-            return 'Config : ' . $mine_config . ' is not set correctly';
-        }
-
         if (false === in_array($mimetype, $valid_mimetypes)) {
             return $this->error('mime') . $mimetype;
         }

src/views/index.blade.php

@@ -22,9 +22,6 @@
           </div>
 
           <div class="col-xs-10" id="main">
-            @if($no_extension)
-            <div class="alert alert-warning"><i class="fa fa-exclamation-circle"></i> {{ Lang::get('laravel-filemanager::lfm.message-extension_not_found') }}</div>
-            @endif
             <nav class="navbar navbar-default">
               <div class="navbar-header">
                 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -67,16 +64,25 @@
               </div>
             </nav>
 
-            @if (isset($errors) && $errors->any())
-              <div class="alert alert-danger" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <ul>
-                  @foreach($errors->all() as $error)
-                  <li>{{ $error }}</li>
-                  @endforeach
-                </ul>
-              </div>
-            @endif
+            <div id="alerts">
+              @if($no_extension)
+              <div class="alert alert-warning"><i class="fa fa-exclamation-circle"></i> {{ Lang::get('laravel-filemanager::lfm.message-extension_not_found') }}</div>
+              @endif
+              @if(!is_null($config_error))
+              <div class="alert alert-danger"><i class="fa fa-times-circle"></i> {{ $config_error }}</div>
+              @endif
+
+              @if (isset($errors) && $errors->any())
+                <div class="alert alert-danger" role="alert">
+                  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                  <ul>
+                    @foreach($errors->all() as $error)
+                    <li>{{ $error }}</li>
+                    @endforeach
+                  </ul>
+                </div>
+              @endif
+            </div>
 
             <div id="content"></div>
           </div>