diffpy / diffpy.github.io

web hosting for www.diffpy.org
2 stars 12 forks source link

Pdfmorph web-page #23

Open RomanMatthew opened 5 years ago

RomanMatthew commented 5 years ago

Addressing https://github.com/diffpy/diffpy.pdfmorph/issues/24

RomanMatthew commented 5 years ago

@chiahaoliu @CJ-Wright @sbillinge Sorry to be tagging you guys so fervently in all this stuff but I just want to make sure that I did the right stuff. What do you think?

CJ-Wright commented 5 years ago

@sbillinge if you look at the code there is a button on the file name line which looks like a document, that will render the rst to the best of its ability.

pavoljuhas commented 5 years ago

I suggest to use lowercase filenames for the new pages. This would make it easier to link them from other pages and less error prone to type the URL directly.

RomanMatthew commented 5 years ago

@pavoljuhas I fixed some of the problems but caused more in products/pythonpackages.rst. Could you help me figure out how to solve the issues I caused? I've been trying for a bit

pavoljuhas commented 5 years ago

@RomanMatthew - I have fixed the conflicts by a temporary merge with the parent source branch. Also there was an extra blank line in the table which broke the syntax.

I recommend to merge this PR using "Rebase and Merge" so it is easier to later on understand what changes it brings in.

RomanMatthew commented 5 years ago

@pavoljuhas @sbillinge Does that mean that it should be ready to merge now?

pavoljuhas commented 5 years ago

Does that mean that it should be ready to merge now?

Let me give it a quick read.

pavoljuhas commented 5 years ago

BTW, we need to hold on with this merge until PDFmorph is really out.

pavoljuhas commented 5 years ago

Here is my take on that page - https://github.com/RomanMatthew/diffpy.github.io/compare/pdfmorph_web...pavoljuhas:pdfmorph_web_pj and here is the page rendered - http://pavoljuhas.github.io/diffpy.github.io/products/pdfmorph.html.

If that looks OK, please pull

git pull https://github.com/pavoljuhas/diffpy.github.io.git pdfmorph_web_pj
RomanMatthew commented 5 years ago

@pavoljuhas The changes should be implemented now!