Fix the Task Detail Button

Tendrl-bug-id: #645
Tendrl · Oct 6, 2017 · 76867aa · 76867aa
1 parent 1cdc907
commit 76867aa
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/modules/clusters/cluster-list/cluster-list.scss b/src/modules/clusters/cluster-list/cluster-list.scss
@@ -62,6 +62,7 @@
                 }
                 .btn-default {
                     width: 124px;
+                    overflow: hidden;
                 }
             }
             .list-view-pf-main-info {

diff --git a/src/modules/clusters/import-cluster/import-cluster.html b/src/modules/clusters/import-cluster/import-cluster.html
@@ -12,7 +12,7 @@ <h3 class="col-sm-12">Import <span class="bold-text">{{vm.cluster.name}}</span>
             </div>
             <div class="row">
                 <div class="col-sm-12 volume-profile">
-                    <input type="checkbox" name="volumeProfile" ng-model="vm.enableProfiling"> Enable Volume profiling. <i class="pficon pficon-info" uib-tooltip-template="'../modules/clusters/import-cluster/import-cluster-tooltip.html'" tooltip-placement="bottom-left"></i>
+                    <input type="checkbox" name="volumeProfile" ng-model="vm.enableProfiling"/><label for="volumeProfile"> Enable Volume profiling  </label><i class="pficon pficon-info" uib-tooltip-template="'../modules/clusters/import-cluster/import-cluster-tooltip.html'" tooltip-placement="bottom-left"></i>
                 </div>
             </div>
             <h2>Discovered Host(s)</h2>

diff --git a/src/modules/clusters/import-cluster/import-cluster.scss b/src/modules/clusters/import-cluster/import-cluster.scss
@@ -25,8 +25,13 @@
         margin-top: 10px;
         font-size: 14px;
 
-        input[type=checkbox] {
-            vertical-align: sub;
+        input[type=checkbox],i {
+            padding: 2px;
+        }
+
+        label {
+            padding: 2px;
+            font-weight: normal;
         }
 
         .pficon-info {
@@ -38,4 +43,4 @@
             max-width: 270px;
         }
     }
-}
+}
diff --git a/src/modules/tasks/task-list/tasks.html b/src/modules/tasks/task-list/tasks.html
@@ -86,9 +86,9 @@ <h1>No Tasks Detected.</h1>
                     <div class="bold-text ">Submitted</div>
                     <div class="pull-left ">{{task.created_at| date: 'dd MMM yyyy HH:mm:ss'}}</div>
                 </div>
-                <div class="ft-column bold-text ">{{taskCntrl.getStatusText(task.status)}}</div>
+                <div class="ft-column bold-text status-col ">{{taskCntrl.getStatusText(task.status)}}</div>
                 <div class="ft-column ft-actions">
-                    <button class="btn btn-default" ng-click="taskCntrl.goToTaskDetail(task.job_id)">Task Details</button>
+                    <button class="btn btn-default task-btn" ng-click="taskCntrl.goToTaskDetail(task.job_id)">Task Details</button>
                 </div>
         </div>
     </div>

diff --git a/src/modules/tasks/task-list/tasks.scss b/src/modules/tasks/task-list/tasks.scss
@@ -36,6 +36,12 @@
                 align-items: left;
                 flex: 1;
             }
+            .status-col {
+                flex-grow: 0.5;
+            }
+            .task-btn {
+                width: auto;
+            }
         }
     }
     .filter-section {