Dn d manager by jburel · Pull Request #46 · ome/openmicroscopy

jburel · 2011-12-21T20:51:06Z

I have now added DnD to the data manager, ready to be tested.
I will add a movie to http://trac.openmicroscopy.org.uk/ome/ticket/1620

Custom template tag support for static prefix in webadmin, see #7220 Configuring statics in settings.py, see #7219

Custom template tag support for static prefix in feedback, see #7233 Configuring statics in settings.py, see #7219

Custom template tag support for static prefix in webadmin, see #7221 Configuring statics in settings.py, see #7219

That will become configurable in the standard manner. Accidentally committed while running web unittests

…e/django_templates, see #7269

This was the thinner logo without the text at the bottom, as was already being used in 'feature/django_templates' branch.

Footer separated out: links and copywrite. Webclient links in webclient.

Webclient templates base_container.html and base.html now extend common container3.html and container2.html respectively. nav.js moved to common static. TODO: split images.css and layout.css into styles needed by common vv webclient

jburel · 2012-01-04T11:05:49Z

Problem has been fixed see #52 and merged.

…nD-manager

qidane · 2012-01-04T13:39:09Z

Tested and generally works.

Some comments:
• If you drop a dataset onto itself (eg by clicking and accidentally dragging a tiny bit) you get a modal dialog saying you cannot move it there - would be better to just not do anything.
• Sometimes when dragging an image you get a green (+) symbol, other times you do not, even though you are dragging and releasing to/from the same folders.
• The modal dialogs generally are very annoying, would be better to use the red on-entry sign on the drag to say you cannot drop there, or make the dropped item just spring back and show a tooltip or something else that vanished without being model
• If you drag a dataset to its parent project, the parent project is closed so you can on longer see the dataset.

jburel · 2012-01-04T13:57:52Z

@qidane: tickets created.

