974cc2a7d3e09e51252b36281d7e17a3897fdf18
Merge parents 0cc76b8 205aa46
galt
  Thu Jun 8 21:02:28 2017 -0700
resolved merge conflict

diff --cc src/hg/lib/tablesTables.c
index 9fd88d0,15a5ac2..830ef6f
--- src/hg/lib/tablesTables.c
+++ src/hg/lib/tablesTables.c
@@@ -27,49 -27,53 +27,50 @@@
  while ((row = sqlNextRow(sr)) != NULL)
      fieldedTableAdd(table, row, fieldCount, ++i);
  sqlFreeResult(&sr);
  return table;
  }
  
  static void showTableFilterInstructionsEtc(struct fieldedTable *table, 
      char *itemPlural, struct  fieldedTableSegment *largerContext, void (*addFunc)(void))
  /* Print instructional text, and basic summary info on who passes filter, and a submit
   * button just in case user needs it */
  {
  /* Print info on matching */
  int matchCount = slCount(table->rowList);
  if (largerContext != NULL)  // Need to page?
       matchCount = largerContext->tableSize;
 +
  cgiMakeButton("submit", "search");
  
 -printf("&nbsp;<button id='resetLink'>Reset filters</button>\n");
 -jsInlineF(
 -"$(function() {\n"
 -"  $('#resetLink').click( function() { "
 -"     $(':input').not(':button, :submit, :reset, :hidden, :checkbox, :radio').val('');\n"
 -"     $('#submit').click();\n"
 -"  });"
 -"});\n");
 +printf("&nbsp&nbsp;");
 +cgiMakeOnClickButton("clearButton",
 +"$(':input').not(':button, :submit, :reset, :hidden, :checkbox, :radio').val('');\n"
 +"$('[name=cdwBrowseFiles_page]').val('1');\n"
 +"$('#submit').click();\n"
 +, "clear search");
 +printf("<br>");
+ 
 -printf("&nbsp;&nbsp;&nbsp&nbsp;");
  printf("%d&nbsp;%s&nbsp;found. ", matchCount, itemPlural);
  
 -
  if (addFunc)
      addFunc();
  
  printf("<BR>\n");
  printf("You can further filter search results field by field below. ");    
  printf("Wildcard * and ? characters are allowed in text fields. ");
  printf("&GT;min or &LT;max are allowed in numerical fields.<BR>\n");
 -//printf("<a href='#' >Reset all filters</a>\n");
  }
  
  static void printSuggestScript(char *id, struct slName *suggestList)
  /* Print out a little javascript to wrap auto-suggester around control with given ID */
  {
  struct dyString *dy = dyStringNew(256);
  dyStringPrintf(dy,"$(document).ready(function() {\n");
  dyStringPrintf(dy,"  $('#%s').autocomplete({\n", id);
  dyStringPrintf(dy,"    delay: 100,\n");
  dyStringPrintf(dy,"    minLength: 0,\n");
  dyStringPrintf(dy,"    source: [");
  char *separator = "";
  struct slName *suggest;
  for (suggest = suggestList; suggest != NULL; suggest = suggest->next)
      {