6190 iframe by will-moore · Pull Request #62 · ome/openmicroscopy

will-moore · 2012-01-12T16:43:33Z

This removes the iframe in web, includes lots of other UI changes:

For testers: @omeroscott etal

NB: Needs testing in IE and as many other browsers as possible ;)

Layout

Generally check if everything looks "nice"
If you are not logged in as Admin, you shouldn't see Admin link in dark toolbar, but you should still be able to edit your user account
3 & 2 column layouts should allow resize by dragging, and collapse expand by clicking at top.
Navigate tabs in Project / Tags / Public. See same tags (displayed in same way) in the right-hand panel.

Right-hand panel

All annotations etc in right-hand panel should happen without page refresh, same workflow as Insight
Annotating single objects:
- Edit name, description
- Add existing tag, new tag(s), both
- Upload local file attachment
- Attach existing file(s)
- Add Comment
Batch Annotating objects:
- All the same above (except Edit name & description)
Create and Edit Share
- Add Images to basket
- Preview basket (click icon)
- Go to basket, select some image(s) (If you select a single one - should be annotatable as above)
- Create share (on Save, taken to 'public' page of shares)
- Browse to share, edit E.g. expiry date and add/remove members.

Scripts

Run a script. E.g. Util_Scripts/Channel_Offsets or Export/Batch_Image_Export.
Currently selected Images, Datasets etc should be populated in script dialog.
When running script, Activities panel should pop-up.
When completed, should have links to the results, info etc.

Moved existing components into new positions with the new common templates from previous commit

NB: Had to add context['nav'] to lots of webadmin views methods. This needs to be handled by common decorator.

Profile page is displayed under 'Webclient' tab, using 'parent_id' to highlight webclient tab. Project+Screens, Tags and Public are tabs in their own panel. Script - launching button is in the top toolbar, along with Group and User choosers.

Also Improved webtest common template examples with new layout

This takes everything from search_template branch (2 commits), so this branch can now be deleted.

Seems that Safari 5.0.5 needs to have the <script> tag NOT within <html><head> and the first code in the <script> tag needs to be (document).ready()

will-moore · 2012-02-01T12:11:44Z

File attachments:

Varous browsers don't support .click() - Need to display the file field. Include this in the uploaded files form
Need to sort uploaded files in Attachments chooser.

Need to display the browser's file upload field in a form, since workaround with javascript click() only worked on Firefox.

Conflicts: components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/data/containers.html components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/data/containers_icon.html

omeroscott · 2012-02-01T14:34:17Z

Issues identified

#7958: Bug: IE 8 right hand panel not loading
#7949: Bug: Bullet point list for right hand side panel

omeroscott · 2012-02-03T17:19:08Z

Further bug:

#7989 Bug: Images not shown in middle panel for a share

omeroscott · 2012-02-08T16:30:41Z

Scripts tested on IE, Chrome and Firefox.

No technical bugs seen, I have created ##8027 to discuss with Dom about the presentation of the information in the activities window and included in part of his header review.

omeroscott · 2012-02-08T17:29:33Z

Having spoken with Will this instance of overlapping of can be fixed see screenshot:

http://trac.openmicroscopy.org.uk/ome/attachment/ticket/8027/activities%20window%20firefox.png

chris-allan · 2012-02-10T15:23:56Z

Testing done in Firefox 10.0 on Windows 7.

Just a few small things when working with images in active shares:

Tag, Attach and Add Comment actions are available
Load hierarchy is available, which fails
Acquisition and Preview tabs do not work

Just in general:

All right hand panel informational tooltip/popups are no longer working when mousing over a tag or an attachment?
Is clicking on a tag supposed to take you to the tag tab and select the correct tag in the tree?

Search:

Multiple terms entered in the global search box (ex. "Well A1") result in a blank search page being displayed, single terms work

Also populate the query field of the search form when loading from top search field.

chris-allan · 2012-02-15T10:30:53Z

@will-moore: All looking good. Tooltips working nicely, shares working as expected. When adding a new tag to an element the tooltip is not added to the element. Is this expected? For attachments when a new element is added the tooltip is added with the correct metadata but has no formatting as far as I can tell, it's just one long string.

chris-allan · 2012-02-15T12:27:59Z

@will-moore: All looking good with the tooltips. For attachment tooltips, "Description" is what exactly? FileAnnotation.Description?

will-moore · 2012-02-15T12:53:33Z

Yep. Same for Tag. Both are annotation description.

atarkowska · 2012-02-15T15:25:07Z

I found one more KeyError blocking login to webadmin because of
context['nav'] = request.session['nav']
in webadmin/views.py
Fixing it in ticket #8060 with chris-allan/branch/6342_integration

Conflicts: components/tools/OmeroWeb/omeroweb/settings.py components/tools/OmeroWeb/omeroweb/webclient/views.py

6190 iframe

PixelsProcessor: do not append '[...]' if the supplied image name is empty

Will Moore added 30 commits December 20, 2011 15:52

Re-arranging blocks in base_header.html. See #7374

0623ea7

Updating webclient and webadmin base templates with new layout

b85e0d5

Moved existing components into new positions with the new common templates from previous commit

Adding 'Webclient' and 'Admin' tabs to web UI

03142cb

NB: Had to add context['nav'] to lots of webadmin views methods. This needs to be handled by common decorator.

'Admin' tab not displayed for non-admins etc

1bc9749

Profile page is displayed under 'Webclient' tab, using 'parent_id' to highlight webclient tab. Project+Screens, Tags and Public are tabs in their own panel. Script - launching button is in the top toolbar, along with Group and User choosers.

Removing 'importer' link from menu

4c0b4f7

