This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-1818
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit cd43e93d976e0135eb26ea21d9881368d9467155
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Wed May 20 11:32:31 2020 +0300

    [DLAB-1818]: Adjust columns in bucket browser
---
 .../bucket-browser/bucket-browser.component.html   |  41 ++++----
 .../bucket-browser/bucket-browser.component.scss   | 104 ++++++++++++---------
 .../bucket-confirmation-dialog.component.html      |   2 +-
 .../webapp/src/assets/styles/_dialogs.scss         |   2 +-
 4 files changed, 84 insertions(+), 65 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
index 292620b..13dc8ef 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
@@ -211,10 +211,13 @@
       <ul class="upload-files">
         <li class="file upload-table-header" *ngIf="addedFiles.length">
           <div class="name ellipsis" >File</div>
-          <div class="upload-path ellipsis">Path</div>
-          <div class="size">Size</div>
-          <div class="state"></div>
-          <div class="remove"></div>
+          <div class="second-block">
+            <div class="upload-path ellipsis">Path</div>
+            <div class="size">Size</div>
+            <div class="state"></div>
+            <div class="remove"></div>
+          </div>
+
         </li>
         <li *ngFor="let file of addedFiles" class="file">
           <div class="name">
@@ -227,23 +230,25 @@
               {{file.name}}
             </span>
           </div>
-          <div class="upload-path">
-            <span class="ellipsis" matTooltip="{{file.path}}" 
matTooltipPosition="above" 
[matTooltipClass]="'bucket-item-tooltip'">{{file.path}}</span>
-          </div>
-          <div class="size">{{file.size | convertFileSize}} </div>
-          <div class="state">
-<!--           <button mat-raised-button (click)="uploadNewFile(file)" 
*ngIf="!file.isUploading && !file.uploaded && 
!file.errorUploading">Upload</button>-->
-           <mat-progress-bar mode="indeterminate" 
*ngIf="file.isUploading"></mat-progress-bar>
-            <span *ngIf="file.status === 'uploaded'" 
class="running">Uploaded</span>
-            <div class="progres" *ngIf="file.status === 'uploading'">
-              <span class="progress-bar-text">{{file.progress || 0}}% 
Uploading...</span>
-              <div class="bar" [ngStyle]="{width: file.progress + '%'}">
+          <div class="second-block">
+            <div class="upload-path">
+              <span class="ellipsis" matTooltip="{{file.path}}" 
matTooltipPosition="above" 
[matTooltipClass]="'bucket-item-tooltip'">{{file.path}}</span>
+            </div>
+            <div class="size">{{file.size | convertFileSize}} </div>
+            <div class="state">
+              <!--           <button mat-raised-button 
(click)="uploadNewFile(file)" *ngIf="!file.isUploading && !file.uploaded && 
!file.errorUploading">Upload</button>-->
+              <!--           <mat-progress-bar mode="indeterminate" 
*ngIf="file.isUploading"></mat-progress-bar>-->
+              <span *ngIf="file.status === 'uploaded'" 
class="running">Uploaded</span>
+              <div class="progres" *ngIf="file.status === 'uploading'">
+                <span class="progress-bar-text">{{file.progress || 0}}% 
Uploading...</span>
+                <div class="bar" [ngStyle]="{width: file.progress + '%'}">
+                </div>
               </div>
+              <span *ngIf="file.status === 'failed'" 
class="error">Failed</span>
+              <span *ngIf="file.status === 'waiting'" class="stopped">Waiting 
for uploading...</span>
             </div>
-            <span *ngIf="file.status === 'failed'" class="error">Failed</span>
-            <span *ngIf="file.status === 'waiting'" class="stopped">Waiting 
for uploading...</span>
+            <div class="remove"><i (click)="deleteAddedFile(file)" 
class="material-icons close">delete</i></div>
           </div>
-          <div class="remove"><i (click)="deleteAddedFile(file)" 
class="material-icons close">close</i></div>
         </li>
         <li id="upload-list"></li>
       </ul>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
