Merge pull request #511 from AndersenLab/feature/content-update

Feature/content update

src/modules/site-v2/base/views/about/about.py

@@ -179,16 +179,16 @@ def contact_us():
   return render_template('about/contact-us.html', **locals())
 
 
-@about_bp.route('/collectors')
+@about_bp.route('/field-researchers')
 @cache.memoize(60*60)
-def collectors():
+def field_researchers():
   try:
     strain_listing = [s.to_json() for s in get_isotypes(known_origin=True)]
   except Exception as ex:
     logger.error(f'Failed to retrieve strain list: {ex}')
     strain_listing = None
-  return render_template('about/collectors.html', **{
-    'title'         : "Collectors",
-    'collectors'    : Profile.query_ds_roles(Profile.COLLAB),
-    'strain_listing': strain_listing,
+  return render_template('about/field-researchers.html', **{
+    'title'            : "Field Researchers",
+    'field_researchers': Profile.query_ds_roles(Profile.COLLAB),
+    'strain_listing'   : strain_listing,
   })

src/modules/site-v2/templates/_includes/cite-caendr.html

@@ -1,3 +1,7 @@
+<p>
+  Please cite the efforts of field researchers and citizen scientists who have collected 
+  wild <em>Caenorhabditis</em> strains and the CaeNDR resource description below:
+</p>
 <p>
   Timothy A Crombie, Ryan McKeown, Nicolas D Moya, Kathryn S Evans, Samuel J Widmayer,
   Vincent LaGrassa, Natalie Roman, Orzu Tursunova, Gaotian Zhang, Sophia B Gibson,

src/modules/site-v2/templates/_includes/footer.html

@@ -47,10 +47,10 @@ <h3 class="h5 text-dark">Data</h3>
           <div class="col-3 mb-5">
             <nav class="nav flex-column">
               <h3 class="h5 text-dark">About Us</h3>
-              <a class="nav-link ps-0" href="{{ url_for('about.about')      }}"> About CaeNDR </a>
-              <a class="nav-link ps-0" href="{{ url_for('about.people')     }}"> People </a>
-              <a class="nav-link ps-0" href="{{ url_for('about.collectors') }}"> Collectors </a>
-              <a class="nav-link ps-0" href="{{ url_for('about.contact_us') }}"> Contact Us </a>
+              <a class="nav-link ps-0" href="{{ url_for('about.about')             }}"> About CaeNDR </a>
+              <a class="nav-link ps-0" href="{{ url_for('about.people')            }}"> People </a>
+              <a class="nav-link ps-0" href="{{ url_for('about.field_researchers') }}"> Field Researchers </a>
+              <a class="nav-link ps-0" href="{{ url_for('about.contact_us')        }}"> Contact Us </a>
             </nav>
           </div>
       </div>

src/modules/site-v2/templates/_includes/navbar.html

@@ -59,13 +59,13 @@
               About Us
             </a>
             <ul class="dropdown-menu" aria-labelledby="aboutDropdown">
-              <li><a class="dropdown-item" href="{{ url_for('about.about')      }}"> About CaeNDR </a></li>
-              <li><a class="dropdown-item" href="{{ url_for('about.people')     }}"> People </a></li>
-              <li><a class="dropdown-item" href="{{ url_for('about.collectors')     }}"> Collectors </a></li>
-              <li><a class="dropdown-item" href="{{ url_for('about.cited_by')   }}"> Cited By </a></li>
-              <li><a class="dropdown-item" href="{{ url_for('about.funding')    }}"> Funding </a></li>
-              <li><a class="dropdown-item" href="{{ url_for('about.statistics') }}"> Statistics </a></li>
-              <li><a class="dropdown-item" href="{{ url_for('about.contact_us') }}"> Contact Us </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.about')             }}"> About CaeNDR </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.people')            }}"> People </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.field_researchers') }}"> Field Researchers </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.cited_by')          }}"> Cited By </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.funding')           }}"> Funding </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.statistics')        }}"> Statistics </a></li>
+              <li><a class="dropdown-item" href="{{ url_for('about.contact_us')        }}"> Contact Us </a></li>
             </ul>
           </div>
           <div class="nav-item dropdown mx-3">

src/modules/site-v2/templates/about/about.html

@@ -91,12 +91,13 @@ <h2>CaeNDR goals</h2>
 
       <ol>
         <li>
-          To accept, organize, and distribute wild strains to research groups that want to investigate their favorite trait(s) 
-          across natural <em>Caenorhabditis</em> strains. See <a href="/">strains</a>.
+          To accept, organize, and distribute wild strains to research groups that want to investigate their favorite trait(s) across natural <em>Caenorhabditis</em> strains. Wild strains were
+           collected by <a href="{{ url_for('about.field_researchers') }}">field researchers</a> and citizen scientists who are passionate about natural ecology and evolution of <em>Caenorhabditis</em> 
+           nematodes. See <a href="/">strains</a> for examples of how this community has build a community-wide resource.
         </li>
         <li>
