[ocaml-infra] Migrating to the new ocaml.org design

[Amir Chaudhry]

I guess the simplest way is to point you to a set of commits we've made on an existing fork of the site [1].  That way you can see the intermediate steps that happen during Step 2.  This step is scripted so I hope that clarifies what I meant when I said 'clean up and replay our git commits' on the redesign branch.  At the moment, we're still cleaning things up.

Although you can do it now, my preference is to add the OCaml on G+ button on the redesign branch.  There shouldn't be any issue with HTML.

Does that help to clarify?

[1] https://github.com/pw374/ocaml.org/commits/redesign

Best wishes,
Amir

On 29 Oct 2013, at 12:57, Sylvain Le Gall <sylvain+ocaml at le-gall.net> wrote:

> Let me reboot my mail thread and try to understand how to fix things.
> 
> I am not sure how you will migrate content change from the current
> branch to your redesign branch.
> 
> So in my mind, the step 2.5 will look like:
> 
> 2.5 Convert HTML page of the current master into Markdown file
> 
> 3. ....
> 
> So if I am correct, if I want to add a join "OCaml on G+" button on
> community, I can do it right now or wait for you to reach 3. ?
> 
> Since this change involves some pieces of HTML (can't do it in
> markdown), will it work with the redesign ?
> 
> Regards
> Sylvain
> 
> 
> 2013/10/29 Amir Chaudhry <amc79 at cam.ac.uk>:
>> Hi everyone,
>> 
>> Ashish, Christophe, Philippe and I have been discussing the new ocaml.org site design and how we should migrate to it.
>> 
>> You can see the current design up at http://ocaml-redesign.github.io and the idea for merging this into the main site is the following:
>> 
>> 1. We fork the current site into a new branch on the main GitHub repository (the new branch would be called 'redesign').
>> 
>> 2. We clean up and replay our git commits on this new branch.  This gets us to the current redesign site but in an 'official' place.
>> 
>> 3. We build a live version of the redesign branch (like we already have) and ask the community to review it and report any bugs or problems. We triage those bugs to identify any blockers and work on those first.
>> 
>> 4. After one week (7 days), and after blocking bugs have been fixed, we merge the site into the main branch.  This would effectively present the new site to the world.
>> 
>> During the above, we would not be able to accept any new pull requests on the old site but would be happy to accept them on the new branch.  Hence, restricting the time frame to one week.
>> 
>> As I mentioned in earlier emails, the above is only intended to merge the *design* and *toolchain* for the new site.  Specifically, we've created new landing pages, have new style sheets and have restructured the site's contents as well as made some new libraries [1, 2].  The new toolchain means people can write files in markdown, which makes contributing content a lot easier.
>> 
>> Since the files are on GitHub, people don't even need to clone the site locally to make simple edits (or even add new pages). Just click the 'Edit this page' link in the footer to be taken to the right file in the repository and GitHub's editing and pull request features will allow you to make changes and submit updates, all without leaving your browser [3].
>> 
>> There is still work to be done on adding new features but the above changes are already a great improvement to the site and are ready to be reviewed and merged.
>> 
>> [1] http://pw374.github.io/posts/2013-09-05-22-31-26-about-omd.html
>> [2] http://pw374.github.io/posts/2013-10-03-20-39-07-OPAMaging-MPP.html
>> [3] https://help.github.com/articles/creating-and-editing-files-in-your-repository
>> 
>> Best wishes,
>> Amir
>> _______________________________________________
>> Infrastructure mailing list
>> Infrastructure at lists.ocaml.org
>> http://lists.ocaml.org/listinfo/infrastructure