a4ed1e0d2c39286d95a53d98db4b0bdc51836260
Merge parents 7ab9bea 3c4e793
larrym
  Wed Jul 25 15:20:22 2012 -0700
resolve merge conflict with master
diff --cc src/hg/lib/hui.c
index 6d7f11a,b5c3565..1750298
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@@ -371,48 -409,55 +409,48 @@@
      return cloneString(message);
      }
  /* If the file is there but not readable, readInGulp will errAbort,
   * but I think that is serious enough that errAbort is OK. */
  char *result;
  readInGulp(path, &result, NULL);
  return result;
  }
  
  char *hCgiRoot()
  /* get the path to the CGI directory.
   * Returns NULL when not running as a CGI (unless specified by browser.cgiRoot) */
  {
  static char defaultDir[PATH_LEN];
  char *scriptFilename = getenv("SCRIPT_FILENAME");
- if(scriptFilename)
+ if (scriptFilename)
      {
      char dir[PATH_LEN], name[FILENAME_LEN], extension[FILEEXT_LEN];
      dir[0] = 0;
      splitPath(scriptFilename, dir, name, extension);
      safef(defaultDir, sizeof(defaultDir), "%s", dir);
      int len = strlen(defaultDir);
      // Get rid of trailing slash to be consistent with hDocumentRoot
-     if(defaultDir[len-1] == '/')
+     if (defaultDir[len-1] == '/')
          defaultDir[len-1] = 0;
      }
  else
      {
      defaultDir[0] = 0;
      }
  return cfgOptionDefault("browser.cgiRoot", defaultDir);
  }
  
 -char *hBackgroundImage()
 -/* get the path to the configured background image to use, or the default */
 -{
 -
 -return cfgOptionDefault("browser.background", DEFAULT_BACKGROUND);
 -}
 -
  /******  Some stuff for tables of controls ******/
  
  struct controlGrid *startControlGrid(int columns, char *align)
  /* Start up a control grid. */
  {
  struct controlGrid *cg;
  AllocVar(cg);
  cg->columns = columns;
  cg->align = cloneString(align);
  cg->rowOpen = FALSE;
  return cg;
  }
  
  void controlGridEndRow(struct controlGrid *cg)
  /* Force end of row. */