Skip to content

WIP Websubmit crop - #46

Open
drjova wants to merge 3 commits into
CERNDocumentServer:prodfrom
drjova:master-websubmit-photo-crop
Open

WIP Websubmit crop#46
drjova wants to merge 3 commits into
CERNDocumentServer:prodfrom
drjova:master-websubmit-photo-crop

Conversation

@drjova

Copy link
Copy Markdown

Please do not merge it yet work in progress

@drjova

Copy link
Copy Markdown
Author

It's now based on latest master.

@drjovadrjova changed the title WIP: Websubmit cropWebsubmit cropJul 23, 2014
@drjova

Copy link
Copy Markdown
Author

It's ready for production

@drjova

Copy link
Copy Markdown
Author

Language tab added on submission

screen shot 2014-07-25 at 12 17 44 pm

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lines 648, 653: there are some unmatched quotes and some typos:
message = 'There is one duplicate ' +

  • '["+files[duplicates[0]].name+"].' +
  • '\n Press ok to replace it' +
  • 'otherwise ancel to ignore it.';

should be:

message = 'There is one duplicate ' +

  • '['+files[duplicates[0]].name+'].' +
  • '\n Press ok to replace it ' +
  • 'otherwise cancel to ignore it.';

(this has been fixed on production)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the notice, I have amended with the fix and rebase against the latest master.

drjovaand others added 3 commits August 28, 2014 10:17
* Replaces the uploadify plugin with the plupload plugin
(drag-and-drop)
* Adds the possibility of replacing photos
Signed-off-by: Charalampos Tzovanakis <charalampos.tzovanakis@cern.ch>
Reviewed-by: Ludmila Marian <ludmila.marian@gmail.com>
Conflicts:
modules/websubmit/lib/websubmit_webinterface.py
* Crop images on photo submit
* Adds to web icon new `crop` format
* HTTP API to crop images on the fly and serve them
Signed-off-by: Charalampos Tzovanakis <charalampos.tzovanakis@cern.ch>
* Adds tabs on uploaded image captions with English and French languages
@drjova
drjovaforce-pushed the master-websubmit-photo-crop branch from 35a4317 to e943849CompareAugust 28, 2014 08:28
@drjovadrjova changed the title Websubmit cropWIP Websubmit cropSep 22, 2014
@kasioumis

Copy link
Copy Markdown

@drjova & @ludmilamarian Is this ready to be merged? Or is still WIP?

@drjova

Copy link
Copy Markdown
Author

it's still WIP

@egabancho

Copy link
Copy Markdown
Member

I see the three commits are deployed already, is there any reason not to merge this commits already and them develop more on top of them?

@kasioumis has seen some conflicts between his code and yours which cannot be resolved unless we merge everything that is in production ....

@drjova

Copy link
Copy Markdown
Author

The submission will change completely again for albums which is almost done on test. What kind of conflicts?

@egabancho

Copy link
Copy Markdown
Member

Ok, we can discuss this IRL

@kasioumis

Copy link
Copy Markdown

There are some conflicts in websubmit_config.py and websubmit_webinterface.py. Nothing major, but it's safer to know that what is on cds-ops/prod can be put on the production nodes without losing any (not-yet-merged) functionality. As @egabancho says, let's discuss IRL.

@ludmilamarian

Copy link
Copy Markdown

why the help wanted label? is this good to be integrated?

@ludmilamarian

Copy link
Copy Markdown

The websubmit_icon_creator.py was missing a commit in prod, most likely due to the deployment of the crop feature, so this is just a note not to remove it next time (I'm talking about inveniosoftware@4d569b1)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@drjova@kasioumis@egabancho@ludmilamarian