Merge pull request #834 from hammerlab/fix-project-notes

Fix project notes
hammerlab · Sep 11, 2015 · 4a2dd7a · 4a2dd7a
2 parents a4d5b34 + 445b9ab
commit 4a2dd7a
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 2 deletions.
diff --git a/cycledash/static/js/runs/components/RunsPage.js b/cycledash/static/js/runs/components/RunsPage.js
@@ -188,11 +188,15 @@ var ProjectTable = React.createClass({
                          selectedRunId={this.state.selectedRunId}
                          createClickRunHandler={this.createClickRunHandler} />;
     }
+    var notes;
+    if (this.props.notes) {
+      notes = <p className='notes'>{this.props.notes}</p>;
+    }
     return (
       <div className='project'>
         <div className='project-header'>
           <h2 title={this.props.project_id}>{this.props.name === 'null' ? 'No Project' : this.props.name}</h2>
-          <p className='notes'>{this.props.notes}</p>
+          {notes}
         </div>
         <div className='project-stats'>
           <div className='project-table-nav'>

diff --git a/cycledash/static/scss/runs.scss b/cycledash/static/scss/runs.scss
@@ -85,7 +85,7 @@ div.project-header h2 {
   margin: 0;
 }
 div.project-header .notes {
-  margin: 0;
+  margin: 0.25rem 0 0 0;
 }
 .project-stats .add button {
   margin-left: 1em;

diff --git a/tests/pdifftests/images/examine_bad-query.png b/tests/pdifftests/images/examine_bad-query.png
diff --git a/tests/pdifftests/images/examine_base.png b/tests/pdifftests/images/examine_base.png
diff --git a/tests/pdifftests/images/examine_comments-edit.png b/tests/pdifftests/images/examine_comments-edit.png
diff --git a/tests/pdifftests/images/examine_comments-view.png b/tests/pdifftests/images/examine_comments-view.png
diff --git a/tests/pdifftests/images/examine_filter.png b/tests/pdifftests/images/examine_filter.png
diff --git a/tests/pdifftests/images/examine_sorted.png b/tests/pdifftests/images/examine_sorted.png
diff --git a/tests/pdifftests/images/examine_tooltip.png b/tests/pdifftests/images/examine_tooltip.png
diff --git a/tests/pdifftests/images/examine_validation.png b/tests/pdifftests/images/examine_validation.png
diff --git a/tests/pdifftests/images/runs_add-bam.png b/tests/pdifftests/images/runs_add-bam.png
diff --git a/tests/pdifftests/images/runs_add-run.png b/tests/pdifftests/images/runs_add-run.png
diff --git a/tests/pdifftests/images/runs_bams.png b/tests/pdifftests/images/runs_bams.png
diff --git a/tests/pdifftests/images/runs_info.png b/tests/pdifftests/images/runs_info.png
diff --git a/tests/pdifftests/images/runs_new-project.png b/tests/pdifftests/images/runs_new-project.png
diff --git a/tests/pdifftests/images/runs_page.png b/tests/pdifftests/images/runs_page.png
diff --git a/tests/pdifftests/images/website_about-page.png b/tests/pdifftests/images/website_about-page.png
diff --git a/tests/pdifftests/images/website_login.png b/tests/pdifftests/images/website_login.png
diff --git a/tests/pdifftests/images/website_register.png b/tests/pdifftests/images/website_register.png