Merge pull request #283 from fyvon/nhgri

Added NHGRI logo and updated acknowledgements

catalog/context_processors.py

@@ -10,6 +10,7 @@ def pgs_settings(request):
 
 def pgs_urls(request):
     return {
+        'nhgri_url'        : constants.USEFUL_URLS['NHGRI_URL'],
         'baker_url'        : constants.USEFUL_URLS['BAKER_URL'],
         'ebi_url'          : constants.USEFUL_URLS['EBI_URL'],
         'hdr_uk_cam_url'   : constants.USEFUL_URLS['HDR_UK_CAM_URL'],
@@ -49,3 +50,44 @@ def pgs_info(request):
         'pgs_table_helper': constants.TABLE_HELPER,
         'ensembl_version': constants.ENSEMBL_VERSION
     }
+
+def pgs_contributors(request):
+    groups = constants.PGS_GROUPS
+    groups_to_print = list()
+    html='<p><b>PGS Catalog Team:</b> '
+
+    def get_group_index(group_private_index):
+        group = groups.get(group_private_index, None)
+        group_name = group['name']
+        if not group in groups_to_print:
+            groups_to_print.append(group)
+        group_index = groups_to_print.index(group) + 1
+        return(f'<a title="{group_name}" style="border-bottom: 0px;">{group_index}</a>')
+
+    def html_author(author):
+        name = author['name']
+        group_sup = ','.join(map(get_group_index,author['group']))
+
+        return f'<span>{ name }<sup>{ group_sup }</sup></span>'
+
+    html += ', '.join(map(html_author,constants.PGS_CONTRIBUTORS))
+    html += '</p>\n'
+    html += '<p><b>Previous Contributors:</b>\n'
+    html += ', '.join(map(html_author,constants.PGS_PREVIOUS_CONTRIBUTORS))
+
+    html += '</p><p><ul>'
+
+    for index, group in enumerate(groups_to_print):
+        group_name = group.get('name')
+        group_url = group.get('url', None)
+        html += f'<li><span>{index+1}:</span> <b>'
+        if group_url:
+            html += f'<a title="{group_name}" href="{group_url}" class="external-link">{group_name}</a>'
+        else:
+            html += group_name
+        html += '</b></li>\n'
+    html += '</ul></p>'
+
+    return {
+        'pgs_contributors': html
+    }

catalog/templates/catalog/docs/about.html

@@ -199,16 +199,12 @@ <h3 id="contact">Feedback & Contact Information</h3>
 
     <section>
       <h3 id="acknowledgements">Acknowledgements</h3>
-      <p>We wish to acknowledge the help of the following people & teams for their support of the PGS Catalog:
-        <ul>
-          <li><b>PGS Catalog Data Curators</b> — Emily Tinsley, Shirin Saverimuttu, Aoife McMahon, Sam Lambert</li>
-          <li class="mt-1"><a href="{{ hdr_uk_cam_url }}"><b>Health Data Research UK, Cambridge</b></a> — Laurent Gil, Michael Chapman, Richard Houghton, Prof. John Danesh</li>
-          <li class="mt-1"><a href="{{ ebi_url }}/gwas"><b>NHGRI-EBI GWAS Catalog Team</b></a> — Annalisa Buniello, Elizabeth Lewis, Aoife McMahon, Santhi Ramachandran, Jackie MacArthur, Laura Harris</li>
-          <li class="mt-1"><a href="{{ ebi_url }}/about/spot-team"><b>EMBL-EBI Samples Phenotypes and Ontologies Team</b></a> — Helen Parkinson, Simon Jupp, James Hayhurst, Trish Whetzel</li>
-          <li class="mt-1"><a href="https://www.inouyelab.org"><b>Inouye Lab Members</b></a> — Jonathan Marten, Petar Scepanovic, Scott Ritchie, Gad Abraham</li>
-        </ul>
-      </p>
-      <p class="mt-4">The development of the <b>PGS Catalog</b> is supported by:</p>
+
+      <p>We wish to acknowledge the help of the following people & teams for their support of the PGS Catalog:</p>
+
+      {{ pgs_contributors|safe }}
+
+      <p class="mt-4">The PGS Catalog is delivered by collaboration between the EMBL-EBI and University of Cambridge and funded by NHGRI (1U24HG012542-01), Health Data Research UK and the Baker Heart & Diabetes Institute.</p>
       <div class="row justify-content-center mb-4">
         <div class="col">
           <a class="pgs_no_icon_link" href="{{ uoc_url }}"><img class="img-fluid pgs_big_icons" src="{% static 'catalog/imgs/UofCambridge.png' %}" alt="University of Cambridge"></a>
@@ -222,6 +218,9 @@ <h3 id="acknowledgements">Acknowledgements</h3>
         <div class="col">
           <a class="pgs_no_icon_link" href="{{ baker_url }}"><img class="img-fluid pgs_big_icons" src="{% static 'catalog/imgs/Baker_Logo.png' %}" alt="Baker Heart and Diabetes Institute"></a>
         </div>
+        <div class="col">
+          <a class="pgs_no_icon_link" href="{{ nhgri_url }}"><img class="img-fluid pgs_big_icons" src="{% static 'catalog/imgs/NHGRI_Logo.png' %}" alt="National Human Genome Research Institute"></a>
+        </div>
       </div>
     </section>
 {% endblock %}

catalog/templates/catalog/includes/footer.html

