a79d2f3bd1986f434379d2e8dd96221f9f5bb339
braney
  Wed May 4 12:14:23 2011 -0700
changed some things around in response to Greg's comments #704
diff --git src/hg/hgHubConnect/hgHubConnect.c src/hg/hgHubConnect/hgHubConnect.c
index f647db2..c2e9964 100644
--- src/hg/hgHubConnect/hgHubConnect.c
+++ src/hg/hgHubConnect/hgHubConnect.c
@@ -104,39 +104,39 @@
     else
 	webPrintLinkCell(hub->errorMessage);
     webPrintLinkCell(hub->hubUrl);
     }
 if (count)
     webPrintLinkTableEnd();
 else
     printf("No Private Track Hubs for this genome assembly<BR>");
 }
 
 static void makeNewHubButton()
 {
 printf("<FORM ACTION=\"%s\" METHOD=\"POST\" NAME=\"secondForm\">\n", "../cgi-bin/hgHubConnect");
 cartSaveSession(cart);
 cgiMakeHiddenVar(hgHubDoAdd, "on");
-cgiMakeButton("add", "add new private hub");
+cgiMakeButton("add", "Add new private hub");
 printf("</FORM>\n");
 }
 
 static void makeGenomePrint()
 {
 getDbAndGenome(cart, &database, &organism, oldVars);
-printf("<B>genome:</B> %s &nbsp;&nbsp;&nbsp;<B>assembly:</B> %s &nbsp;&nbsp;&nbsp;[%s] ", 
-	organism, hFreezeDate(database), database);
+printf("<B>genome:</B> %s &nbsp;&nbsp;&nbsp;<B>assembly:</B> %s  ", 
+	organism, hFreezeDate(database));
 }
 
 void hgHubConnectPublic()
 /* Put up the list of external hubs and other controls for the page. */
 {
 printf("<B>List of Public Hubs</B><BR>");
 struct sqlConnection *conn = hConnectCentral();
 char query[512];
 safef(query, sizeof(query), "select id,shortLabel,longLabel,errorMessage,hubUrl,dbList from %s", 
 	hubConnectTableName); 
 struct sqlResult *sr = sqlGetResult(conn, query);
 char **row;
 
 boolean gotAnyRows = FALSE;
 while ((row = sqlNextRow(sr)) != NULL)
@@ -316,52 +316,54 @@
     hubSaveInCart(cart, hub);
     }
 }
 
 void doMiddle(struct cart *theCart)
 /* Write header and body of html page. */
 {
 cart = theCart;
 setUdcCacheDir();
 if (cartVarExists(cart, hgHubDoAdd))
     doAddPrivateHub(cart, NULL);
 else
     {
     cartWebStart(cart, NULL, pageTitle);
     checkForNewHub(cart);
-    printf("<FORM ACTION=\"%s\" METHOD=\"POST\" NAME=\"mainForm\">\n", destUrl);
-    cartSaveSession(cart);
-
-    cgiMakeHiddenVar(hgHubConnectRemakeTrackHub, "on");
 
     printf(
        "<P>Track data hubs are collections of tracks from outside of UCSC that can be imported into "
        "the Genome Browser.  To import a public hub check the box in the list below. "
        "After import the hub will show up as a group of tracks with its own blue "
-       "bar and label underneath the main browser graphic, and in the configure page. To arrange "
-       "for your own track data hub to appear in this list, please contact genome@soe.ucsc.edu.</P>\n"
+       "bar and label underneath the main browser graphic, and in the configure page. </P>\n"
        );
     makeGenomePrint();
-    cgiMakeSubmitButton();
 
-    printf("<BR>");
+    printf("<BR><P>");
     hgHubConnectPublic();
+    printf("Contact <A HREF=\"mailto:genome@soe.ucsc.edu\"> genome@soe.ucsc.edu </A>to add a public hub.</P>\n");
     puts("<BR>");
     hgHubConnectPrivate();
+    makeNewHubButton();
+    puts("<BR>");
+
+    printf("<FORM ACTION=\"%s\" METHOD=\"POST\" NAME=\"mainForm\">\n", destUrl);
+    cartSaveSession(cart);
+
+    cgiMakeHiddenVar(hgHubConnectRemakeTrackHub, "on");
+    cgiMakeButton("Submit", "Use Selected Hubs");
     puts("</FORM>");
 
-    makeNewHubButton();
     }
 cartWebEnd();
 }
 
 char *excludeVars[] = {"Submit", "submit", "hc_one_url", hgHubConnectCgiDestUrl, hgHubDoAdd, hgHubDataText, NULL};
 
 int main(int argc, char *argv[])
 /* Process command line. */
 {
 oldVars = hashNew(10);
 cgiSpoof(&argc, argv);
 cartEmptyShell(doMiddle, hUserCookie(), excludeVars, oldVars);
 return 0;
 }