Do not display any message when the user drags an object and drop it on itself. (close #7720)

Do not display any message and no action done when the src is dropped on its parent i.e. a dataset dropped on the project that already contains it. (close #7723)

Show a "no-entry" cursor when the target is not valid. (close #7722).

jburel · 2012-01-04T19:02:35Z

@qidane: I have just trigged a new build with your comments implemented. You should be notified by e-mail when the build is completed. If you could give it a shot that will be great.

jburel · 2012-01-04T19:43:38Z

@qidane: build available http://hudson.openmicroscopy.org.uk/job/OMERO-merge-blue/43/

qidane · 2012-01-05T10:32:59Z

Crash on right click, select import on dataset.

jburel · 2012-01-05T10:40:59Z

@qidane: this not related to DnD, the problem has been fixed in PR 51.(build issue) due to missing jar. Any other comments on DnD

qidane · 2012-01-05T10:43:25Z

Problems:
• Inconsistent icon, sometime green plus sometime red no entry when dragging same image over same project. (images sent by email)

qidane · 2012-01-05T10:49:14Z

• If I select an image and drop it over the word "Empty"in a dataset nothing happens. I would expect it to move.
• I sometime get the green plus when dragging a file over another users dataset.
• I sometime get on red or green when dragging a file over another users images, but do get the red when over the dataset the images are in.

jburel · 2012-01-05T10:52:01Z

@qidane:

The red is displayed when you mouse over a container you cannot drop the element into.
for the green +, I do not have much control over that It does not appear at all in my case, so that might require more investigation.
for the empty I will have a look.

jburel · 2012-01-05T11:10:52Z

@qidane: tickets created or re-opened.

Display the no-entry cursor when mousing over images or empty node (close #7726)

@qidane

Sprint5 insight backlog. Tested by @qidane, merging.

…nD-manager Conflicts: components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewer.java components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerModel.java components/insight/SRC/org/openmicroscopy/shoola/util/ui/IconManager.java

qidane · 2012-01-06T11:07:00Z

Tested, all working with exception of appearance of the green plus issue that @jburel marked as known issue.

@qidane

Dn d manager. Tested by @qidane, one minor point that we will investigate later. merging

Add bulk annotations to the main view in OMERO.web

Test 5.3: Port test fixes to 5.3 line (not secvul specific)

chris-allan and others added 30 commits October 27, 2011 16:53

Remove Django 1.1.1.

099fb43

Add Django 1.3.1.

c029ac5

Update the build for the new Django library version.

fe6c125

Only extract what we need from the tarball.

376d242

Update license README.

dafb20e

Webadmin Template adjustments, see #7222

c39a012

Custom template tag support for static prefix in webadmin, see #7220 Configuring statics in settings.py, see #7219

Feedback Template adjustments, see #7231

803c8e8

Custom template tag support for static prefix in feedback, see #7233 Configuring statics in settings.py, see #7219

Webclient Template adjustments, see #7223

a3f3ab2

Custom template tag support for static prefix in webadmin, see #7221 Configuring statics in settings.py, see #7219

comment improvement in settings.py, see #7224

73eb919

removing CsrfViewMiddleware from the configuation

026c6b9

refactoring Server classes in webadmin/custom_model.py

fbf7553

Removing hardcoded new Databases settings, see #7255.

cb22e56

That will become configurable in the standard manner. Accidentally committed while running web unittests

deprecating custom 'smart' if, see #7256

98e1c5a

New 'common' Django app for common templates

7201eca

adding support for Custom context process, see #7262

673a1ea

removing unexpected print statement

d3cb75e

merging with https://github.com/will-moore/openmicroscopy/tree/featur…

961ee5c

…e/django_templates, see #7269

fixing rendering template with the given context

ae77029

demoting webclient layout.css and images.css

38ce43c

Updated logo.png used by base templates

c202330

This was the thinner logo without the text at the bottom, as was already being used in 'feature/django_templates' branch.

Moving 'logout' down to weclient template. See #7263

06ddda5

Adding text content to webtest common templates

ec96c75

Moving footer over-write between common webtest examples

901d03a

open_astex_viewer.html extends common base_html.html

4123c52

script_ui.html extends common base_html.html

3d237f0

Footer content moved to webclient.

69b66e1

Footer separated out: links and copywrite. Webclient links in webclient.

Including footer links in webclient base templates

b35eae3

Removing print statement

e33a140

Moving container templates up to common

5476860

Webclient templates base_container.html and base.html now extend common container3.html and container2.html respectively. nav.js moved to common static. TODO: split images.css and layout.css into styles needed by common vv webclient

Adding container examples to webtest

b32ce88

jburel added 2 commits January 4, 2012 11:35

Remove unused import

841bf8c

Merge branch 'DnD-manager' of github.com:jburel/openmicroscopy into D…

e1f34cc

…nD-manager

jburel added 4 commits January 4, 2012 14:11

Do not show any message when D&d on itself.

6327b4b

Do not display any message when the user drags an object and drop it on itself. (close #7720)

No message if object dropped on its parent.

c17ff11

Do not display any message and no action done when the src is dropped on its parent i.e. a dataset dropped on the project that already contains it. (close #7723)

Cursor implementation.

79696e3

Use cursor to indicate if target is valid

038fcc1

Show a "no-entry" cursor when the target is not valid. (close #7722).

Recycles the image Cursor

d65540d

jburel added 7 commits January 5, 2012 18:20

Improve display of no-entry cursor (close #7726)

a06a64b

Reset cursor when losing focus (close #7725)

9c4ade0

Allow to drop images on top of empty node

95accea

Display the no-entry cursor when mousing over images or empty node (close #7726)

Do not allow to drag the empty node.

b2a0671

Merge pull request ome#51 from jburel/sprint5-insight-backlog

a4f8b75

Sprint5 insight backlog. Tested by @qidane, merging.

Display ghost image if supported.

e169767

jburel added a commit that referenced this pull request Jan 6, 2012

Merge pull request #46 from jburel/DnD-manager

ec3edae

Dn d manager. Tested by @qidane, one minor point that we will investigate later. merging

jburel merged commit ec3edae into ome:develop Jan 6, 2012

chris-allan added a commit to chris-allan/openmicroscopy that referenced this pull request Sep 9, 2015

Merge pull request ome#46 from chris-allan/bulk-annotations-main

92445fd

Add bulk annotations to the main view in OMERO.web

mtbc pushed a commit to mtbc/openmicroscopy that referenced this pull request May 21, 2020

Merge pull request ome#46 from jburel/test-fix-from-develop

98257d9

Test 5.3: Port test fixes to 5.3 line (not secvul specific)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dn d manager#46

Dn d manager#46
jburel merged 112 commits intoome:developfrom
jburel:DnD-manager

jburel commented Dec 21, 2011

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

qidane commented Jan 4, 2012

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

qidane commented Jan 5, 2012

Uh oh!

jburel commented Jan 5, 2012

Uh oh!

qidane commented Jan 5, 2012

Uh oh!

qidane commented Jan 5, 2012

Uh oh!

jburel commented Jan 5, 2012

Uh oh!

jburel commented Jan 5, 2012

Uh oh!

qidane commented Jan 6, 2012

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jburel commented Dec 21, 2011

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

qidane commented Jan 4, 2012

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

jburel commented Jan 4, 2012

Uh oh!

qidane commented Jan 5, 2012

Uh oh!

jburel commented Jan 5, 2012

Uh oh!

qidane commented Jan 5, 2012

Uh oh!

qidane commented Jan 5, 2012

Uh oh!

jburel commented Jan 5, 2012

Uh oh!

jburel commented Jan 5, 2012

Uh oh!

qidane commented Jan 6, 2012

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants