ClojureBridge Slides

[Bridget Hillyer]

Does anyone know where the github pages slides are coming from?

http://clojurebridge.github.io/curriculum

My understanding was that they were whatever was in the gh-pages branch in the curriculum repo, but they don't match up to what is in there.

I am totally confused. Can someone help?

Bridget

[Sean Corfield]

The source is in the slides folder (on master of curriculum). It needs copying to the gh-pages branch root folder and pushing in order to republish. 

Sean Corfield -- (904) 302-SEAN

An Architect's View -- http://corfield.org/

World Singles, LLC -- http://worldsingles.com/

(sent from my iPhone)

--
You received this message because you are subscribed to the Google Groups "clojurebridge-curriculum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to clojurebridge-curr...@googlegroups.com.
Visit this group at http://groups.google.com/group/clojurebridge-curriculum.
For more options, visit https://groups.google.com/d/optout.

[Bridget Hillyer]

On Sat, Dec 13, 2014 at 4:05 PM, Sean Corfield <se...@corfield.org> wrote:

The source is in the slides folder (on master of curriculum). It needs copying to the gh-pages branch root folder and pushing in order to republish. 

Ok, that matches my understanding. But when I look in the gh-pages branch now:

https://github.com/ClojureBridge/curriculum/tree/gh-pages

it doesn't  match what I see actually being served in the github page:

http://clojurebridge.github.io/curriculum

Is there something obvious I'm missing? If not, I'll just go ahead and put slides in the gh-pages branch ... and create an automation for it... and document it.

[Sean Corfield]

I just pulled the latest curriculum from Git and did git checkout gh-pages and then opened index.html and it looks exactly like the live version on clojurebridge.github.io...

What are you seeing that is different?

Sean

[Yoko Harada]

If you open files of gh-pages by web browser, those are exactly the same as http://clojurebridge.github.io/curriculum. But, if you open the files by editor, master branch's slides/*.html and gh-pages' *.html are totally different ones. In gh-pages branch, hoplon (generated?) pages are. I guess we need to run some command to re-generate hoplon pages to sync changes in master. Unfortunately, I'm not sure what is the command or tool for converting code.

- Yoko

[Sean Corfield]

On Dec 15, 2014, at 5:58 PM, Yoko Harada <yo...@cognitect.com> wrote:

If you open files of gh-pages by web browser, those are exactly the same as http://clojurebridge.github.io/curriculum. But, if you open the files by editor, master branch's slides/*.html and gh-pages' *.html are totally different ones. In gh-pages branch, hoplon (generated?) pages are. I guess we need to run some command to re-generate hoplon pages to sync changes in master. Unfortunately, I'm not sure what is the command or tool for converting code.

Ah, I see what happened. Yes, originally the gh-pages branch was generated from Hoplon and the slides folder on the master branch was the Hoplon source code. The slides (on master) were replaced by generated HTML (from the Hoplon app) and all the Hoplon source removed), but the gh-pages branch was never updated from the (new) slides.

Since then, folks have modified the slides folder - cleaning up the HTML structure and simplifying the navigation - but, again, never updated gh-pages from the updated slides.

So I just went ahead and did that (and cleaned up the top-level cruft that was left behind - the updated slides folder has all the assets neatly tucked away in a folder).

In future, we can re-publish the online slides as follows:

git checkout master

cd slides

zip -r /tmp/slides.zip *

cd ..

git checkout gh-pages

unzip /tmp/slides.zip

(type A to replace all files)

Then git commit and push any changes.

Sean Corfield -- (904) 302-SEAN

An Architect's View -- http://corfield.org/

"Perfection is the enemy of the good."
-- Gustave Flaubert, French realist novelist (1821-1880)

[Bridget Hillyer]

Thanks Sean and Yoko! I finally see what I was missing. I was looking in the gh-pages branch and searching for "San Francisco" (which you can see on the first page at the served page). It didn't find it because github was truncating the big .js file where it existed. 

So the slides directory in master *is* the correct version of the slides. What was in gh-pages branch was the old generated version of the hoplon slides. We aren't using those anymore, so I just copied the slides directory into gh-pages branch. Thanks for walking me through it!!

https://github.com/ClojureBridge/curriculum/pull/120

[Bridget Hillyer]

On Mon, Dec 15, 2014 at 9:24 PM, Sean Corfield <se...@corfield.org> wrote:

On Dec 15, 2014, at 5:58 PM, Yoko Harada <yo...@cognitect.com> wrote:

If you open files of gh-pages by web browser, those are exactly the same as http://clojurebridge.github.io/curriculum. But, if you open the files by editor, master branch's slides/*.html and gh-pages' *.html are totally different ones. In gh-pages branch, hoplon (generated?) pages are. I guess we need to run some command to re-generate hoplon pages to sync changes in master. Unfortunately, I'm not sure what is the command or tool for converting code.

Ah, I see what happened. Yes, originally the gh-pages branch was generated from Hoplon and the slides folder on the master branch was the Hoplon source code. The slides (on master) were replaced by generated HTML (from the Hoplon app) and all the Hoplon source removed), but the gh-pages branch was never updated from the (new) slides.

Since then, folks have modified the slides folder - cleaning up the HTML structure and simplifying the navigation - but, again, never updated gh-pages from the updated slides.

So I just went ahead and did that (and cleaned up the top-level cruft that was left behind - the updated slides folder has all the assets neatly tucked away in a folder).

In future, we can re-publish the online slides as follows:

git checkout master

cd slides

zip -r /tmp/slides.zip *

cd ..

git checkout gh-pages

unzip /tmp/slides.zip

(type A to replace all files)

Then git commit and push any changes.

Great minds think alike. :) That's pretty much what I just did. Thanks again for walking me through my befuddlement. 

 

Sean Corfield -- (904) 302-SEAN

An Architect's View -- http://corfield.org/

"Perfection is the enemy of the good."
-- Gustave Flaubert, French realist novelist (1821-1880)

[Katherine Fellows]

Is this slide-publishing process a thing that we want to have in CONTRIBUTING.md?

--

kf

[Sean Corfield]

On Dec 15, 2014, at 6:52 PM, Katherine Fellows <k...@kpf.me> wrote:
> Is this slide-publishing process a thing that we want to have in CONTRIBUTING.md?

I think Bridget's suggestion to simply remove the slides folder from master (and therefore do all the slide updates directly on the gh-pages branch) is a good one since it simplifies things. If we go that route, we certainly need to update the README and CONTRIBUTING files (on master).