6e2ce95748a6b80895027e24e6f5086890d169bc hiram Tue Nov 28 14:10:37 2023 -0800 correct style statements in html elements for border and text alignment and do not declare type javascript refs #29545 diff --git src/hg/makeDb/doc/asmHubs/commonHtml.pm src/hg/makeDb/doc/asmHubs/commonHtml.pm index 6829b7f..9ae04cb 100644 --- src/hg/makeDb/doc/asmHubs/commonHtml.pm +++ src/hg/makeDb/doc/asmHubs/commonHtml.pm @@ -35,31 +35,31 @@ chomp $vgpCount; $asmCounts{'vgp'} = $vgpCount; my $hprcCount = `grep -c -h -v "^#" ../hprcAsmHub/hprc.orderList.tsv`; chomp $hprcCount; $asmCounts{'hprc'} = $hprcCount; my $ccgpCount = `grep -c -h -v "^#" ../ccgpAsmHub/ccgp.orderList.tsv`; chomp $ccgpCount; $asmCounts{'ccgp'} = $ccgpCount; my $legacyCount = `grep -c -h -v "^#" ../legacyAsmHub/legacy.orderList.tsv`; chomp $legacyCount; $asmCounts{'legacy'} = $legacyCount; # different table output for VGP index if ((0 == $vgpIndex)) { - printf "<p>\n<table border='1' style='margin-left:auto; margin-right:auto;'><thead>\n"; + printf "<p>\n<table style='border: 1px solid black; margin-left:auto; margin-right:auto;'><thead>\n"; printf "<tr><th colspan=4 style='text-align:center;'>Additional hubs with collections of assemblies</th></tr>\n"; printf "<tr><th>Collection</th>\n"; printf " <th>Hub index pages:</th>\n"; printf " <th>Assembly statistics:</th>\n"; printf " <th>Track statistics:</th>\n"; printf "</tr>\n"; foreach my $hubName (@hubList) { if ($hubName =~ m/^vertebrate/) { printf "<tr><th>other vertebrates</th>\n"; } elsif ($hubName =~ m/fish/) { printf "<tr><th>Fishes</th>\n"; } elsif ($hubName =~ m/invertebrate/) { printf "<tr><th>Invertebrates</th>\n"; } elsif ($hubName =~ m/viral/) { printf "<tr><th>Viruses</th>\n"; @@ -87,31 +87,31 @@ printf " <th style='text-align:right'><a href='../%s/index.html'>%d assemblies</a></th>\n", "VGP", $asmCounts{'vgp'}; printf " <th><a href='../VGP/asmStats.html'>assembly stats</a></th>\n"; printf " <th><a href='../VGP/trackData.html'>track stats</a></th>\n"; printf "</tr>\n"; printf "<tr><th>CCGP - The California Conservation Genomics Project</th>\n"; printf " <th style='text-align:right'><a href='../%s/index.html'>%d assemblies</a></th>\n", "CCGP", $asmCounts{'ccgp'}; printf " <th><a href='../CCGP/asmStats.html'>assembly stats</a></th>\n"; printf " <th><a href='../CCGP/trackData.html'>track stats</a></th>\n"; printf "</tr>\n"; printf "<tr><th>HPRC - Human Pangenome Reference Consortium</th>\n"; printf " <th style='text-align:right'><a href='../%s/index.html'>%d assemblies</a></th>\n", "HPRC", $asmCounts{'hprc'}; printf " <th><a href='../HPRC/asmStats.html'>assembly stats</a></th>\n"; printf " <th><a href='../HPRC/trackData.html'>track stats</a></th>\n"; printf "</tr></thead>\n</table>\n</p>\n"; } elsif (1 == $vgpIndex) { - printf "<p>\n<table border='1'><thead>\n"; + printf "<p>\n<table style='border: 1px solid black;'><thead>\n"; printf "<tr><th colspan=5 style='text-align:center;'>Alternate sets of VGP assemblies</th><th style='text-align:center;'>NCBI Refseq</th></tr>\n"; printf "<tr><th>Index pages: </th>\n"; printf "<th><a href='index.html'>primary assembly</a></th>\n"; printf "<th><a href='vgpAlt.html'>alternate/haplotype</a></th>\n"; printf "<th><a href='vgpTrio.html'>trio mat/pat</a></th>\n"; printf "<th><a href='vgpLegacy.html'>legacy/superseded</a></th>\n"; printf "<th><a href='../primates/index.html'>other NCBI Refseq assemblies</a></th>\n"; printf "</tr><tr>\n"; printf "<th>Assembly statistics: </th>\n"; printf "<th><a href='asmStats.html'>primary assembly</a></th>\n"; printf "<th><a href='vgpAltStats.html'>alternate/haplotype</a></th>\n"; printf "<th><a href='vgpTrioStats.html'>trio mat/pat</a></th>\n"; printf "<th><a href='vgpLegacyStats.html'>legacy/superseded</a></th>\n"; printf "<th><a href='../primates/asmStats.html'>other NCBI Refseq assemblies</a></th>\n"; @@ -126,20 +126,20 @@ printf "</tr><tr>\n"; printf "</tr></thead>\n</table>\n</p>\n"; } } # sub otherHubLinks($$) ############################################################################ # common output at the bottom of an html index page sub htmlFooter() { print <<"END" </div><!-- closing gbsPage from gbPageStartHardcoded.html --> </div><!-- closing container-fluid from gbPageStartHardcoded.html --> <!--#include virtual="\$ROOT/inc/gbFooterHardcoded.html"--> -<script type="text/javascript" src="<!--#echo var="ROOT" -->/js/sorttable.js"></script> +<script src="<!--#echo var="ROOT" -->/js/sorttable.js"></script> </body></html> END } ############################################################################