diff --git a/agavedancer/public/assets/XYPlot-0.0.2.json b/agavedancer/public/assets/XYPlot-0.0.2.json index bf67398..b0ae0b0 100644 --- a/agavedancer/public/assets/XYPlot-0.0.2.json +++ b/agavedancer/public/assets/XYPlot-0.0.2.json @@ -66,7 +66,7 @@ "isPublic": false, "label": "XYPlot", "lastModified": "2015-10-03T23:57:05.000-05:00", - "longDescription": "XYPlot is function written in shell script that generates 2D plot via gnuplot", + "longDescription": "XYPlot is a function written in shell script that generates 2D plot via gnuplot", "modules": [], "name": "XYPlot", "ontology": [], diff --git a/agavedancer/public/javascripts/components/appsInfo.js b/agavedancer/public/javascripts/components/appsInfo.js index 56b752e..0197729 100644 --- a/agavedancer/public/javascripts/components/appsInfo.js +++ b/agavedancer/public/javascripts/components/appsInfo.js @@ -41,7 +41,7 @@ const AppsInfo=React.createClass({ ); } - header='Tool information (' + appDetail.name + ' ' + appDetail.version + ')'; + header='App information (' + appDetail.name + ' ' + appDetail.version + ')'; app_info=(
{appDetail.name}: {appDetail.longDescription} (Source)
); diff --git a/agavedancer/public/javascripts/components/filesInfo.js b/agavedancer/public/javascripts/components/filesInfo.js index eb840d1..744f4ab 100644 --- a/agavedancer/public/javascripts/components/filesInfo.js +++ b/agavedancer/public/javascripts/components/filesInfo.js @@ -12,7 +12,7 @@ const FilesInfo=React.createClass({ let jobsStore=this.state.jobsStore; let fileDetail=jobsStore.inputs[this.props.fileId]; let markup=
; - let tbody + let tbody; let keys=['line_name', 'organism_name', 'organism_scientific_name', 'organism_taxon_id']; if (fileDetail.system !== undefined) { tbody=keys.map(function (key) { diff --git a/agavedancer/public/javascripts/components/workflowDiagram.js b/agavedancer/public/javascripts/components/workflowDiagram.js index 38ce00c..35aaf50 100644 --- a/agavedancer/public/javascripts/components/workflowDiagram.js +++ b/agavedancer/public/javascripts/components/workflowDiagram.js @@ -78,7 +78,7 @@ const WorkflowDiagram=React.createClass({ truncate: function(s) { if (s.length > 10) - return (s.substr(0,8)).concat("..."); + return (s.substr(0,9)).concat(" ..."); else return s; }, @@ -123,9 +123,10 @@ const WorkflowDiagram=React.createClass({ diagramDefStmts.push(prevAppNodeId + '-->' + value); diagramDefStmts.push(value + '-->' + appNodeId); } else if (ic) { - value=that.truncate(_.last(ic.split('/'))); + value=_.last(ic.split('/')); + let value2=that.truncate(value); let input_name=value.replace(/\W/g, '_').toLowerCase(); - diagramDefStmts.push(input_name + '(' + value + '); class ' + input_name + ' fileNode'); + diagramDefStmts.push(input_name + '(' + value2 + '); class ' + input_name + ' fileNode'); diagramDefStmts.push('click ' + input_name + ' clickInputFileNode'); diagramDefStmts.push(input_name + '-->' + appNodeId); JobsActions.setWorkflowInputs(input_name, ic); @@ -186,15 +187,21 @@ const WorkflowDiagram=React.createClass({ info= } } - if (jobCount < 3) { - nodeClass="twoNodes"; - } else if (jobCount < 4) { - nodeClass="threeNodes"; - } else if (jobCount < 5) { - nodeClass="fourNodes"; - } else if (jobCount < 6) { - nodeClass="fiveNodes"; + + switch (jobCount) { + case 2: + nodeClass="twoNodes"; + break; + case 3: + nodeClass="threeNodes"; + break; + case 4: + nodeClass="fourNodes"; + break; + case 5: + nodeClass="fiveNodes"; } + return ( diff --git a/agavedancer/public/styles/button-groups.less b/agavedancer/public/styles/button-groups.less index d6f6f72..6785314 100644 --- a/agavedancer/public/styles/button-groups.less +++ b/agavedancer/public/styles/button-groups.less @@ -14,3 +14,8 @@ margin-left: -1px; float: left; } + +.btn-group>.btn:first-child { + margin-left: 0; + margin-bottom: 2px; +}