search

bgruening / galaxy-ipython

:microscope::books: IPython Integration into Galaxy
MIT License
31 stars 14 forks source link

IE Mako + JS Refactor #26

Closed hexylena closed 10 years ago

hexylena commented 10 years ago

This is a massive refactor of the JS + templates to try and separate out code that is general to all IEs from code that is specific to IPython as a Galaxy IE.

Templates

A notebook is now {name}.mako in the templates/ directory. It loads ie.mako which contains numerous routines for handling various IE aspects. Much of the conf file preparation was also moved into ie.mako as we should probably standardise the conf.yaml file across all IEs. Only the IPyNB specific code remains in ipython.mako.

JS

JS was refactored into two files, one containing IE generic JS, and one containing IPython specific JS (the login routines). There is room for improvement there, but I'm not that much of a JS person so help is welcome.

Final Notes

With this progress done, we can probably split out a "IE base" repository containing just what's needed to bootstrap an IE.

hexylena commented 10 years ago

Let me know if you'd prefer if I squashed some of these commits down before merging. I don't want to be the cause of lots of history clutter.

bgruening commented 10 years ago

Hi Eric,

I like the idea. I had hoped to move all the functions from ie.mako into Galaxy at some point, but for the time being it is good to have it separated. I haven't had a chance to test it yet. Have to prepare a little bit for some Galaxy workshops, but feel free to merge. I will test tomorrow.

hexylena commented 10 years ago

Yeah, having these in galaxy instead of as a mako template will surely be the better route. Now that IPython is fully working and much cleaner, and RStudio is well on its way, we have a much better case for having ie.mako as part of the viz framework in galaxy.

bgruening commented 10 years ago

@erasche any objections to merge your re factoring?

hexylena commented 10 years ago

No, none, looks good to me

On October 7, 2014 9:19:30 PM GMT+00:00, "Björn Grüning" notifications@github.com wrote:

@erasche any objections to merge your re factoring?

Reply to this email directly or view it on GitHub: https://github.com/bgruening/galaxy-ipython/pull/26#issuecomment-58264326

Sent from my Android device with K-9 Mail. Please excuse my brevity.

bgruening commented 10 years ago

Thanks Eric!