Add icons to buttons in regular view

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

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/client/galaxy/scripts/mvc/upload/default/default-view.js b/client/galaxy/scripts/mvc/upload/default/default-view.js
@@ -63,9 +63,9 @@ return Backbone.View.extend({
         this.setElement(this._template());
 
         // create button section
-        this.btnLocal    = new Ui.Button({ title: 'Choose local file',   onclick: function() { self.uploadbox.select(); } });
-        this.btnFtp      = new Ui.Button({ title: 'Choose FTP file',     onclick: function() { self._eventFtp(); } });
-        this.btnCreate   = new Ui.Button({ title: 'Paste/Fetch data',    onclick: function() { self._eventCreate(); } });
+        this.btnLocal    = new Ui.Button({ title: 'Choose local file',   onclick: function() { self.uploadbox.select(); }, icon: 'fa fa-laptop' });
+        this.btnFtp      = new Ui.Button({ title: 'Choose FTP file',     onclick: function() { self._eventFtp(); }, icon: 'fa fa-code-fork' });
+        this.btnCreate   = new Ui.Button({ title: 'Paste/Fetch data',    onclick: function() { self._eventCreate(); }, icon: 'fa fa-pencil' });
         this.btnStart    = new Ui.Button({ title: 'Start',               onclick: function() { self._eventStart(); } });
         this.btnStop     = new Ui.Button({ title: 'Pause',               onclick: function() { self._eventStop(); } });
         this.btnReset    = new Ui.Button({ title: 'Reset',               onclick: function() { self._eventReset(); } });

diff --git a/client/galaxy/scripts/mvc/upload/upload-ftp.js b/client/galaxy/scripts/mvc/upload/upload-ftp.js
@@ -59,6 +59,7 @@ return Backbone.View.extend({
             // add event handler to select/unselect all
             if (this.collection) {
                 var self = this;
+                this.$('._has_collection').show();
                 this.$select_all = $('#upload-selectall');
                 this.$select_all.addClass(this.options.class_add);
                 this.$select_all.on('click', function() {
@@ -72,14 +73,10 @@ return Backbone.View.extend({
                     }
                 });
                 this._refresh();
-                this.$('._has_collection').show();
             }
         } else {
-            // add info
             this.$el.find('#upload-ftp-content').html($(this._templateInfo()));
         }
-
-        // hide spinner
         this.$el.find('#upload-ftp-wait').hide();
     },
 

diff --git a/static/maps/mvc/upload/default/default-view.js.map b/static/maps/mvc/upload/default/default-view.js.map