@@ -15,6 +15,9 @@
       <div>
         <a class="pgs_no_icon_link" href="{{ baker_url }}"><img class="img-fluid pgs_small_icons" src="{% static 'catalog/imgs/Baker_Logo_small.png' %}" alt="Baker Heart and Diabetes Institute"></a>
       </div>
+      <div>
+        <a class="pgs_no_icon_link" href="{{ nhgri_url }}"><img class="img-fluid pgs_small_icons" src="{% static 'catalog/imgs/NHGRI_Logo_small.png' %}" alt="National Human Genome Research Institute"></a>
+      </div>
       <div>
         <div class="pgs_social">
           <a class="pgs_no_icon_link fas fa-envelope" title="Contact us" href="mailto:{{ pgs_contact }}" target="_blank"></a>

catalog/templates/catalog/index.html

@@ -182,6 +182,9 @@ <h5 class="mb-3">Development of the <b>PGS Catalog</b> is supported by:</h5>
       <div class="col pgs_centered">
         <a class="pgs_no_icon_link" href="{{ baker_url }}"><img class="img-fluid pgs_big_icons" src="{% static 'catalog/imgs/Baker_Logo.png' %}" alt="Baker Heart and Diabetes Institute"></a>
       </div>
+      <div class="col pgs_centered">
+        <a class="pgs_no_icon_link" href="{{ nhgri_url }}"><img class="img-fluid pgs_big_icons" src="{% static 'catalog/imgs/NHGRI_Logo.png' %}" alt="National Human Genome Research Institute"></a>
+      </div>
     </div>
   </section>
 </div>

pgs_web/constants.py

@@ -12,6 +12,7 @@
 ENSEMBL_VERSION = 105
 
 USEFUL_URLS = {
+    'NHGRI_URL'         : 'https://www.genome.gov/',
     'BAKER_URL'         : 'https://baker.edu.au',
     'EBI_URL'           : 'https://www.ebi.ac.uk',
     'HDR_UK_CAM_URL'    : 'https://www.hdruk.ac.uk/about-us/our-locations/health-data-research-uk-hdr-uk-cambridge/',
@@ -129,3 +130,57 @@
     'OTH': 'Additional Diverse Ancestries',
     'NR' : 'Ancestry Not Reported'
 }
+
+PGS_CONTRIBUTORS = [
+    {'name': 'Sam Lambert','group': ['curators']},
+    {'name': 'Laurent Gil','group': ['hdruk']},
+    {'name': 'Benjamin Wingfield','group': ['ebi']},
+    {'name': 'Florent Yvon','group': ['inouye']},
+    {'name': 'Aoife McMahon', 'group': ['curators','nhgri-ebi']},
+    {'name': 'Santhi Ramachandran','group': ['nhgri-ebi']},
+    {'name': 'Elizabeth Lewis','group': ['nhgri-ebi']},
+    {'name': 'Laura Harris','group': ['nhgri-ebi']},
+    {'name': 'Helen Parkinson', 'group': ['spot']},
+    {'name': 'Richard Houghton','group': ['hdruk']},
+    {'name': 'Prof. John Danesh','group': ['hdruk']},
+    {'name': 'Michael Inouye', 'group': ['inouye']}
+]
+
+PGS_GROUPS = {
+    'inouye': {
+        'name': 'Inouye Lab',
+        'url': 'https://www.inouyelab.org/'
+    },
+    'curators': {
+        'name': 'PGS Catalog Data Curators'
+    },
+    'hdruk': {
+        'name': 'Health Data Research UK, Cambridge',
+        'url': USEFUL_URLS['HDR_UK_CAM_URL']
+    },
+    'nhgri-ebi': {
+        'name': 'NHGRI-EBI GWAS Catalog Team',
+        'url': USEFUL_URLS['EBI_URL'] + '/gwas'
+    },
+    'spot': {
+        'name': 'EMBL-EBI Samples Phenotypes and Ontologies Team',
+        'url': USEFUL_URLS['EBI_URL'] + '/about/spot-team'
+    },
+    'ebi': {
+        'name': 'European Bioinformatics Institute',
+        'url': USEFUL_URLS['EBI_URL']
+    }
+}
+
+PGS_PREVIOUS_CONTRIBUTORS = [
+    {'name': 'Emily Tinsley','group': ['ebi']},
+    {'name': 'Shirin Saverimuttu','group': ['ebi']},
+    {'name': 'Jackie MacArthur','group': ['ebi']},
+    {'name': 'Simon Jupp','group': ['ebi']},
+    {'name': 'James Hayhurst','group': ['ebi']},
+    {'name': 'Trish Whetzel','group': ['ebi']},
+    {'name': 'Michael Chapman','group': ['hdruk']},
+    {'name': 'Jonathan Marten', 'group': ['inouye']},
+    {'name': 'Petar Scepanovic', 'group': ['inouye']},
+    {'name': 'Gad Abraham', 'group': ['inouye']}
+]

pgs_web/settings.py

@@ -104,7 +104,8 @@
     'catalog.context_processors.pgs_urls',
     'catalog.context_processors.pgs_settings',
     'catalog.context_processors.pgs_search_examples',
-    'catalog.context_processors.pgs_info'
+    'catalog.context_processors.pgs_info',
+    'catalog.context_processors.pgs_contributors'
 ]
 
 if PGS_ON_GAE == 1 and DEBUG == False: