Adding import functionality

client/galaxy/scripts/mvc/workflow/workflow.js

@@ -227,28 +227,54 @@ define( [ 'mvc/tool/tool-form-composite', 'mvc/form/form-view', 'mvc/ui/ui-misc'
         /** Open page to import workflow */
         render: function() {
             var self = this;
-            $.getJSON( Galaxy.root + 'workflow/get_import_workflow', function( options ) {
-                var form = new Form({
-                    title  : options.title,
-                    icon   : options.icon,
-                    inputs : options.inputs,
-                    operations: {
-                        'submit': new Ui.ButtonIcon({
-                            tooltip  : 'Import workflow',
-                            title    : 'Import',
-                            icon     : 'fa-upload',
-                            onclick  : function() { self.import_workflow( form, options ) }
-                        })
-                    }
-                });
-                self.$el.empty().append( form.$el );
+            $.getJSON( Galaxy.root + 'workflow/upload_import_workflow', function( options ) {
+                self.$el.empty().append( self._mainTemplate( self, options ) );
             });
         },
 
-        /** Import a workflow */
-        import_workflow: function( form, options ) {
-            // TODO: Import workflow
-        }
+        /** Template for the import workflow page */
+        _mainTemplate: function( self, options ) {
+            return "<div class='toolForm'>" + 
+                        "<div class='toolFormTitle'>Import Galaxy workflow</div>" +
+                        "<div class='toolFormBody'>" +
+                            "<form name='import_workflow' id='import_workflow' action='"+ Galaxy.root + 'workflow/upload_import_workflow' +"' enctype='multipart/form-data' method='POST'>" +
+                            "<div class='form-row'>" +
+                                "<label>Galaxy workflow URL:</label>" + 
+                                "<input type='text' name='url' class='input-url' value='"+ options.url +"' size='40'>" +
+                                "<div class='toolParamHelp' style='clear: both;'>" +
+                                    "If the workflow is accessible via a URL, enter the URL above and click <b>Import</b>." +
+                                "</div>" +
+                                "<div style='clear: both'></div>" +
+                            "</div>" +
+                            "<div class='form-row'>" +
+                                "<label>Galaxy workflow file:</label>" +
+                            "<div class='form-row-input'>" +
+                                "<input type='file' name='file_data' class='input-file'/>" +
+                            "</div>" +
+                            "<div class='toolParamHelp' style='clear: both;'>" +
+                                "If the workflow is in a file on your computer, choose it and then click <b>Import</b>." +
+                            "</div>" +
+                            "<div style='clear: both'></div>" +
+                            "</div>" +
+                            "<div class='form-row'>" +
+                                "<input type='submit' class='primary-button wf-import' name='import_button' value='Import'>" +
+                            "</div>" +
+                            "</form>" +
+                           "<hr/>" +
+                           "<div class='form-row'>" +
+                               "<label>Import a Galaxy workflow from myExperiment:</label>" +
+                               "<div class='form-row-input'>" +
+                                   "<a href='" + options.myexperiment_target_url + "'> Visit myExperiment</a>" +
+                               "</div>" +
+                               "<div class='toolParamHelp' style='clear: both;'>" +
+                                   "Click the link above to visit myExperiment and browse for Galaxy workflows." +
+                               "</div>" +
+                               "<div style='clear: both'></div>" +
+                           "</div>" +
+                       "</div>" +
+                   "</div>";
+        },
+
     });
 
     return {

lib/galaxy/webapps/galaxy/controllers/workflow.py

@@ -740,31 +740,7 @@ def export_to_file( self, trans, id ):
         return stored_dict
 
     @web.expose
-    def get_import_workflow( self, trans, **kwd ):
-        """
-        Import/upload workflow page elements
-        """
-        inputs = list()
-        input_url = { 'id': 'url_input',
-            'name': 'url',
-            'type': 'text',
-            'label': 'Galaxy workflow URL:',
-            'value': '',
-            'help': 'If the workflow is accessible via a URL, enter the URL above and click <b>Import</b>.' }
-        inputs.append(input_url)
-
-        input_file = { 'id': 'file_input',
-            'name': 'file_data',
-            'type': 'file',
-            'label': 'Galaxy workflow file:',
-            'help': 'If the workflow is in a file on your computer, choose it and then click <b>Import</b>.' }
-
-        inputs.append(input_file)
-        form = { 'title': 'Import Galaxy workflow', 'icon': 'fa fa-upload', 'inputs': inputs }
-        return json.dumps(form);
-
-    @web.expose
-    def save_import_workflow( self, trans, cntrller='workflow', **kwd ):
+    def upload_import_workflow( self, trans, cntrller='workflow', **kwd ):
         """
         Import a workflow by reading an url, uploading a file, opening and reading the contents
         of a local file, or receiving the textual representation of a workflow via http.
@@ -927,12 +903,12 @@ def save_import_workflow( self, trans, cntrller='workflow', **kwd ):
                     return self.list( trans )
         if cntrller == 'api':
             return status, message
-        return trans.fill_template( "workflow/import.mako",
-                                    url=url,
-                                    message=message,
-                                    status=status,
-                                    use_panels=True,
-                                    myexperiment_target_url=myexperiment_target_url )
+        return json.dumps({
+            'url' : url,
+            'message' : message,
+            'status' : status,
+            'myexperiment_target_url' : myexperiment_target_url
+        })
 
     @web.expose
     def build_from_current_history( self, trans, job_ids=None, dataset_ids=None, dataset_collection_ids=None, workflow_name=None, dataset_names=None, dataset_collection_names=None ):