code layout

[will-moore]

This moves all the source code js and templates files out of the Django app static directory into a new top-level src directory.

The grunt jst and concat tasks compile templates and concatenate js files into omero_figure/static/figure/templates.js and omero_figure/static/figure/figure.js.

All subsequent PRs will need to be on top of this one to avoid conflicts. To test:

• $ grunt watch
• Edit a js file under src/js, Save -> Grunt should concat -> figure.js
• Edit a template under src/templates, Save -> Grunt will compilte -> templates.js

NB: removed the build date that is updated with every concat of figure.js to reduce conflicts between PRs.

cc @bramalingam Best test of this PR is to begin a new feature on top of it.

[atarkowska]

templates has to stay under omero_figure otherwise they won't be part of pypi package

"NetworkError: 404 Not Found - https://cowfish.openmicroscopy.org/webtrial/static/figure/templates.js?version=2.0.0"
templat...n=2.0.0
ReferenceError: JST is not defined

roiTemplate: JST["src/templates/modal_dialogs/roi_modal_roi.html"],

[atarkowska]

could you also bump version to 2.0.1-dev?

[will-moore]

I think we decided not to use -dev in version numbers now? cc @jburel @sbesson We discussed proposal to use branches instead of -dev flag.

[will-moore]

@aleksandra-tarkowska The source templates don't need to be in the pypi package. Only the compiled templates.js file does (and it has moved from static/figure/js/templates.js -> static/figure/templates.js).

[will-moore]

Do we bump to version 2.0.1 now or at release time?

[atarkowska]

yes, but templates.js is not there

[jburel]

Could you roll back the license change from c40d049? I had to fix other similar issues in https://github.com/ome/omero-figure/pull/181.

[jburel]

Closing this PR so we can fix the set up first #181

[will-moore]

@bramalingam You want to try starting some work on top of this PR in order to review these changes?

[will-moore]

@bramalingam Now that you're working on top of this branch, please add any comments here about code layout. If you're happy with it, we can merge this then you can go back to working on top of master. Thanks.

[will-moore]

@bramalingam This new code layout is good to merge?

[bramalingam]

Opened a PR on top of this branch, https://github.com/ome/omero-figure/pull/187: Looks good to merge.

[will-moore]

@jburel If you could merge this, then we can rebase & cleanup the other 3 PRs on top of it, thanks.

[jburel]

what was the reason for commenting out the "jasmine" target? if it is no longer needed, remove it. and maybe,in that case, remove the link in readme" why grunt and jasmine Also it will be nice to have a "grunt clean" when we removed the concatenated file from the rep but that can be done in another PR

[jburel]

also "grunt test" in package.json The "test" target does not exist

[jburel]

@will-moore: can you remove the last commit, this is already done in https://github.com/ome/omero-figure/pull/186

[will-moore]

@jburel - If travis fails, can this PR be merged?

[jburel]

mine should be merged tomorrow am (need ola to remove the "red circle" mainly to avoid confusion) then you can merge develop into your PR then travis should be back to green. Need to review your last change

[jburel]

@will-moore: PR has been approved and now merge you should now be able to merge develop and have travis back to green

[jburel]

what about "scripts": { "test": "grunt test" }, in package.json

still also not sure about the link in readme to the blog post since now jasmine is gone

[jburel]

what about: "scripts": { "test": "grunt test" }

also for bootstrap: Code licensed MIT not Apache

[jburel]

Merging so we can move forward the minor cleanup noticed can happen in another PR