7ab5023085cc60f8cae00bcd378187dac3921301
Merge parents 7f49cae 9c21039
max
  Mon Feb 26 03:32:59 2024 -0800
china merge fix

diff --cc src/hg/htdocs/covid19.html
index 70c9f30,c34fe6d..5d39da3
--- src/hg/htdocs/covid19.html
+++ src/hg/htdocs/covid19.html
@@@ -142,47 -142,45 +142,51 @@@
          come from distinct sources.
          When newly sequenced virus genomes are added to a comprehensive tree of previously
          sequenced genomes, contact tracers are often able to determine where in the world
          those genomes came from.
          UShER is the only available method that can do this in "real time".
          Our tool places genomes onto a comprehensive global phylogeny of more than 80,000
          virus genomes in less than one second.
          More information about UShER can be found on the UCSC news article,
          <a href="https://news.ucsc.edu/2021/05/coronavirus-variants.html">New tools enable rapid
          analysis of coronavirus sequences and tracking of variants</a>. The number of genome
          sequences available has increased to 5.6 million since the article was initially published
          with 1.2 million sequences on May 2021. 
        </p>
        <p>
          <div style='float:left; margin-right: 10px;'>
 -          <!--#if expr="$SERVER_NAME = /-china/" -->
 -          <a href="../videos/humQ1NyZOUM.mp4"><img src="/images/videoIcon.png"></a>
 +
 +        <!--#if expr="${SERVER_NAME} = /-china/" -->
 +            <a href='../../../videos/humQ1NyZOUM.mp4'>
 +            <img style="width:267px; height:250px" src=../../images/videoIcon.png></a>
          <!--#else -->
 -          <iframe width="267" height="150" src="https://www.youtube.com/embed/humQ1NyZOUM" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 +        <iframe width="267" height="150" src="https://www.youtube.com/embed/humQ1NyZOUM?rel=0" 
 +        frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" 
 +        allowfullscreen></iframe> </p>
 +        <p> Visit our <a href="https://www.youtube.com/channel/UCQnUJepyNOw0p8s2otX4RYQ/videos"
 +        target="_blank">YouTube channel</a> for more videos.
          <!--#endif -->
          </div>
  
          The <a href='https://www.cdc.gov/amd/training/covid-19-gen-epi-toolkit.html'
                 target=_blank>CDC COVID-19 Genomic Epidemiology Toolkit</a>
          now includes a training module for UShER!
+         <!--#if expr="$SERVER_NAME = /-china/" -->
+         Module 3.3 includes a <a href='../videos/humQ1NyZOUM.mp4' target=_blank>video</a>,
+         <!--#else -->
          Module 3.3 includes a <a href='https://youtu.be/humQ1NyZOUM' target=_blank>video</a>,
+         <!--#endif -->
          slides (<a href='https://www.cdc.gov/amd/pdf/slidesets/ToolkitModule_3.3-508C.pdf'
                     target=_blank>PDF</a>),
          and links to more resources.
        </p>
      </div>
      <div class="col-md-6">
          <a href="/images/covid19/UShER_example.png">
          <img class="text-center" alt="Example output of UShER"
              src="/images/covid19/UShER_example.png"
                  style="margin-bottom: 5px !important">
          </a>
          <div style="text-align: right; line-height: 1">
            <font SIZE=-1><em>Example UShER results displayed using
              <a href="https://nextstrain.org/" target=_blank>Nextstrain</a>.
              Sequences representing a hypothetical outbreak are yellow;