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
Split view 10094 #960
Split view 10094 #960
Conversation
It was inconsistent to have the first key:value pair be ...key & ...value and then have ...key1 & ...value1 etc. Now, the first ones are ...key0 and ...value0.
Also update the grey panels code (channels not in merged appear grey in split columns)
Conflicts: components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
@joshmoore One question I have with this PR is how to prepare for the move to develop: There is a merge commit: 75b7227 because the original branch started before a bunch of FS-related UI changes and the cleanest way to fix conflicts was via a merge. However, I'm struggling to port the merge commit over to develop, even though I have created a similar 'original' branch to match the original branch in dev_4_4. Can you remind me / point me to the branches that are in develop but NOT in dev_4_4? Since my dev_4_4 and develop merges should be identical, apart from whats in those branches. Cheers. |
The PRs which have been marked as not applicable to
Those left open are:
NB: To have access to the notes locally, you'll need to run |
@will-moore: if you can handle the long name in that PR, that will be good |
The long name issue should be dealt with by the script itself (different repo / PR). I'll tidy the dusty.css conflict comment. Just discussed the slider issue: this is very minor and outside the scope of this PR. |
Looks good to merge. |
@will-moore Ran script on .dv and .png images. Do you want a ticket for this? Screenshot 1: Screenshot 2: |
The bug with retrieving the script output (attached file) has also been noticed ome/omero-scripts#23 The drag-handle shouldn't do anything if you only have 1 row, since there's no re-ordering to be done. Not sure how you managed to drag the images like that - I couldn't reproduce just now. |
This PR was originally opened before the 4.4.6 release as #610, but postponed 'till after release.
NB: One extra feature since the previous PR & testing is the ability to re-order the figure rows, via drag and drop.