-
Notifications
You must be signed in to change notification settings - Fork 100
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Minify media viewer only #2195
Minify media viewer only #2195
Conversation
- adding README file and few others from the original package - removing themes/flicker
3rdparty/jquery-ui-1.8.19/ui/jquery-ui.js
This is first step to make embedding the viewer on static HTML page
The static webtest embed.html works fine locally. Don't know if this actually breaks any potential use of Raphael or not? |
Thanks @will-moore, that was a known issue. I would prefer to tackle Raphael library in the separate PR |
@cneves ,@knabar, @manics, @dpwrussell would you like to make any comments on that PR? |
@knabar looks like we do not need |
@aleksandra-tarkowska Makes sense. That was the only thing that jumped out when I reviewed the code, I'll still run the changes on my local install to see if I can find anything else. |
Great thanks |
Some basic tests revealed no issues with this PR, although I found some other problems that were introduced some time ago (see PR #2205). |
The latest develop has been merged inluding PR #2205 |
@knabar could you check whether we are missing anything else? |
@aleksandra-tarkowska Everything else looks good |
I'll give this a final once over today and add my comments. |
'3rdparty/jquery-ui-1.8.19/jquery-ui-1.8.19.custom.css', | ||
'webgateway/css/omero_image.css', | ||
'3rdparty/panojs/panojs.css', | ||
#'webgateway/css/ome.iehacks.css', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is not needed it should be removed. If there's a reason it's commented out, that reason should be documented.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tested with and without ome.iehacks.css
and I do not see any difference in IE9. I am not sure about usage of that as is only IE9 specific https://github.com/openmicroscopy/openmicroscopy/blob/develop/components/tools/OmeroWeb/omeroweb/webgateway/templates/webgateway/viewport/omero_image.html#L37. Removing that line for now
All looks great. Other than the above comment my only other question is the addition of:
This file was added in 9a6fb54. Did you minify this yourself from |
@chris-allan that is from jquery-ui package. I haven't minified anything else then |
Cool. Looks great to me. Ready to merge. 👍 |
…r_only Minify media viewer only
--no-rebase |
This PR replaced #2161. Created on top of #2194.
Those changes allows to embed image viewer on the static HTML website. All static files are minified using django-pipline and served on:
To test it remotely please go to https://github.com/aleksandra-tarkowska/openmicroscopy/tree/minify_media_viewer_only/components/tools/OmeroWeb/omeroweb/webtest/templates/webtest/embeding and download
embedded.html
. Then replacehttp://localhost
in the following:with the appropriate remote server name including custom prefix like
http://remote_host/omero/
If you wish to test this PR locally you can use static page in
webtest/templates/webtest/embed
. Double click on the file and see if you can view image in the viewer.In order to minify you need to run
bin/omero web start
that runs collectstatic command, your CSS and your javascripts will be compressed in the same time. If you run your development server directly you need to runpython manage.py collectstatic
first.