[MRG] Ovh logo #286

maikia · 2019-11-20T15:47:12Z

Reference Issue

What does this implement/fix? Explain your changes.

Added Ovh logo to the front webpage and removed other powered-by logos

Any other comments?

codecov · 2019-11-20T15:59:31Z

Codecov Report

Merging #286 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #286      +/-   ##
==========================================
+ Coverage   92.23%   92.24%   +<.01%     
==========================================
  Files          94       94              
  Lines        6904     6908       +4     
==========================================
+ Hits         6368     6372       +4     
  Misses        536      536

Impacted Files	Coverage Δ
ramp-frontend/ramp_frontend/views/general.py	`96.15% <100%> (+0.69%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1ba84e2...70e4621. Read the comment docs.

agramfort

ok for you @kegl for the new server?

kegl · 2019-11-20T21:56:59Z

We need to find a way to customize some of the web pages (landing, sign up). Logos is one thing, but for example we needed to add terms and conditions to the sign up page. I included it in the template for now as plain html, but I will not commit it in the master. Since these may come up later, what is important is to find a way to do this seamlessly.

For example, have placeholders and defaults for those committed in the master, and a config template folder in the deployment where customizable elements can be changed. Then we can copy those into the template directory (ignored by github) when for example the frontend is launched.

See also this comment: #276 (comment)

agramfort · 2019-11-21T20:52:31Z

@maikia can you see if it's possible to make it a configurable thing?

…

maikia · 2019-11-22T08:59:49Z

@maikia can you see if it's possible to make it a configurable thing?
…

@kegl @agramfort
Sure, I do my best. Just to be clear as I never worked with placeholders and defaults (or html for that matter ;) )

you want the frontpage to be easily customizable (logos, pictures, terms and conditions, sections, etc) before the launch?
How about after the launch? If like now we need to change logo(s) (or people, or other info) on the running RAMP... Is there a way and if yes is it of interest to have possibility of making some changes like that to already launched RAMP?
finally, how much of a priority is it?

agramfort · 2019-11-22T16:01:11Z

I would do this with the config file of ram-board. It could contain the paths to logos to use for acknowledgements. medium priority I would say.

…

On Fri, Nov 22, 2019 at 9:59 AM maikia ***@***.***> wrote: @maikia <https://github.com/maikia> can you see if it's possible to make it a configurable thing? … <#m_-574576313381494335_> @kegl <https://github.com/kegl> @agramfort <https://github.com/agramfort> Sure, I do my best. Just to be clear as I never worked with placeholders and defaults (or html for that matter ;) ) 1. you want the frontpage to be easily customizable (logos, pictures, terms and conditions, sections, etc) before the launch? 2. How about after the launch? If like now we need to change logo(s) (or people, or other info) on the running RAMP... Is there a way and if yes is it of interest to have possibility of making some changes like that to already launched RAMP? 3. finally, how much of a priority is it? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#286?email_source=notifications&email_token=AABHKHD2PBFSWUSPMF3G6TTQU6NQRA5CNFSM4JPUYXG2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEE5ADQA#issuecomment-557449664>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AABHKHGVZYDEXXSOZLH56TDQU6NQRANCNFSM4JPUYXGQ> .

kegl · 2019-11-22T16:14:07Z

Ideally we should be able to change it after the launch. I simply edited the sign up template https://github.com/paris-saclay-cds/ramp-board/blob/master/ramp-frontend/ramp_frontend/templates/sign_up.html adding pure html to it. You can do the same thing temporarily at your end to add logos. The problem is that sign_up.html is in the repo and I don't want to commit Huawei T&C. The same way, I don't think OVH logo should be committed in the repo.

I would set up a deploy_templates folder in the deployment folder in which some default customizable templates can be placed. These could be copied into ramp-frontend/ramp_frontend/templates at deployment (or somewhere else where flask can read from) and re-copied any time we change them. These could be then sent to index or sign_up through the flask code. I think we don't even have to restart the frontent since the flask could read these files dynamically.

@maikia if you set this up for the logo section of index.html, I can take care of the T&C on the sign_up page.

maikia · 2019-12-03T16:17:50Z

@kegl @agramfort
Now the logos are taken directly from static/img/powered_by/ directory. No more hardcoded logos
If that's what you wanted I will add it to the docs. Not sure how to add a test for it though.

agramfort · 2019-12-03T20:38:31Z

nice, simple and very elegant !

+1 for MRG

feel free to MRG @kegl

kegl · 2019-12-03T20:54:49Z

Nice! Maybe add the folder to .gitignore and add documentation.

…but not the directory itself

maikia · 2019-12-04T13:19:25Z

I think it's better to .gitignore the contents of the powered_by directory and not of the directory itself

agramfort · 2019-12-04T14:17:06Z

good to go form my end

kegl · 2019-12-04T14:54:11Z

Great job @maikia, +1 for MRG

maikia · 2019-12-04T14:57:29Z

Great, thanks @agramfort @kegl

rth · 2019-12-06T10:46:16Z

ramp-frontend/ramp_frontend/views/general.py

-    return render_template('index.html')
+    img_ext = ('.png', '.jpg', '.jpeg', '.gif', '.svg')
+    images = [f for f in os.listdir(
+              'ramp-frontend/ramp_frontend/static/img/powered_by/')


This path should be with respect to __file__, otherwise it does not exist #300

rth · 2019-12-06T10:46:32Z

ramp-frontend/ramp_frontend/views/general.py

+    images = [f for f in os.listdir(
+              'ramp-frontend/ramp_frontend/static/img/powered_by/')
+              if f.endswith(img_ext)]
+    print(images)


Also maybe remove the print?

maikia added 4 commits November 20, 2019 16:38

added ovhcloud file

8bd8c5b

added ovhcloud logo to the frontpage and removed other powered_by logos

a464a51

updated ovhcloud link

759e276

correcting display of ovhcloud

9e3ee3d

agramfort approved these changes Nov 20, 2019

View reviewed changes

maikia added 4 commits December 3, 2019 17:00

added dynamic loading of the images from powered_by dir

7f17f62

placing the graphics instead of the link

be6fd05

removed displaying of the img name

56c8adc

cleaning up

15ca0c3

maikia changed the title ~~Ovh logo~~ [wip] Ovh logo Dec 3, 2019

cleaning up

4250ade

maikia added 8 commits December 4, 2019 10:31

cleaning up

162161b

limited types of images to be used in powered_by

7bbb8e0

cleaning up

4e43246

added .gitignore to ignore all the files in the powered_by directory …

8fee58f

…but not the directory itself

section powered-by is not displayed if no logos in powered-by directory

bbb1b50

added docs about personalizing frontpage (only powered_by for now)

855a302

removed image files for powered_by from rep

622bc95

updated the docs

70e4621

maikia changed the title ~~[wip] Ovh logo~~ Ovh logo Dec 4, 2019

maikia changed the title ~~Ovh logo~~ [MRG] Ovh logo Dec 4, 2019

maikia merged commit 4bc503b into paris-saclay-cds:master Dec 4, 2019

rth mentioned this pull request Dec 6, 2019

FileNotFoundError ramp-frontend/ramp_frontend/static/img/powered_by/ #300

Closed

rth reviewed Dec 6, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MRG] Ovh logo #286

[MRG] Ovh logo #286

maikia commented Nov 20, 2019

codecov bot commented Nov 20, 2019 •

edited

Loading

agramfort left a comment

kegl commented Nov 20, 2019 •

edited

Loading

agramfort commented Nov 21, 2019 via email

maikia commented Nov 22, 2019

agramfort commented Nov 22, 2019 via email

kegl commented Nov 22, 2019 •

edited

Loading

maikia commented Dec 3, 2019

agramfort commented Dec 3, 2019

kegl commented Dec 3, 2019

maikia commented Dec 4, 2019

agramfort commented Dec 4, 2019

kegl commented Dec 4, 2019

maikia commented Dec 4, 2019

rth Dec 6, 2019

rth Dec 6, 2019

[MRG] Ovh logo #286

[MRG] Ovh logo #286

Conversation

maikia commented Nov 20, 2019

Reference Issue

What does this implement/fix? Explain your changes.

Any other comments?

codecov bot commented Nov 20, 2019 • edited Loading

Codecov Report

agramfort left a comment

Choose a reason for hiding this comment

kegl commented Nov 20, 2019 • edited Loading

agramfort commented Nov 21, 2019 via email

maikia commented Nov 22, 2019

agramfort commented Nov 22, 2019 via email

kegl commented Nov 22, 2019 • edited Loading

maikia commented Dec 3, 2019

agramfort commented Dec 3, 2019

kegl commented Dec 3, 2019

maikia commented Dec 4, 2019

agramfort commented Dec 4, 2019

kegl commented Dec 4, 2019

maikia commented Dec 4, 2019

rth Dec 6, 2019

Choose a reason for hiding this comment

rth Dec 6, 2019

Choose a reason for hiding this comment

codecov bot commented Nov 20, 2019 •

edited

Loading

kegl commented Nov 20, 2019 •

edited

Loading

kegl commented Nov 22, 2019 •

edited

Loading