Merge pull request #16 from tsawler/Development

Improve folder display

Author: tsawler

src/controllers/FolderController.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class FolderController
@@ -57,12 +58,13 @@ public function getFolders()
     public function getAddfolder()
     {
         $folder_name = Str::slug(Input::get('name'));
+        $working_dir = Input::get('dir');
 
-        $path = base_path($this->file_location);
+        $path = base_path($this->file_location . $working_dir);
 
-        if (!File::exists($path . $folder_name))
+        if (!File::exists($path . "/" . $folder_name))
         {
-            File::makeDirectory($path . $folder_name, $mode = 0777, true, true);
+            File::makeDirectory($path . "/" . $folder_name, $mode = 0777, true, true);
             return "OK";
         } else
         {

src/views/index.blade.php

@@ -22,6 +22,7 @@
                         <div class="col-md-2 col-lg-2 col-sm-2 col-xs-2 left-nav fill" id="lfm-leftcol">
                             <div id="tree1">
                             </div>
+                            <a href="#!" id="add-folder" class="add-folder btn btn-default btn-xs"><i class="fa fa-plus"></i> New Folder</a>
                         </div>
                         <div class="col-md-10 col-lg-10 col-sm-10 col-xs-10 right-nav" id="right-nav">
                             <nav class="navbar navbar-default">
@@ -41,10 +42,6 @@
                                                 <a href="#!" id="upload" data-toggle="modal" data-target="#uploadModal"><i
                                                             class="fa fa-upload"></i> Upload</a>
                                             </li>
-                                            <li>
-                                                <a href="#!" class="add-folder" id="add-folder"><i
-                                                            class="fa fa-plus"></i> New Folder</a>
-                                            </li>
                                             <li>
                                                 <a href="#!" class="thumbnail-display" id="thumbnail-display"><i
                                                             class="fa fa-picture-o"></i> Thumbnails</a>
@@ -153,6 +150,7 @@ class="fa fa-list"></i> List</a>
             $("#tree1").html(data);
         });
         loadImages();
+        refreshFolders();
     });
 
     $("#upload-btn").click(function () {
@@ -225,6 +223,7 @@ function loadImages() {
                 $("#content").html(data);
                 $("#nav-buttons").removeClass("hidden");
                 $(".dropdown-toggle").dropdown();
+                refreshFolders();
             });
         }
     @else
@@ -242,6 +241,7 @@ function loadImages() {
                 $("#content").html(data);
                 $("#nav-buttons").removeClass("hidden");
                 $(".dropdown-toggle").dropdown();
+                refreshFolders();
             });
         }
     @endif
@@ -270,7 +270,6 @@ function trash(x) {
         });
     }
 
-
     function loadFiles() {
         $.ajax({
             type: "GET",
@@ -286,6 +285,14 @@ function loadFiles() {
         });
     }
 
+    function refreshFolders(){
+        var wd = $("#working_dir").val();
+        if (wd != "/") {
+            $('#' + wd + '-folder').removeClass('fa-folder');
+            $('#' + wd + '-folder').addClass('fa-folder-open');
+        }
+    }
+
     function cropImage(x) {
         $.ajax({
             type: "GET",
@@ -305,7 +312,7 @@ function notImp() {
         bootbox.alert('Not yet implemented!');;
     }
 
-    $(".add-folder").click(function () {
+    $("#add-folder").click(function () {
         bootbox.prompt("Folder name:", function (result) {
             if (result === null) {
             } else {
@@ -314,13 +321,15 @@ function notImp() {
                     dataType: "text",
                     url: "/laravel-filemanager/newfolder",
                     data: {
-                        name: result
+                        name: result,
+                        dir: $("#working_dir").val()
                     },
                     cache: false
                 }).done(function (data) {
                     if (data == "OK") {
                         loadFiles();
                         loadImages();
+                        refreshFolders();
                     } else {
                         notify(data);
                     }

src/views/tree.blade.php

@@ -7,7 +7,7 @@
     @foreach($dirs as $key => $dir)
         <li>
             <a class="pointer" id="folder_{{ $key }}" data-id="{{ $dir }}" onclick="clickFolder('folder_{{ $key }}', 0)">
-                <i class="fa fa-folder folder-item" data-id="{{ $dir }}"></i> {!! $dir !!}
+                <i class="fa fa-folder folder-item" data-id="{{ $dir }}" id="{{ $dir }}-folder"></i> {!! $dir !!}
             </a>
         </li>
     @endforeach