8149e01f1abf2d532e4bc0cd516713a536640006
kate
  Wed Feb 19 12:08:24 2020 -0800
Tweak to match Ana's mock-up. Still in progress. refs #24948

diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index 2d3c3eb..65b696f 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -3137,45 +3137,36 @@
     cartRemove(cart,"descriptionOnly"); // This is a once only request and should be deleted
     return;
     }
 if (tdbIsContainer(tdb))
     {
     safef(setting,sizeof(setting),"%s.%s",tdb->track,RESET_TO_DEFAULTS);
     // NOTE: if you want track vis to not be reset, move to after vis dropdown
     if (1 == cartUsualInt(cart, setting, 0))
         cartRemoveAllForTdbAndChildren(cart,tdb);
     else if (!ajax) // Overkill on !ajax, because ajax shouldn't be called for a composite
         cartTdbTreeReshapeIfNeeded(cart,tdb);
     }
 
 if (tdb->parent)
     {
-    printf("<style>div.superTrackInfo {"
-                "box-shadow: inset 0 0 5px 0 black;"
-                "padding: 5px; padding-left: 50px;"
-                "margin-bottom: 10px;"
-                "} </style>\n");
-
     printf("This track is part of a super-track. "
-            "To configure the parent or sibling tracks, click a link in the box below.");
+            "To configure the parent or sibling tracks, click a link below.");
 
     // show super-track info
-    printf("<div class='superTrackInfo'>");
-/*
-    printf("<i>Parent track</i> ");
-*/
     struct trackDb *tdbParent = tdb->parent;
+    printf("<p>");
     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 style='font-size:%d%%;'><a href='%s?%s=%s&c=%s&g=%s'"
                " title='Configure parent track'>%s</a> Tracks</b>",
                 strlen(tdb->longLabel) > 30 ? 133 : 200,
                 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))
             {
@@ -3186,61 +3177,54 @@
                    hgTracksName(), cartSessionVarName(), cartSessionId(cart), chromosome,
                    tdb->grp, tdb->grp, grp->label, grp->label,
                    endsWith(grp->label," Tracks")?"":" tracks");
             break;
             }
         }
     grpFreeList(&grps);
 
     printf("<table cellpadding='2' style='margin-left: 50px';>");
     struct slRef *childRef;
     tdbRefSortPrioritiesFromCart(cart, &tdbParent->children);
     for (childRef = tdbParent->children; childRef != NULL; childRef = childRef->next)
         {
         struct trackDb *sibTdb = childRef->val;
         if (sameString(sibTdb->track, tdb->track))
+            {
+            printf("<tr><b><td>%s</td>\n", sibTdb->shortLabel);
+            printf("<td>%s</td></b></tr>\n", sibTdb->longLabel);
             continue;
+            }
         printf("<tr>");
         //hPrintPennantIcon(sibTdb);
         printf("<td><a href='%s?%s=%s&c=%s&g=%s'>%s</a>&nbsp;</td>", 
                     tdbIsDownloadsOnly(sibTdb) ? hgFileUiName(): hTrackUiForTrack(sibTdb->track),
                     cartSessionVarName(), cartSessionId(cart), chromosome, cgiEncode(sibTdb->track), 
                     sibTdb->shortLabel);
         printf("<td>%s</td></tr>\n", sibTdb->longLabel);
         }
     printf("</table>");
 
+// TODO:  Add collapsed panel for Description
 
-/*
-   char *encodedMapName = cgiEncode(tdb->parent->track);
-    printf("&nbsp;&nbsp;<B style='font-size:100%%;'>"
-           "(<A HREF=\"%s?%s=%s&c=%s&g=%s\" title='Link to parent track'>"
-           "<IMG height=12 src='../images/ab_up.gif'>%s</A>)</B>",
-           hgTrackUiName(), cartSessionVarName(), cartSessionId(cart),
-           chromosome, encodedMapName, tdb->parent->shortLabel);
-
-    printf("<p>This track is part of a parent called <i>%s</i>. "
-            "To show other tracks of this parent, go to the "
-           "<A HREF=\"%s?%s=%s&c=%s&g=%s\" title='Link to parent track'>"
-           "%s</a> configuration page</A>.",
-           tdb->parent->shortLabel, hgTrackUiName(), cartSessionVarName(), cartSessionId(cart),
-           chromosome, encodedMapName, tdb->parent->shortLabel);
-    freeMem(encodedMapName);
-*/
-    printf("</div>");
+    printf("</p><p>&nbsp;&nbsp;<b>+ Description</b>\n");
+    printf("<hr>");
+    printf("</p>");
     }
 
+/* track configuration form */
+
 printf("<FORM ACTION=\"%s\" NAME=\""MAIN_FORM"\" METHOD=%s>\n\n",
        hgTracksName(), cartUsualString(cart, "formMethod", "POST"));
 cartSaveSession(cart);
 if (sameWord(tdb->track,"ensGene"))
     {
     char longLabel[256];
     struct trackVersion *trackVersion = getTrackVersion(database, tdb->track);
     if ((trackVersion != NULL) && !isEmpty(trackVersion->version))
         {
         if (!isEmpty(trackVersion->dateReference) && differentWord("current", trackVersion->dateReference))
             safef(longLabel, sizeof(longLabel), "Ensembl Gene Predictions - archive %s - %s", trackVersion->version, trackVersion->dateReference);
         else
             safef(longLabel, sizeof(longLabel), "Ensembl Gene Predictions - %s", trackVersion->version);
         }
     else
@@ -3259,31 +3243,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"))
+    if (trackDbSetting(tdb, "wgEncode") && !tdb->parent)
         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
         struct grp *grp, *grps = hLoadGrps(database);