161bbf1dd3f8a31bc47ae49e10ac558cdd358586 tdreszer Mon Jul 11 15:16:48 2011 -0700 Fix for redmine 2763. Return to browser from ps/pdf page now works. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index ba723a1..5bd73e7 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -5335,57 +5335,56 @@ struct tempName psTn, ideoPsTn; char *pdfFile = NULL, *ideoPdfFile = NULL; ZeroVar(&ideoPsTn); trashDirFile(&psTn, "hgt", "hgt", ".eps"); hotLinks(); printf("<H1>PostScript/PDF Output</H1>\n"); printf("PostScript images can be printed at high resolution " "and edited by many drawing programs such as Adobe " "Illustrator."); doTrackForm(psTn.forCgi, &ideoPsTn); // postscript printf("<UL>\n"); printf("<LI><A HREF=\"%s\">Click here</A> " - "to download the current browser graphic in PostScript. ", psTn.forCgi); + "to download the current browser graphic in PostScript.\n", psTn.forCgi); if (strlen(ideoPsTn.forCgi)) printf("<LI><A HREF=\"%s\">Click here</A> " - "to download the current chromosome ideogram in PostScript. ", ideoPsTn.forCgi); + "to download the current chromosome ideogram in PostScript.\n", ideoPsTn.forCgi); printf("</UL>\n"); pdfFile = convertEpsToPdf(psTn.forCgi); if (strlen(ideoPsTn.forCgi)) ideoPdfFile = convertEpsToPdf(ideoPsTn.forCgi); if(pdfFile != NULL) { printf("<BR>PDF can be viewed with Adobe Acrobat Reader.\n"); printf("<UL>\n"); printf("<LI><A TARGET=_blank HREF=\"%s\">Click here</A> " - "to download the current browser graphic in PDF.", pdfFile); + "to download the current browser graphic in PDF.\n", pdfFile); if (ideoPdfFile != NULL) printf("<LI><A TARGET=_blank HREF=\"%s\">Click here</A> " - "to download the current chromosome ideogram in PDF.", ideoPdfFile); + "to download the current chromosome ideogram in PDF.\n", ideoPdfFile); printf("</UL>\n"); freez(&pdfFile); freez(&ideoPdfFile); } else printf("<BR><BR>PDF format not available"); - #define RETURN_BUTTON "<FORM ACTION='../cgi-bin/hgTracks' NAME='TrackHeaderForm' id='TrackHeaderForm' METHOD='GET'><INPUT TYPE=SUBMIT ID='ChangeToNameToSetSomething' VALUE='Return to Browser'></FORM>" - printf(RETURN_BUTTON); + printf("<a href='../cgi-bin/hgTracks'><input type='button' VALUE='Return to Browser'></a>\n"); } boolean isGenome(char *pos) /* Return TRUE if pos is genome. */ { pos = trimSpaces(pos); return(sameWord(pos, "genome") || sameWord(pos, "hgBatch")); } void setRulerMode() /* Set the rulerMode variable from cart. */ { char *s = cartUsualString(cart, RULER_TRACK_NAME, "dense"); if (sameWord(s, "full") || sameWord(s, "on")) rulerMode = tvFull;