Adding drag funtionality to container panels

a500928

Renamed some blocks in base_header.html template.

b96e45c

Also Improved webtest common template examples with new layout

Adding search box to webclient toolbar. search_template branch.

40bb8e1

This takes everything from search_template branch (2 commits), so this branch can now be deleted.

Adding search box to webclient toolbar. search_template branch.

6015ec7

This takes everything from search_template branch (2 commits), so this branch can now be deleted.

Started work on Activities panel.

52f06b2

Activities panel mostly working - many tweaks still needed

f5bc532

Nearly finished activities. Icons for toolbar (basket too)

9193043

Tiny tweaks to layout and activities

a691386

Moving main links to left of middle header.

cb3ee49

Adding 'basket panel' to preview basket (like activities)

07a7a6e

Adding comments in metadata_general via AJAX. See #7710

d1521bd

Don't try to add empty Comment

aacf45b

Drop-down menu css changes to allow reuse elsewhere

efa9f12

BlitzGateway AnnotationLink.getAnnotation() has link loaded

6b3d186

Webclient BaseContainer shortcut methods for o_type and id

d80c423

Webclient BaseContainer createFileAnnotation returns fileAnn

876c604

metadata_general uploads new file via AJAX. See ome#6193

4ea4e02

Small fixes to previous commit

42c3af8

metadata_general attaches existing file via AJAX. See ome#6193

03b1a0a

Minor refactor and tweeks to previous commit

668b606

Tagging in metadata_panel via AJAX. See ome#6192

ae9355d

iframe GONE! TODO: batch annotation form. See ome#6202

c9ff75e

Multi-select of thumbnails fires single selection event

b30b98a

Batch Annotation and Single Annotation via same views etc.

0db702d

Hide annotation containers if empty. Closes ome#6204

f642f07

Fixing <html> and (document).ready() for Safari 5.0.5

d2503c4

Seems that Safari 5.0.5 needs to have the <script> tag NOT within <html><head> and the first code in the <script> tag needs to be (document).ready()

Will Moore added 2 commits February 1, 2012 13:09

Upload local file via 'File Attachments' form

38ec599

Need to display the browser's file upload field in a form, since workaround with javascript click() only worked on Firefox.

Merge remote-tracking branch 'ome/develop' into 6190_iframe

c43c505

Conflicts: components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/data/containers.html components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/data/containers_icon.html

Will Moore added 2 commits February 2, 2012 15:18

Fix rendering of right-hand panel in IE

9ed9799

Annotation dialogs have sorted File_anns and Tags

a34ca90

Will Moore added 2 commits February 6, 2012 12:00

Fix display of share images in middle panel. Closes #7989

7e8f455

Fix Annotation of PlateAcquisition. Closes #7914

f072cb3

Will Moore added 2 commits February 8, 2012 22:44

Fix overlap of dropdown menus

e22ec71

Small fixes to overlapping column resize bug

2d53185

Will Moore added 3 commits February 10, 2012 22:55

Handle spaces in top search queries

6de2430

Also populate the query field of the search form when loading from top search field.

Shared images don't show annotations to others

0f83240

Fixed display of tooltip in right-hand panel

1677e91

Display tooltip on newly added Tags and Files

3cc7d62

Fix script running in Safari

4e2a2ca

Merge remote-tracking branch 'ome/develop' into 6190_iframe

8ece58a

Conflicts: components/tools/OmeroWeb/omeroweb/settings.py components/tools/OmeroWeb/omeroweb/webclient/views.py

chris-allan added a commit that referenced this pull request Feb 20, 2012

Merge pull request #62 from will-moore/6190_iframe

ed382f1

6190 iframe

chris-allan merged commit ed382f1 into ome:develop Feb 20, 2012

pwalczysko mentioned this pull request Nov 25, 2013

Fix SPW delete test timeouts (see #11540). #1797

Merged

atarkowska mentioned this pull request Feb 29, 2012

7993 transition #89

Merged

joshmoore pushed a commit to joshmoore/openmicroscopy that referenced this pull request Apr 21, 2015

Merge pull request ome#62 from melissalinkert/image-name-formatting

39c1c5c

PixelsProcessor: do not append '[...]' if the supplied image name is empty

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

6190 iframe#62

6190 iframe#62
chris-allan merged 84 commits intoome:developfrom
will-moore:6190_iframe

will-moore commented Jan 12, 2012

Uh oh!

will-moore commented Feb 1, 2012

Uh oh!

omeroscott commented Feb 1, 2012

Uh oh!

omeroscott commented Feb 3, 2012

Uh oh!

omeroscott commented Feb 8, 2012

Uh oh!

omeroscott commented Feb 8, 2012

Uh oh!

chris-allan commented Feb 10, 2012

Uh oh!

chris-allan commented Feb 15, 2012

Uh oh!

chris-allan commented Feb 15, 2012

Uh oh!

will-moore commented Feb 15, 2012

Uh oh!

atarkowska commented Feb 15, 2012

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

will-moore commented Jan 12, 2012

Layout

Right-hand panel

Scripts

Uh oh!

will-moore commented Feb 1, 2012

Uh oh!

omeroscott commented Feb 1, 2012

Uh oh!

omeroscott commented Feb 3, 2012

Uh oh!

omeroscott commented Feb 8, 2012

Uh oh!

omeroscott commented Feb 8, 2012

Uh oh!

chris-allan commented Feb 10, 2012

Uh oh!

chris-allan commented Feb 15, 2012

Uh oh!

chris-allan commented Feb 15, 2012

Uh oh!

will-moore commented Feb 15, 2012

Uh oh!

atarkowska commented Feb 15, 2012

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants