FIX #11291 TIME 0:20 fix css new folder + var lang + set init countRes

src/frontend/app/folder/document-list/folder-document-list.component.html

@@ -61,7 +61,7 @@
                 <div style="height:90%;overflow:auto;position:absolute;width:100%;">
                     <table #tableBasketListSort="matSort" cdkDropList id="folder-list"
                         [cdkDropListConnectedTo]="listTodrag()" [cdkDropListData]="data"
-                        [cdkDropListDisabled]="dragInit" mat-table [dataSource]="data" matSort matSortActive="res_id"
+                        [cdkDropListDisabled]="dragInit || appService.getViewMode()" mat-table [dataSource]="data" matSort matSortActive="res_id"
                         matSortDisableClear matSortDirection="asc" style="width:100%;">
 
                         <ng-container matColumnDef="res_id">

src/frontend/app/folder/folder-tree.component.html

@@ -10,7 +10,7 @@
                 (mouseleave)="hideAction(node)" (click)="selectFolder(node)">
                 <span style="width: 90%;overflow: hidden;text-overflow: ellipsis;">
                     <span class="treeLabel" [title]="node.label" [class.drag]="node.drag">
-                        {{node.label}} <i class="fa fa-users private" *ngIf="node.public" title="{{lang.sharedFolder}}"></i>
+                        <i class="fa fa-users private" *ngIf="node.public" title="{{lang.sharedFolder}}"></i> {{node.label}} 
                     </span>
                 </span>
                 <button mat-icon-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation();showAction(node);checkRights(node);"
@@ -27,9 +27,9 @@
                 </mat-menu>
             </a>
         </mat-tree-node>
-        <mat-tree-node *matTreeNodeDef="let node; when: hasNoContent" matTreeNodePadding matTreeNodePaddingIndent="45px">
+        <mat-tree-node *matTreeNodeDef="let node; when: hasNoContent" matTreeNodePadding matTreeNodePaddingIndent="0px">
             <form>
-                <mat-form-field floatLabel="never" style="width: 100%;">
+                <mat-form-field floatLabel="never" style="width: 100%;padding-left: 10px;padding-right: 10px;">
                     <input matInput id="itemValue" #itemValue placeholder="{{lang.addFolder}}...">
                     <button type="submit" matSuffix mat-icon-button (click)="saveNode(node, itemValue.value)"
                         [disabled]="itemValue.value === ''">
@@ -50,7 +50,7 @@
                 (mouseenter)="showAction(node)" (click)="selectFolder(node)">
                 <span style="width: 90%;overflow: hidden;text-overflow: ellipsis;">
                     <span class="treeLabel" [title]="node.label" [class.drag]="node.drag">
-                        {{node.label}} <i class="fa fa-users private" *ngIf="node.public" title="{{lang.sharedFolder}}"></i>
+                        <i class="fa fa-users private" *ngIf="node.public" title="{{lang.sharedFolder}}"></i> {{node.label}}
                     </span>
                 </span>
                 <button mat-icon-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation();checkRights(node);" [disabled]="!node.showAction" style="position: absolute;right:0px;">
@@ -77,7 +77,7 @@
     <mat-list-item role="listitem">
         <form>
             <mat-form-field floatLabel="never" style="width: 100%;">
-                <input matInput id="itemValue" #itemValue placeholder="{{lang.addFolder}} racine...">
+                <input matInput id="itemValue" #itemValue placeholder="{{lang.addRootFolder}}">
                 <button type="submit" matSuffix mat-icon-button (click)="createRoot(itemValue.value);createRootNode = !createRootNode"
                     [disabled]="itemValue.value === ''">
                     <mat-icon class="fa fa-check" color="accent" [title]="lang.add"></mat-icon>

src/frontend/app/folder/folder-tree.component.scss

@@ -51,13 +51,13 @@
     color: rgb(102, 102, 102);
     font-size: 12px;
     font-weight: bold;
-    height: 30px;
+    height: 40px;
     width: 90%;
 }
 
 .mat-tree-node {
     min-height: 0px;
-    height: 30px;
+    height: 40px;
 
     ::ng-deep.mat-list-item-content {
         padding-left: 0px;
@@ -80,12 +80,15 @@ form {
 }
 
 .more {
+    width: 100%;
+
     ::ng-deep.mat-list-item-content {
         justify-content: center;
     }
 }
 
 .private {
+    margin-left: 5px;
     color: $secondary;
 }
 

src/frontend/app/folder/folder-tree.component.ts

@@ -255,6 +255,7 @@ export class FolderTreeComponent implements OnInit {
                 const nestedNode = this.flatNodeMap.get(node);
                 nestedNode.label = value;
                 nestedNode.id = data.folder;
+                nestedNode.countResources = 0;
                 this.dataChange.next(this.data);
                 this.treeControl.collapseAll();
                 this.openTree(nestedNode.id);

src/frontend/app/list/basket-list.component.html

@@ -63,7 +63,7 @@
                     </div>
                     <div style="height:90%;overflow:auto;position:absolute;width:100%;">
                         <table cdkDropList id="document-list" [cdkDropListConnectedTo]="listTodrag()" [cdkDropListData]="data" #tableBasketListSort="matSort" mat-table [dataSource]="data" matSort
-                            matSortActive="res_id" matSortDisableClear matSortDirection="asc" style="width:100%;" [cdkDropListDisabled]="dragInit">
+                            matSortActive="res_id" matSortDisableClear matSortDirection="asc" style="width:100%;" [cdkDropListDisabled]="dragInit || appService.getViewMode()">
 
                             <ng-container matColumnDef="res_id">
                                 <td mat-cell *matCellDef="let row"

src/frontend/lang/lang-en.ts

@@ -1063,4 +1063,5 @@ export const LANG_EN = {
     "more" : "More",
     "less" : "Less",
     "actionsAlt": "Actions",
+    "addRootFolder": "Add root folder",
 };

src/frontend/lang/lang-fr.ts

@@ -1100,4 +1100,5 @@ export const LANG_FR = {
     "more" : "Plus",
     "less" : "Moins",
     "actionsAlt": "Actions",
+    "addRootFolder": "Nouveau dossier racine",
 };

src/frontend/lang/lang-nl.ts

@@ -1089,4 +1089,5 @@ export const LANG_NL = {
     "more" : "More", //_TO_TRANSLATE
     "less" : "Less", //_TO_TRANSLATE
     "actionsAlt": "Actions", //_TO_TRANSLATE
+    "addRootFolder": "Add root folder", //_TO_TRANSLATE
 };