Skip to content

Commit

Permalink
finished edits for next release
Browse files Browse the repository at this point in the history
  • Loading branch information
mariacos committed Jan 2, 2020
1 parent 771a68c commit 7649f75
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 15 deletions.
6 changes: 3 additions & 3 deletions grails-app/conf/Config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ portal.type.override = "t2d" // options are "t2d", "stroke", "mi", "ibd", "e

portal.data.versionDesignator = [ new PortalVersionBean("t2d", // label for this portal type
"T2D", // displayable label for this portal type
"mdv41", // the MDV number for this portal
"mdv42", // the MDV number for this portal
"T2DKP", // name of KB data we want
"T2D", // the default phenotype for this portal
"ExSeq_19k_mdv28", // default data set. Used rarely.
Expand Down Expand Up @@ -660,7 +660,7 @@ portal.data.versionDesignator = [ new PortalVersionBean("t2d", // label for
),
new PortalVersionBean("stroke",
"Stroke",
"mdv75",
"mdv76",
"CDKP", // name of KB data we want
"Stroke_all",
"GWAS_Stroke_mdv70",
Expand Down Expand Up @@ -714,7 +714,7 @@ portal.data.versionDesignator = [ new PortalVersionBean("t2d", // label for
),
new PortalVersionBean("mi",
"Myocardial Infarction",
"mdv96",
"mdv97",
"CVDKP", // name of KB data we want
"MI",
"GWAS_CARDIoGRAM_mdv91",
Expand Down
3 changes: 3 additions & 0 deletions grails-app/i18n/informational.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,7 @@ informational.contact.MI-2=A complete list of Knowledge Portal project staff may
informational.contact.MI.consortia=Contact the consortia that generated the data in the CVDKP:<ul><li>\
<a href="https://www.afgen.org/contact" target="_blank">AFGen</a></li>\
<li><a href="http://lipidgenetics.org/" target="_blank">GLGC</a></li>\
<li><a href="https://www.hermesconsortium.org/" target="_blank">Heart Failure Molecular Epidemiology for Therapeutic Targets consortium (HERMES)</a></li>\
<li><a href="http://www.kathiresanlab.org/contact-us/" target="_blank">MIGen</a></li>\
<li><a href="http://www.cardiogramplusc4d.org/steering-committee/" target="_blank">CARDIoGRAMplusC4D</a></li></ul>
informational.contact.sleep.consortia=Contact the consortia that generated the data in the SDKP:<ul><li>\
Expand All @@ -1490,6 +1491,8 @@ informational.about_MI.section2=The <a href="https://www.afgen.org/" target="_bl
and a full list of AFGen investigators is available <a href="https://www.afgen.org/members-c1zr5" target="_blank">here</a>.
informational.about_MI.section3=The <a href="http://lipidgenetics.org/" target="_blank">Global Lipids Genetics Consortium (GLGC)</a> \
studies the genetics of plasma lipids. The current collaborative research network involves over 200 investigators from more than 80 institutions.
informational.about_MI.section3a=The <a href="https://www.hermesconsortium.org/" target="_blank">Heart Failure Molecular Epidemiology for Therapeutic Targets (HERMES)</a> \
consortium is an international collaboration that aims to generate insights into the causal pathways leading to heart failure to inform new therapeutic approaches.
informational.about_MI.section4=The <a href="http://www.kathiresanlab.org/collaborators/myocardial-infarction-genetics-exome-sequencing-consortium/" target="_blank">Myocardial \
Infarction Genetics Consortium (MIGen)</a> performs both genotyping and sequencing studies to understand the genetics of early-onset heart attack.
informational.about_MI.section4a=The <a href="http://www.cardiogramplusc4d.org/" target="_blank">CARDIoGRAMplusC4D Consortium</a> is a collaborative effort to combine \
Expand Down
3 changes: 2 additions & 1 deletion grails-app/i18n/portalHome.properties
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ about.the.mi.portal.text=The Cardiovascular Disease Knowledge Portal (CVDKP) fra
team of scientists and software engineers at the <a href="https://www.broadinstitute.org/" target="_blank">Broad \
Institute of MIT and Harvard</a>. Data in the CVDKP were generated by the \
<a href="https://www.afgen.org/" target="_blank">Atrial Fibrillation Consortium (AFGen)</a>, the <a href="http://lipidgenetics.org/" target="_blank">Global \
Lipids Genetics Consortium (GLGC)</a>, the <a href="http://www.kathiresanlab.org/collaborators/myocardial-infarction-genetics-exome-sequencing-consortium/" target="_blank">Myocardial \
Lipids Genetics Consortium (GLGC)</a>, the <a href="https://www.hermesconsortium.org/" target="_blank">Heart Failure Molecular Epidemiology for Therapeutic Targets consortium (HERMES)</a>, \
the <a href="http://www.kathiresanlab.org/collaborators/myocardial-infarction-genetics-exome-sequencing-consortium/" target="_blank">Myocardial \
Infarction Genetics Consortium (MIGen)</a>, and the <a href="http://www.cardiogramplusc4d.org" target="_blank">CARDIoGRAMPlusC4D Consortium</a>.<br><p>We welcome contributions of data and the involvement of interested \
researchers in collaborations on analyses, methods, or tool development. Please <a href="mailto:[email protected]">contact us</a> for more information.</p>
about.the.ibd.portal.text=Details about the V2F Portal project
Expand Down
28 changes: 17 additions & 11 deletions grails-app/views/home/portalHome.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -338,26 +338,24 @@
mpgSoftware.homePage.newFeatures([{"name":"New Resource","link":"javascript:;","class":"resource","type":"new"},{"name":"Update Module","link":"javascript:;","class":"module","type":"updated"},{"name":"New Feature","link":"javascript:;","class":"feature","type":"new"}]);
*/
mpgSoftware.homePage.newFeatures([
{"name":"Tutorial video: Custom aggregation tests","link":"https://www.youtube.com/watch?v=O78rN5A7SAw&list=PLlMMtlgw6qNj6ICrkMu2BAPhs-6XFBpTr&index=7&t=0s","class":"resource","type":"new"},
{"name":"Webinar video: Diabetes Epigenome Atlas","link":"https://www.youtube.com/watch?v=zMHFSMkYNLk&feature=youtu.be","class":"resource","type":"new"}]);
{"name":"Tutorial video: Diabetes Epigenome Atlas","link":"https://youtu.be/vZdMfjSvVQk","class":"resource","type":"new"},
{"name":"Webinar video: LocusZoom","link":"https://www.youtube.com/watch?v=AmU7IIAeZJ4&feature=youtu.be","class":"resource","type":"new"}]);
</script>
</g:if>
<g:elseif test="${g.portalTypeString()?.equals('mi')}">
<script type="text/javascript">
/* Example to add 'new' or 'updated' feature buttons;
mpgSoftware.homePage.newFeatures([{"name":"New Resource","link":"javascript:;","class":"resource","type":"new"},{"name":"Update Module","link":"javascript:;","class":"module","type":"updated"},{"name":"New Feature","link":"javascript:;","class":"feature","type":"new"}]);
*/
%{--mpgSoftware.homePage.newFeatures([{"name":"Tissue enrichments","link":"${createLink(controller:'trait',action:'tissueTable')}","class":"resource","type":"new"},--}%
%{--{"name":"Webinar video: gene-specific resources in the Portals","link":"https://www.youtube.com/watch?v=ylPn6D1hpY4","class":"resource","type":"new"}]);--}%
mpgSoftware.homePage.newFeatures([{"name":"Webinar video: LocusZoom","link":"https://www.youtube.com/watch?v=AmU7IIAeZJ4&feature=youtu.be","class":"resource","type":"new"}]);
</script>
</g:elseif>
<g:elseif test="${g.portalTypeString()?.equals('stroke')}">
<script type="text/javascript">
/* Example to add 'new' or 'updated' feature buttons;
mpgSoftware.homePage.newFeatures([{"name":"New Resource","link":"javascript:;","class":"resource","type":"new"},{"name":"Update Module","link":"javascript:;","class":"module","type":"updated"},{"name":"New Feature","link":"javascript:;","class":"feature","type":"new"}]);
*/
%{--mpgSoftware.homePage.newFeatures([{"name":"Tissue enrichments","link":"${createLink(controller:'trait',action:'tissueTable')}","class":"feature","type":"new"},--}%
%{--{"name":"Webinar video: gene-specific resources in the Portals","link":"https://www.youtube.com/watch?v=ylPn6D1hpY4","class":"resource","type":"new"}]);--}%
mpgSoftware.homePage.newFeatures([{"name":"Webinar video: LocusZoom","link":"https://www.youtube.com/watch?v=AmU7IIAeZJ4&feature=youtu.be","class":"resource","type":"new"}]);
</script>
</g:elseif>

Expand All @@ -366,11 +364,19 @@
/* Example to add 'new' or 'updated' feature buttons;
mpgSoftware.homePage.newFeatures([{"name":"New Resource","link":"javascript:;","class":"resource","type":"new"},{"name":"Update Module","link":"javascript:;","class":"module","type":"updated"},{"name":"New Feature","link":"javascript:;","class":"feature","type":"new"}]);
*/
%{--mpgSoftware.homePage.newFeatures([{"name":"Tissue enrichments","link":"${createLink(controller:'trait',action:'tissueTable')}","class":"feature","type":"new"},--}%
%{--{"name":"Webinar video: gene-specific resources in the Portals","link":"https://www.youtube.com/watch?v=ylPn6D1hpY4","class":"resource","type":"new"}]);--}%
mpgSoftware.homePage.newFeatures([{"name":"Webinar video: LocusZoom","link":"https://www.youtube.com/watch?v=AmU7IIAeZJ4&feature=youtu.be","class":"resource","type":"new"}]);
</script>
</g:elseif>

<g:elseif test="${g.portalTypeString()?.equals('bone')}">

<script type="text/javascript">
/* Example to add 'new' or 'updated' feature buttons;

mpgSoftware.homePage.newFeatures([{"name":"New Resource","link":"javascript:;","class":"resource","type":"new"},{"name":"Update Module","link":"javascript:;","class":"module","type":"updated"},{"name":"New Feature","link":"javascript:;","class":"feature","type":"new"}]);

*/
mpgSoftware.homePage.newFeatures([{"name":"Webinar video: LocusZoom","link":"https://www.youtube.com/watch?v=AmU7IIAeZJ4&feature=youtu.be","class":"resource","type":"new"}]);

</script>

</g:elseif>

<!-- New features buttons end -->
</div>
</div>
Expand All @@ -386,7 +392,7 @@
<div class="col-md-12" style="padding-top:40px; font-size: 20px;">
<h2 style="font-family:'Oswald'; font-size: 40px;font-weight:700"><g:message code="portal.aboutTheData" default="About the data" /></h2>
<p><span style="font-size: 20px;"><g:message code="portal.stroke.about.the.data.text" /></span>
<h1 style="display:block; font-size:65px; letter-spacing:-0.03em; width:550px; margin-top: 0px;"><span style="color:#F58A1F;font-family: 'Oswald'; ">37 datasets,</span> <span style="color:#80C242;font-family: 'Oswald'; ">69 traits</span></h1>
<h1 style="display:block; font-size:65px; letter-spacing:-0.03em; width:550px; margin-top: 0px;"><span style="color:#F58A1F;font-family: 'Oswald'; ">27 datasets,</span> <span style="color:#80C242;font-family: 'Oswald'; ">60 traits</span></h1>
<hr />


Expand All @@ -407,7 +413,7 @@
<img src="${resource(dir: 'images', file: 'data_icon4.png')}" style="width: 200px; margin-right: -50px;" align="right" >
<h2 style="font-family:'Oswald'; font-size: 40px;font-weight:700; margin-top:5px;"><g:message code="portal.aboutTheData" default="About the data" /></h2>
<p><g:message code="portal.mi.about.the.data.text" />
<h1 style="display:block; font-size:65px; letter-spacing:-0.03em; width:550px; margin-top: 0px;"><span style="color:#F58A1F;font-family: 'Oswald'; ">28 datasets,</span> <span style="color:#80C242;font-family: 'Oswald'; ">52 traits</span></h1>
<h1 style="display:block; font-size:65px; letter-spacing:-0.03em; width:550px; margin-top: 0px;"><span style="color:#F58A1F;font-family: 'Oswald'; ">29 datasets,</span> <span style="color:#80C242;font-family: 'Oswald'; ">52 traits</span></h1>

<hr/> <a href="http://institute.heart.org" target="_blank"><img src="${resource(dir: 'images/organizations', file: 'AHA_precision.jpg')}" style="width: 330px; margin-right: 10px;" align="right" ></a>

Expand All @@ -432,7 +438,7 @@
<img src="${resource(dir: 'images', file: 'data_icon4.png')}" style="width: 200px; margin-right: -50px;" align="right" >
<h2 style="font-family:'Oswald'; font-size: 40px;font-weight:700; margin-top:5px;"><g:message code="portal.aboutTheData" default="About the data" /></h2>
<p><g:message code="portal.sleep.about.the.data.text" />
<h1 style="display:block; font-size:65px; letter-spacing:-0.03em; width:550px; margin-top: 0px;"><span style="color:#F58A1F;font-family: 'Oswald'; ">24 datasets,</span> <span style="color:#80C242;font-family: 'Oswald'; ">65 traits</span></h1>
<h1 style="display:block; font-size:65px; letter-spacing:-0.03em; width:550px; margin-top: 0px;"><span style="color:#F58A1F;font-family: 'Oswald'; ">25 datasets,</span> <span style="color:#80C242;font-family: 'Oswald'; ">73 traits</span></h1>

</g:elseif>
<g:elseif test="${g.portalTypeString()?.equals('lung')}">
Expand Down
1 change: 1 addition & 0 deletions grails-app/views/informational/_about_mi.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
<p><g:message code="informational.about_MI.section1"/></p>
<p><g:message code="informational.about_MI.section2"/></p>
<p><g:message code="informational.about_MI.section3"/></p>
<p><g:message code="informational.about_MI.section3a"/></p>
<p><g:message code="informational.about_MI.section4"/></p>
<p><g:message code="informational.about_MI.section4a"/></p>
<h3 class="dk-blue-bordered"><g:message code="informational.about_KP.header"/></h3>
Expand Down

0 comments on commit 7649f75

Please sign in to comment.