…n all pages.
* master: Group the published graphs by the test_description as the test name is not guarenteed to be unique in MGP land. refs #4661 Update jQuery TableSorter to 2.0.5b - seems to resolve the errors that we were seeing when compressed with closure compiler. typo correction: mamalian -> mammalian Set the content type of static files using Rack::Mime. switch the deployment to use http instead of git. Fix for the 'index_concatenated_ontology_terms' method - it was not taking into account the times when the term description follows the id etc... Bugfix - I had too many 'use_to_map' directives Start to index the MP terms from the MGP Paramater Level Heatmap. refs #4661 Add some error catching into the 'wtsi_phenotyping_progress_counts' method. Method rename: complete_mgp_genes_count -> complete_mgp_alleles_count it's more correct. Clean up the wtsi_phenotyping_counts function - now looks like we're getting the right counts! :) closes #4136 Sinatra will now handle serving up the MGP heatmap (setting the correct cache headers etc). - Remove the heatmap tooltip template (no longer used) - Put a few 'Still under development' markers where things aren't finished - rename 'skin_screen' templates to 'tail_epidermis_wholemount' Put in a temporary test-based heatmap (almost identical to MGP) so that we can try and get something out the door before concentrating on the MP heatmap. Updated Gemfile.lock Conflicts: config/deploy.rb config/index_builder/index_builder.json
…s not guarenteed to be unique in MGP land. refs #4661
…t we were seeing when compressed with closure compiler.
…aking into account the times when the term description follows the id etc...
… it's more correct.
…getting the right counts! :) closes #4136
…ct cache headers etc).
- Put a few 'Still under development' markers where things aren't finished - rename 'skin_screen' templates to 'tail_epidermis_wholemount'
…at we can try and get something out the door before concentrating on the MP heatmap.
* master: Bugfix to stop the project page blowing up when we have problems retrieving data from the search index. (see http://htgt.internal.sanger.ac.uk:4007/apps/ikmc-mouse-portal/errs/4d9a0f5d26c72546ae000002)
…ieving data from the search index. (see http://htgt.internal.sanger.ac.uk:4007/apps/ikmc-mouse-portal/errs/4d9a0f5d26c72546ae000002)
…ines from EMMA. closes #4627
…ay of preparing the browse controls.
* master: (21 commits) When we have no data to display (for a dataview etc) instead of hiding the bubbles entirely, display a generic greyed out one. closes #4407 Update the WTSI MGP front-page counts with new logic from Jaqui. refs #4136 Re-suppress the 'mice in progress' on the project page. Start showing mirKO images! Updated the project page to be able to link to UCSC human. Updated the code for the UCSC genome browser links to be a bit more generic. refs #4583 Update the project page 'Mice' so that we now show MI's in progress with the same level of detail as the genotype confirmed ones. Also updated the order button logic to give 'express interest' links for these MI's that are in progress. closes #4470 Updated the main search idcc_targ_rep grab to get the cassette type out of the targ_rep biomart rather than try to work it out. Added the cassette_type to the project report page. Fixed the ordering of the downloadable heatmap legend. Updated Sinatra to the latest release. Transpose the ES Cell Summary table. In Mice - override the allele_name if we have a corrected one stored in Kermits. Test suite fixes. Correct labelling of the allele type throughout the project page and added it to the mutagenesis prediction too. closes #4488 Move the allele_type method back into the DataSetUtils Move the allele_type function into the SeverViewHelpers. Flesh out the allele_type helper to cover more of the derivative alleles. Refactor the ServerViewHelpers out into smaller module files. Re-ordered the WTSI HeatMap columns upon Jacqui's request. ...
…g the bubbles entirely, display a generic greyed out one. closes #4407