88e2c1191f3d6bbccacd04aaaa9432e675e6b8fb braney Fri Apr 17 13:39:31 2015 -0700 change message for redirect (#15110) diff --git src/hg/lib/web.c src/hg/lib/web.c index 9f3bd44..8f2a988 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -1443,42 +1443,37 @@ char *geoSuffix = cfgOptionDefault("browser.geoSuffix",""); char query[1056]; sqlSafef(query, sizeof query, "select domain from gbNode%s where node = %d", geoSuffix, node); char *newDomain = sqlQuickString(centralConn, query); char *oldDomain = cgiServerName(); char *port = cgiServerPort(); char *uri = cgiRequestUri(); char *sep = strchr(uri, '?') ? "&" : "?"; int newUriSize = strlen(uri) + 1024; char *newUri = needMem(newUriSize); char *oldUri = needMem(newUriSize); safef(oldUri, newUriSize, "http%s://%s:%s%s%sredirect=manual&source=%s", cgiServerHttpsIsOn() ? "s" : "", oldDomain, port, uri, sep, oldDomain); safef(newUri, newUriSize, "http%s://%s:%s%s%sredirect=manual&source=%s", cgiServerHttpsIsOn() ? "s" : "", newDomain, port, uri, sep, oldDomain); - struct dyString *dy = dyStringNew(256); - cartCheckForCustomTracks(cart, dy); printf("<TR><TD COLSPAN=3 id='redirectTd' onclick=\"javascript:document.getElementById('redirectTd').innerHTML='';\">" "<div style=\"margin: 10px 25%%; border-style:solid; border-width:thin; border-color:#97D897;\">" "<h3 style=\"background-color: #97D897; text-align: left; margin-top:0px; margin-bottom:0px;\">" " You might want to navigate to your nearest mirror - %s" - "<idiv style=\"float:right;\">[x]</idiv>" "</h3> " - "<ul style=\"margin:5px;\">" - "<li>Take me to <a href=\"%s\">%s</a>" - "<idiv style=\"float:right;\"><a href=\"../goldenPath/help/genomeEuro.html\">What is this?</a></idiv>" - "</li>", - newDomain, newUri, newDomain); - - printf("<li>Let me stay here <a href=\"%s\">%s</a>" - "</ul>" - "</div>" - "</TD></TR>\n", + "<ul style=\"margin:5px;\">", + newDomain); + + printf("<li>User settings (sessions and custom tracks) will differ between sites." + "<idiv style=\"float:right;\"><a href=\"../goldenPath/help/genomeEuro.html#sessions\">Read more.</a></idiv>"); + printf("<li>Take me to <a href=\"%s\">%s</a> </li>", + newUri, newDomain); + printf("<li>Let me stay here <a href=\"%s\">%s</a>", oldUri, oldDomain ); - printf("%s\n", dy->string); + printf("</div></TD></TR>\n"); exit(0); } hDisconnectCentral(¢ralConn); } } }