877b1886b6e9ee73fa26477cbf83bbf16771bb3d
kate
  Wed May 13 16:24:46 2020 -0700
Restore ENCODE logo to track header (not supertrack). Remove uplink to all tracks in group from the supertrack link.  Maybe we decided to remove this generally ?. refs #24948

diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index 738c147..f0936e6 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -3085,55 +3085,37 @@
 {
 if (jsonGlobalsHash == NULL)
     jsonGlobalsHash = newJsonObject(newHash(5));
 jsonObjectAdd(jsonGlobalsHash, name, ele);
 }
 
 void showSupertrackInfo(struct trackDb *tdb)
 {
 // A bit of context when we're in hierarchy: parent description and sibling track list
 
 if (!tdb->parent)
     return;
 
 // show super-track info
 struct trackDb *tdbParent = tdb->parent;
-if (trackDbSetting(tdbParent, "wgEncode"))
-    printf("<A HREF='/ENCODE/index.html'><IMG style='vertical-align:middle;' "
-           "width=100 src='/images/ENCODE_scaleup_logo.png'><A>");
-printf("<b>Track collection: <a href='%s?%s=%s&c=%s&g=%s'>%s </b></a>",
+
+printf("<b>Track collection: "
+           "<img height=12 src='../images/ab_up.gif'>"
+            "<a href='%s?%s=%s&c=%s&g=%s'>%s </b></a>",
             hgTrackUiName(), cartSessionVarName(), cartSessionId(cart),
             chromosome, cgiEncode(tdbParent->track), tdbParent->longLabel);
 
-// show group info
-struct grp *grp, *grps = hLoadGrps(database);
-for (grp = grps; grp != NULL; grp = grp->next)
-    {
-    if (sameString(grp->name, tdb->grp))
-        {
-        printf("&nbsp;&nbsp;<B style='font-size:100%%;'>"
-               "(<A HREF=\"%s?%s=%s&c=%s&hgTracksConfigPage=configure"
-               "&hgtgroup_%s_close=0#%sGroup\" title='%s tracks in track configuration "
-               "page'><IMG height=12 src='../images/ab_up.gif'>All %s%s</A>)</B>",
-               hgTracksName(), cartSessionVarName(), cartSessionId(cart), chromosome,
-               tdb->grp, tdb->grp, grp->label, grp->label,
-               endsWith(grp->label," Tracks")?"":" tracks");
-        break;
-        }
-    }
-grpFreeList(&grps);
-
 // collapsed panel for Description
 
 printf("<p>");
 printf("<p><table>");  // required by jsCollapsible
 jsBeginCollapsibleSectionFontSize(cart, tdb->track, "superDescription", "Description", FALSE,
                                         "medium");
 char *html = replaceChars(tdbParent->html, "<H", "<h");
 html = replaceChars(html, "</H", "</h");
 
 // remove Description header
 html = replaceChars(html, "<h2>Description</h2>", "");
 html = replaceChars(html, "<h3>Description</h3>", "");
 html = replaceChars(html, "<h1>Description</h1>", "");
 
 // remove everything after Description text
@@ -3275,31 +3257,31 @@
 	}
     else
 	{
 	struct trackVersion *trackVersion = getTrackVersion(database, "ncbiRefSeq");
 	if ((trackVersion != NULL) && !isEmpty(trackVersion->version))
 	    {
 	    safef(longLabel, sizeof(longLabel), "%s - Annotation Release %s", tdb->longLabel, trackVersion->version);
 	    }
 	else
 	    safef(longLabel, sizeof(longLabel), "%s", tdb->longLabel);
 	}
     printf("<B style='font-size:200%%;'>%s%s</B>\n", longLabel, tdbIsSuper(tdb) ? " Tracks" : "");
     }
 else
     {
-    if (trackDbSetting(tdb, "wgEncode") && !tdb->parent)
+    if (trackDbSetting(tdb, "wgEncode"))
         printf("<A HREF='/ENCODE/index.html'><IMG style='vertical-align:middle;' "
                "width=100 src='/images/ENCODE_scaleup_logo.png'><A>");
     // set large title font size, but less so for long labels to minimize wrap
     printf("<B style='font-size:%d%%;'>%s%s</B>\n", strlen(tdb->longLabel) > 30 ? 133 : 200,
                 tdb->longLabel, tdbIsSuper(tdb) ? " tracks" : "");
 
     }
 
 
 /* Print link for parent track */
 if (!ajax)
     {
     if (!tdb->parent)
         {
         // show group info