Style fixes, adjustments for ftp popover table

galaxyproject · Aug 11, 2015 · a8def9a · a8def9a
1 parent c7ad460
commit a8def9a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/client/galaxy/scripts/mvc/upload/composite/composite-row.js b/client/galaxy/scripts/mvc/upload/composite/composite-row.js
@@ -96,7 +96,7 @@ return Backbone.View.extend({
 
         // add ftp file viewer
         this.ftp = new Popover.View({
-            title       : 'FTP files',
+            title       : 'Choose FTP file:',
             container   : this.$('#source').find('.ui-button-menu'),
             placement   : 'right'
         });

diff --git a/client/galaxy/scripts/mvc/upload/upload-ftp.js b/client/galaxy/scripts/mvc/upload/upload-ftp.js
@@ -112,7 +112,7 @@ return Backbone.View.extend({
             $it.on('click', function() {
                 var model_index = self._find(ftp_file);
                 $icon.removeClass();
-                if (!model_index || !self.options.remove) {
+                if (!model_index) {
                     self.options.onadd(ftp_file);
                     $icon.addClass(self.options.class_remove);
                 } else {
@@ -123,7 +123,7 @@ return Backbone.View.extend({
             });
         } else {
             // click triggers only change
-            $it.on('dblclick', function() {
+            $it.on('click', function() {
                 self.options.onchange(ftp_file);
             });
         }
@@ -164,9 +164,9 @@ return Backbone.View.extend({
     _templateRow: function(options) {
         return  '<tr class="upload-ftp-row">' +
                     '<td class="_has_collection" style="display: none;"><div class="icon"/></td>' +
-                    '<td class="label"><p>' + options.path + '</p></td>' +
-                    '<td class="nonlabel">' + Utils.bytesToString(options.size) + '</td>' +
-                    '<td class="nonlabel">' + options.ctime + '</td>' +
+                    '<td class="ftp-name">' + options.path + '</td>' +
+                    '<td class="ftp-size">' + Utils.bytesToString(options.size) + '</td>' +
+                    '<td class="ftp-time">' + options.ctime + '</td>' +
                 '</tr>';
     },
 

diff --git a/client/galaxy/style/less/upload.less b/client/galaxy/style/less/upload.less
@@ -190,24 +190,29 @@
     }
     .upload-ftp-row {
         cursor: pointer;
-        .label {
+        .ftp-name {
             position: relative;
-            top: 3px;
             width: 240px;
-            p {
-                width: inherit;
-                word-wrap: break-word;
-            }
+            word-wrap: break-word;
         }
-        .nonlabel {
-            position: relative;
-            top: 3px;
+        .ftp-size {
+            width: 60px;
+            white-space: nowrap;
+        }
+        .ftp-time {
+            width: 165px;
             white-space: nowrap;
         }
     }
     .upload-ftp-row:hover {
         &:extend(.grid .current);
     }
+    th {
+        padding: 5px !important;
+    }
+    td {
+        padding: 8px 5px !important;
+    }
 }
 
 .upload-settings {

diff --git a/static/maps/mvc/upload/composite/composite-row.js.map b/static/maps/mvc/upload/composite/composite-row.js.map
diff --git a/static/maps/mvc/upload/upload-ftp.js.map b/static/maps/mvc/upload/upload-ftp.js.map