index aee697d..a68b24b 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
@@ -294,7 +294,7 @@
       max-height: 100%;
 
       .name{
-        flex:2;
+        width: 60%;
         display: flex;
         align-items: center;
         overflow: hidden;
@@ -326,7 +326,7 @@
       }
 
       .size{
-        flex:1;
+        width: 15%;
 
         &-folder{
           padding-left: 4px;
@@ -334,7 +334,7 @@
       }
 
       .date{
-        flex:1;
+        width: 25%;
 
         .th_date{
           font-size: 13px;
@@ -579,9 +579,10 @@ input[type='file'] {
 
   }
   .upload-files{
-    padding: 5px;
+    padding: 5px 0;
     height: calc(100% - 30px);
     overflow: auto;
+    width: 100%;
     .file{
       padding: 2px;
       display: flex;
@@ -593,58 +594,71 @@ input[type='file'] {
       }
 
       .name{
-        width: 38%;
-        padding-right: 5px;
-        overflow: hidden;
+        width: 33.3%;
+        padding-left: 5px;
+        position: relative;
         display: flex;
+        span{
+          position: absolute;
+          width: calc(100% + 30px);
+        }
       }
 
-      .upload-path{
-        width: 38%;
-        padding-right: 5px;
+      .second-block{
+        width: 66.7%;
         display: flex;
-      }
+        padding: 0 14px 0 17px;
+        .upload-path{
+          width: 60%;
+          padding-left: 24px;
+          padding-right: 1%;
+          display: flex;
+        }
 
-      .size{
-        width: 7%;
-      }
-      .state{
-        width: 14%;
-        display: flex;
-        align-items: center;
-        .mat-raised-button{
-          width: 60px;
-          padding: 5px;
-          border-radius: 0;
-          font-style: normal;
-          font-weight: 600;
-          font-size: 11px;
-          font-family: "Open Sans", sans-serif;
-          color: #577289;
-          line-height: 8px;
+        .size{
+          width: 15%;
         }
-      }
-      .remove{
-        display: flex;
-        align-items: center;
-        width: 3%;
-        position: relative;
-        .close{
-          color: #577289;
-          font-size: 12px;
-          cursor: pointer;
+        .state{
+          width: 22%;
+          display: flex;
+          align-items: center;
+          .mat-raised-button{
+            width: 60px;
+            padding: 5px;
+            border-radius: 0;
+            font-style: normal;
+            font-weight: 600;
+            font-size: 11px;
+            font-family: "Open Sans", sans-serif;
+            color: #577289;
+            line-height: 8px;
+          }
+        }
+        .remove{
+          display: flex;
+          align-items: center;
+          width: 5%;
           position: absolute;
-          top: 3px;
-          right: 0;
-          height: 18px;
-          width: 14px;
-          transition: all 0.45s ease-in-out;
+          right: 7px;
+          .close{
+            color: #577289;
+            font-size: 12px;
+            cursor: pointer;
+            position: absolute;
+            top: 3px;
+            right: 0;
+            height: 18px;
+            width: 14px;
+            transition: all 0.45s ease-in-out;
 
-          &:hover{
-            color: #f1696e;
+            &:hover{
+              color: #f1696e;
+            }
           }
         }
       }
+
+
     }
   }
 }
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
index 0e33887..642e1e6 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
@@ -51,7 +51,7 @@
                      matTooltipShowDelay="1000"
                      
[matTooltipClass]="'bucket-item-tooltip'">{{object['item']}}</div>
               </div>
-              <div  class="size">{{object['children'] ? '-' : 
object['object'].size}}</div>
+              <div  class="size">{{object['children'] ? '-' : 
object['object'].size | convertFileSize}}</div>
             </mat-list-item>
 
           </div>
diff --git 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index c5b0655..7044d73 100644
--- 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -372,7 +372,7 @@ mat-dialog-container {
   border: 1px solid rgba(0,0,0,.12);
   height: 17px;
   position: relative;
-  width: 100%;
+  width: 155px;
 
   .bar{
     position: absolute;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to