a4ed1e0d2c39286d95a53d98db4b0bdc51836260
Merge parents 7ab9bea 3c4e793
larrym
  Wed Jul 25 15:20:22 2012 -0700
resolve merge conflict with master
diff --cc src/hg/inc/web.h
index 3bcea20,3ddc7f3..8ccc32a
--- src/hg/inc/web.h
+++ src/hg/inc/web.h
@@@ -255,37 -255,31 +255,37 @@@
  void webFinishPartialLinkTable(int rowIx, int itemPos, int maxPerRow);
  /* Fill out partially empty last row. */
  
  void webFinishPartialLinkOutTable(int rowIx, int itemPos, int maxPerRow);
  /* Fill out partially empty last row. */
  
  boolean validateGisaidUser(struct cart *cart);
  /* validate if the web user is an authenticated GISAID user */
  
  char *webTimeStampedLinkToResource(char *fileName, boolean wrapInHtml);
  // Returns full path of timestamped link to the requested resource file (js, or css).
  // If wrapInHtml, then returns link embedded in style or script html. Free after use.
  // NOTE: png, jpg and gif should also be supported but are untested.
  
  char *webTimeStampedLinkToResourceOnFirstCall(char *fileName, boolean wrapInHtml);
- // If this is the first call, will
- //   Return full path of timestamped link to the requested resource file (js, or css).  Free after use.
+ // If this is the first call, will Return full path of timestamped link to the
+  // requested resource file (js, or css).  Free after use.
  // else returns NULL.  Useful to ensure multiple references to the same resource file are not made
  // NOTE: png, jpg and gif should also be supported but are untested.
  
  boolean webIncludeResourcePrintToFile(FILE * toFile, char *fileName);
  // Converts fileName to web Resource link and prints the html reference
  // This only prints and returns TRUE on first call for this resource.
  // Passing in NULL as the file pointer results in hPrintf call
  // The reference will be to a link with timestamp.
  #define webIncludeResourceFile(fileName)  webIncludeResourcePrintToFile(NULL,fileName)
  
  void lazarusLives(unsigned long newExpireSeconds);
  /* Long running process requests more time */
  
 +void setContextSpecificHelp(char *link, char *label);
 +// Override default behavior for the context specific help link
 +
 +char *menuBar(struct cart *cart);
 +// return HTML for the menu bar (read from a configuration file).
 +
  #endif /* WEB_H */