Commit Graph
1820 Commits
Author SHA1 Message Date
Aysam Guerler 1799e4d5ee Add tool form basics, refactor ui libraries, add alternative tool form template 2014-08-13 13:53:07 -04:00
Carl Eberhard cee979bff6 Paired collection creator: better notifications, style tweaks 2014-08-13 13:43:09 -04:00
John Chilton d698c25f6e Merge latest stable. 2014-08-13 11:14:34 -04:00
Carl Eberhard 2354033521 Fix to 264657d: make infomessage and persistent across states; Style tweaks 2014-08-13 10:03:29 -04:00
Carl Eberhard 5ec0562d53 Datset list item: add resubmitted message; pack scripts 2014-08-12 13:56:26 -04:00
Carl Eberhard 39aa86e36d QA, casperjs: fix selectors changed in 7005608 2014-08-12 11:42:03 -04:00
Carl Eberhard 205c1ce638 History panel: clean up and documentation 2014-08-12 10:45:26 -04:00
Carl Eberhard 2d4e2a7523 History & collections: client-side file and class renaming: - li: readonly list item view, - li-edit: editable list item view, - primary identity first (eg. hda-*), - moved hda/hdca into history directory; Fix bug for dataset URLs 2014-08-12 09:38:08 -04:00
Jeremy Goecks fde948ff4d Trackster: fix location of gap line and read-pair connector line. 2014-08-11 11:18:46 -04:00
Carl Eberhard 0c540cdd43 HDA/Collections client-side refactoring for drill down view 2014-08-11 11:07:34 -04:00
Jeremy Goecks 163866b06e Trackster: refine label track position calculation. 2014-08-09 15:38:33 -04:00
John Chilton b79ed5931d Merge next-stable. 2014-08-07 09:36:41 -04:00
John Chilton 03ade2b298 Pack scripts. 2014-08-07 09:36:18 -04:00
John Chilton 4d5f0deebf Relax BibTeX parsing and accept header to handle figshare DOIs.
For instance 10.6084/m9.figshare.979190 reported by Michael Crusoe. JavaScript parser didn't like @data entries produced by figshare and when requesting the entry dx.doi.org returns a 403 response for type accept type text/bibliography, also allowing application/x-bibtex fixes this. Interestingly dx.doi.org throws 500 exceptions if application/x-bibtex is the only acceptable type or appears first for some other DOIs.
2014-08-07 09:35:43 -04:00
John Chilton c05cf525c7 Bugfix: Deal with BibTeX fields in a case insensitive fashion.
Would have thought the parser would have done this already - oh well.
2014-08-07 09:35:43 -04:00
John Chilton 41d95a903a Merge next-stable. 2014-08-06 11:20:43 -04:00
John Chilton 7250bdd4c2 Pack scripts. 2014-08-06 11:20:14 -04:00
John Chilton 2892c6f9f8 Fixup citation rendering for DOI resolution failures. 2014-08-06 11:19:48 -04:00
Jeremy Goecks 870f3c4e51 Trackster: stabilize tile boundary calculations so that tiles do not overlap or yield visual artifacts. 2014-08-06 10:28:01 -04:00
John Chilton 51306cc343 Merge next-stable. 2014-08-06 09:37:23 -04:00
John Chilton 947ac3d2bf Pack scripts. 2014-08-06 09:37:08 -04:00
John Chilton e5d1910529 Fix-up citation related GUI.
Was displaying warning message about history citations being potentially incomplete for tools - which if they have annotated citations we should assume they are complete.
2014-08-06 09:36:30 -04:00
John Chilton 64915e9716 Merge next-stable. 2014-08-04 15:02:01 -04:00
Jeremy Goecks f158a4e447 Trackster: fix single-pixel gap bug in quantitative track display. 2014-08-04 14:50:28 -04:00
Jeremy Goecks 1c8412e726 Automated merge of next-stable into default. 2014-08-03 15:57:51 -04:00
Jeremy Goecks 244d861077 Trackster: remove visual artifact resulting from overlapping tiles when zoomed in at the base level. Pack scripts. 2014-08-03 15:57:04 -04:00
John Chilton f53fd0310a Pack scripts for recent commits. 2014-07-28 14:59:38 -04:00
John Chilton 0fbdd6de60 Merged in jmchilton/galaxy-central-fork-1 (pull request #442)
More generic logic for checking empty histories.
2014-07-28 13:21:29 -04:00
John Chilton ebe93b1673 Merged in jmchilton/galaxy-central-fork-1 (pull request #440)
Initial BibTeX/DOI citation support in tools and histories.
2014-07-28 13:15:32 -04:00
Carl Eberhard 4762943341 Collections view drill-down: (still a work in progress) allow overlay of collection panel view over *current* history panel (not implemented for other history panels), refactoring of history/hda/collections; remove unused init_history_items; pack scripts 2014-07-31 12:05:26 -04:00
John Chilton 260edf1a98 Modify @erasche2's tool share button to pop-up instructions for copy&pasting URL...
... per @martenson's suggestion and with @erasche2 permission.

Wonder if we want to double down on these buttons and convert tool shed link and citations handling to use this mechanism or perhaps add a drop down "gear" menu with these options ala the history panel.
2014-07-30 22:01:02 -04:00
John Chilton ea457f560c More generic logic for checking empty histories.
This fixes a bug where web UI short circuits rendering of history panel if history only contains dataset collections and no datasets.

The most obvious alternative to this would be to 1) add collection information to the per-content state ids dict - which may not make a lot of sense since we haven't nailed down exactly what collection states should look like and if they will be drawn from the same possible set of states as dataset states or 2) build a separate set of state summaries for dataset collections. In addition to these two approaches being more work, they also lock the API into more expensive queries by default.
2014-07-24 21:20:08 -05:00
John Chilton 4be064c007 Small UI fix for data param multirun options.
Index-based logic wasn't updated after made it so certain options wouldn't be visible if they were not valid for a given history.
2014-07-24 14:30:11 -05:00
Jeremy Goecks f5fef7a8c9 Trackster: resolve name collision due to refactoring. 2014-07-24 09:26:39 -04:00
John Chilton cb9fc095fc Initial BibTeX/DOI citation support in tools and histories.
Allow tool authors to specify citations using a DOI or BibTeX. BibTeX can be specified either by pointing at a BibTeX file in the tool directory or by embedding bibtex entries right in tool citation blocks. If referencing a file parallel to the tool, the file should contain only a single BibTeX entry, this restriction can be easily lifted by adding a BibTeX parser as a Python dependency for Galaxy - but I do not have permission to do this.

These citations will appear at the bottom of the tool form in a formatted way but the user will have to option to select RAW BibTeX for copying and pasting. Likewise, the history menu now has an option allowing users to aggregatesuch citations across an analysis a comparable list of citations.

UI interactions are implemented using a Backbone model and view and data is fetched from the Galaxy server as BibTeX using the API. Two API entry points have been added - one to fetch the BibTeX entries for a tool and another for a history.

BibTeX entries for citations annotated with DOIs will be fetched from http://dx.doi.org/ and cached using Beaker.

Additional Limitations:

 - I am not super happy with a few different GUI elements of this. It is ugly and I didn't write the BibTeX parser but I did write the code that takes parsed BibTeX and converts it to a formatted entry. If merged, I will outline a Trello card to follow up and improve the UI and find some more standard way to build a formatted HTML citation from a parsed BibTeX entry.

 - BibTeX Limitations: LaTeX embedded in the BibTeX entries doesn't render properly when producing a "pretty" citation in the GUI (should still be exported to citation managers properly though). Cross references aren't supported at this time.

Alternative Implementations:

BibTex/DOI vs. PROV:

There was some discussion of PROV encoding citation information on the development mailing list. The citation tags on tools are typed so this could certainly be added - but it was discussed at the BOSC 2014 codefest and there was some conensus that tool authors are more likely to already have BibTeX or DOIs available for the tool's references and the major reference managers end users will likely plug these citations into while writing papers are more likely to be able to consume BibTeX than anything else.

The bench biologist using Galaxy is the consumer of this work I most concerned with - if we need to convert citations into other formats such as EndNote or Word's bibliography support there is a suite of tools we could optionally plug into Galaxy (http://sourceforge.net/p/bibutils/home/Bibutils/) to enable this down the road. PROV seems to have such an ecosystem to leverage - I could not even find a tool to convert it BibTeX.

Parse BibTeX Client vs Server:

As mentioned above it would be nice in some ways to be able to parse and reason about BibTeX on the backend - but it would require adding a new dependency to Python. Since we have to ship BibTeX to the browser anyway to allow users to copy and paste it - I decided it was easier to start with parsing and formatting BibTeX on the client side. I therefore added the following library BSD JavaScript dependency https://github.com/mayanklahiri/bib2json to enable this. I would be happy to revisit this decision and produce formatted entries server side - there seem to be more Python options for doing this than JavaScript.
2014-07-23 15:43:13 -05:00
Carl Eberhard de12ab8aa9 History/Collection/HDA MVC: refactoring; Base MVC: create mixin shortcut to extend, use with HistoryContentMixin; Pages: allow display of collections; HDAs: fix annotation default overwriting existing when only partial model is saved; Style: begin separation of collections styles and prep for DOM class renaming; pack scripts 2014-07-23 12:59:04 -04:00
Jeremy Goecks 6a3344ea24 Trackster: do not reset overview when changing chromosome. 2014-07-21 13:23:41 -04:00
Jeremy Goecks 7e506617d9 Trackster: some fixes for vertical position element. 2014-07-21 10:27:44 -04:00
Jeremy Goecks e7f68902ab Trackster: remove bottom label track because it is redundant. 2014-07-21 10:26:18 -04:00
Jeremy Goecks 8f4e28a3b9 Use jquery to remove event handler. 2014-07-21 10:19:14 -04:00
Jeremy Goecks b752a6a065 Update embedded visualizations to work with recent refactoring. 2014-07-17 16:53:04 -04:00
Jeremy Goecks 674eba1ca0 Remove duplicated function definition. 2014-07-17 16:34:20 -04:00
Jeremy Goecks 19edf28795 Trackster: merge all top-level UI code into the same file for simplicity. 2014-07-17 16:23:17 -04:00
Jeremy Goecks a433287dbe Trackster: remove unused requirements. 2014-07-17 15:44:45 -04:00
Jeremy Goecks 3d8862608d Visualization framework bug fixes + remove debugging statement. 2014-07-15 15:41:38 -04:00
Jeremy Goecks e3ea3e3c72 Trackster: mark visualization changed when tracks change. 2014-07-15 12:41:06 -04:00
Jeremy Goecks 20fbc8a5a0 Trackster: bug fixes for managing state. 2014-07-15 12:33:54 -04:00
Jeremy Goecks 6f232d9bc7 Trackster: add dialog to indicate changes will be lost if navigating away from the viz. 2014-07-15 12:19:47 -04:00
Jeremy Goecks 27729a85e8 Trackster: readd long lost code to detect unsaved changes and prompt to save on exit. 2014-07-15 11:07:41 -04:00
Jeremy Goecks 37ceea37ce Visualization bug fixes. 2014-07-14 14:07:04 -04:00