-          To sequence the whole genomes of wild <em>C. elegans</em>, <em>C. briggsae</em>, and <em>C. tropicalis</em> strains, provide the aligned sequence data, and facilitate discovery 
-          of genetic variation across the entire species. See <a class="txt-link" href="{{ url_for('data.data') }}">Data</a>.
+          To sequence the genomes of wild <em>C. elegans</em>, <em>C. briggsae</em>, and <em>C. tropicalis</em> strains, provide the aligned sequence data, and facilitate discovery 
+          of genetic variation across all three species. See <a class="txt-link" href="{{ url_for('data.data') }}">Data</a>.
         </li>
         <li>
           To perform genome-wide association mappings to correlate genotype with phenotype and identify genetic variation underlying quantitative traits. 

src/modules/site-v2/templates/about/collectors.html → src/modules/site-v2/templates/about/field-researchers.html

@@ -19,19 +19,19 @@
         {% include "_includes/map-static.html" %}
     </div>
     <!-- /Map -->
-    <h2 class="pt-5 text-center">Thank you wild worm collectors!</h2>
+    <h2 class="pt-5 text-center">Thank you wild worm field researchers!</h2>
     <div class="row row-cols-1 row-cols-md-3">
-        {% for c in collectors|sort(attribute='last_name') %}
+        {% for fr in field_researchers|sort(attribute='last_name') %}
         <!-- Card Column -->
         <div class="col mb-3">
             <div class="card p-0 pt-3 mt-5 h-100 shadow text-center cardBorderBottom" style="min-height:35vh;">
-                <img src="{{ c.img_url }}" class="img-fluid rounded mb-3 mx-auto"
-                    alt="{{ c.first_name }} {{ c.last_name }}">
+                <img src="{{ fr.img_url }}" class="img-fluid rounded mb-3 mx-auto"
+                    alt="{{ fr.first_name }} {{ fr.last_name }}">
                 <div class="card-body">
-                    <h3 class="h5 card-title"><a href="{{ c.website }}" target="_blank">{{ c.first_name }} {{
-                            c.last_name }}</a></h3>
+                    <h3 class="h5 card-title"><a href="{{ fr.website }}" target="_blank">{{ fr.first_name }} {{
+                            fr.last_name }}</a></h3>
                     <p class="card-text">
-                        <small>{{ c.org }}</small>
+                        <small>{{ fr.org }}</small>
                     </p>
                 </div>
             </div>

src/modules/site-v2/templates/data/releases.html

@@ -4,7 +4,7 @@
 
 <div class="row">
   <div class="col my-5">
-    <h2>Releases</h2>
+    <h2><em>{{species.short_name}}</em> releases</h2>
     <ul class="nav nav-pills p-4 mt-4 rounded shadow-sm text-bg-light">
     {% for RELEASE in RELEASES %}
       <li class="nav-item">

src/modules/site-v2/templates/primary/home.html

@@ -1,4 +1,13 @@
 {% extends "_layouts/default-nocontainer.html" %}
+
+{% block custom_head %}
+<style>
+  #cite-text {
+    text-align: left !important;
+  }
+</style>
+{% endblock %}
+
 {% block content %}
   <!-- Display Title -->
   <div class="container">
@@ -102,10 +111,10 @@ <h2 class="my-5">Isotype Database</h2>
     <div class="row row-cols-1 row-cols-md-2 g-5 mb-5">
       <div class="col px-5 mb-5">
         <h2 class="mt-5">Cite CaeNDR</h2>
-        <div class="card h-100 shadow text-center pt-5 mt-5 cardBorderBottom">
+        <div class="card h-100 shadow pt-5 mt-5 cardBorderBottom">
           <i class="bi bi-chat-left-quote-fill text-info" aria-hidden="true"></i>
-          <div class="card-body">
-            <h3 class="text-dark">CaeNDR, the <em>Caenorhabditis</em> Natural Diversity Resource</h3>
+          <div class="card-body" id="cite-text">
+            <h3 class="text-dark text-center">CaeNDR, the <em>Caenorhabditis</em> Natural Diversity Resource</h3>
             <p class="card-text">
               {% include "_includes/cite-caendr.html" %}
             </p>

src/modules/site-v2/templates/primary/map.html

@@ -132,8 +132,10 @@
         </form>
       </div>
     </div>
-    <div class="text-center my-2">
-      <small><strong>Click a pin to see information about <i>species</i> wild isolate</strong></small>
+    <div class="my-2">
+      <small><strong>Field researchers and citizen scientists collected each of the strains above in an effort to understand the natural ecology and evolution of these <i>Caenorhabditis</i> species. 
+        These efforts are significant, and their contributions should be acknowledged whenever possible. Click a pin to see information about a particular wild strain. Other free-living 
+        nematodes and additional <i>Caenorhabditis</i> strains and species can be found <a href="https://www.justbio.com/tools/worldwideworms/" target="_blank" >here</a>.</strong></small>
     </div>
 
 {% block script %}