Commits for kate

v361_preview2 to v361_base (2018-02-05 to 2018-02-12) v361

80cc890ea7fc9beba757866c51c12d68163054bb Wed Dec 20 10:48:56 2017 -0800

• Remove abandoned experimental 'interactions' track type code from 2011 (with Braney's blessing). Cleanup before implementing new interaction track type (bigInteraction ?). refs #17512
  • src/hg/hgTracks/simpleTracks.c - lines changed 90, context: html, text, full: html, text

23916ada8455250e65ae40715e4e7af954308ac7 Tue Feb 6 13:05:35 2018 -0800

• UI polish for hgCollection. Noting that use of col-* tags requires 12 columns per row (see template.html). Also, all rows should have at least one col-tag (i.e. col-12). Also note this uses hgGtexTransSettings CSS, so test that too. TODO is to move shared settings to gb.css. refs #11630
  • src/hg/htdocs/inc/hgCollection.html - lines changed 32, context: html, text, full: html, text
  • src/hg/htdocs/style/gb.css - lines changed 1, context: html, text, full: html, text
  • src/hg/htdocs/style/hgGtexTrackSettings.css - lines changed 4, context: html, text, full: html, text

89a18d8a50d49b7829b15f2cfe50c6513d69b424 Tue Feb 6 13:53:00 2018 -0800

• Merge branch 'hgcomp'

a27be95a97e1207fe1bbdae5ea56cc36bb4f32cc Wed Feb 7 11:09:02 2018 -0800

• Fix help doc for hgCollection. It was using static page framework but it's a CGI include. refs #11630
  • src/hg/htdocs/goldenPath/help/hgCollectionHelp.html - lines changed 11, context: html, text, full: html, text

d8eaa59da8e3a09dff40d34a244e469e4af52d35 Thu Feb 8 10:42:26 2018 -0800

• Reorg help doc so it can be included by CGI and used as static page. refs #11630
  • src/hg/htdocs/goldenPath/help/hgCollectionHelp.html - lines changed 91, context: html, text, full: html, text
  • src/hg/htdocs/inc/hgCollectionHelpInclude.html - lines changed 88, context: html, text, full: html, text

66ec629db80c84d3524928baf4882560c8cf1b98 Thu Feb 8 11:36:19 2018 -0800

• Fixes to reorged hgCollection help. refs #11630
  • src/hg/hgCollection/hgCollection.c - lines changed 16, context: html, text, full: html, text
  • src/hg/htdocs/goldenPath/help/hgCollectionHelp.html - lines changed 2, context: html, text, full: html, text
  • src/hg/htdocs/inc/hgCollection.html - lines changed 1, context: html, text, full: html, text

eac9b169f8045be881c639db50043c5ae4077ecf Thu Feb 8 11:37:58 2018 -0800

• Resolve merge conflict. refs #11630
  • src/hg/htdocs/goldenPath/help/hgCollectionHelp.html - lines changed 4, context: html, text, full: html, text

99b6e480a0fb44c4fa413c145856673955abd850 Thu Feb 8 12:12:10 2018 -0800

• Adopt/adapt some styles from static pages, for use in CGI generated/included HTML such as track descriptions and help text. refs #11630
  • src/hg/htdocs/style/gb.css - lines changed 45, context: html, text, full: html, text

f2ad76999f3ae6b0d99bfbcf281853e49743df3d Thu Feb 8 12:13:13 2018 -0800

• Merge in Cath's newest draft of help docl, and markup a little for new styles. refs #11630
  • src/hg/htdocs/inc/hgCollectionHelpInclude.html - lines changed 86, context: html, text, full: html, text

30724b480205230461795413486e96f87f1e847f Thu Feb 8 12:14:15 2018 -0800

• Move help text to include dir. refs #11630
  • src/hg/htdocs/goldenPath/help/hgCollectionHelpText.html - lines changed 136, context: html, text, full: html, text

3f682d77e84d372c3b0c156f56a2368d34f9a4de Thu Feb 8 12:16:23 2018 -0800

• Label change, approved by Cath. refs #11630
  • src/hg/htdocs/inc/hgCollection.html - lines changed 1, context: html, text, full: html, text