improve ui

luyadev · Mar 21, 2024 · 4df6b23 · 4df6b23
1 parent 944ee7a
commit 4df6b23
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/resources/dist/main.css b/src/resources/dist/main.css
diff --git a/src/resources/dist/main.js b/src/resources/dist/main.js
diff --git a/src/resources/js/directives.js b/src/resources/js/directives.js
@@ -1456,11 +1456,13 @@ zaa.directive("storageFileManager", function () {
 
                 $scope.cancelFolderEdit = function (folder, oldName) {
                     folder.name = oldName;
+                    $scope.isFolderMoveModalHidden = true
                 };
 
                 $scope.moveFolderTo = function(targetFolder, toFolderId) {
                     $http.post('admin/api-admin-storage/folder-update?folderId=' + targetFolder.id, { parent_id: toFolderId }).then(function (transport) {
                         AdminToastService.success(i18nParam('js_ngrest_toggler_success', {field: targetFolder.name}));
+                        $scope.isFolderMoveModalHidden = true
                         $scope.foldersDataReload()
                     });
                 }

diff --git a/src/resources/scss/components/_folders.scss b/src/resources/scss/components/_folders.scss
@@ -24,13 +24,9 @@ $icon-line-height: $icon-font-size + 5px;
 
 .folders-folder {
     display: block;
-    padding: 2px 75px 2px 20px;
+    padding: 2px 100px 2px 20px;
     position: relative;
 
-    &--undeletable {
-        padding-right: 40px;
-    }
-
     &-main {
         padding: 0;
     }

diff --git a/src/views/layouts/_angulardirectives.php b/src/views/layouts/_angulardirectives.php
@@ -186,7 +186,7 @@
 </script>
 
 <script type="text/ng-template" id="reverseFolders">
-    <div class="folders-folder" ng-init="editFolderLabel = false; oldFolder = folder.name" ng-class="{'folders-folder--edit': editFolderLabel && !showFoldersToMove, 'folders-folder--move-to': showFoldersToMove, 'folders-folder--undeletable': folder.subfolder}" tooltip tooltip-expression="folderCountMessage(folder)" tooltip-position="right">
+    <div class="folders-folder" ng-init="editFolderLabel = false; oldFolder = folder.name" ng-class="{'folders-folder--edit': editFolderLabel && !showFoldersToMove, 'folders-folder--move-to': showFoldersToMove}" tooltip tooltip-expression="folderCountMessage(folder)" tooltip-position="right">
         <div class="folder-left">
             <button class="folder-toggler" ng-click="toggleFolderItem(folder)" ng-if="folder.subfolder == true">
                 <i class="material-icons" ng-if="folder.toggle_open">keyboard_arrow_down</i>