Fixed closing div tags in gh-pages

robertd commented 11 years ago

Fixed div issue noted by @websam101 in [https://github.com/aurajs/aura/issues/268#issuecomment-20179767]

Also noted that when <&#47div> are together outcome is >div> that's why there is an extra space to workaround this.

robertd commented 11 years ago

Merging this in gh-pages branch and if anyone has fix for that extra space feel free to revert/correct my commit.

websam101 commented 11 years ago

I have investigate to find the reason of this strange behavior and I think that I put the finger on it, the problem seem to come from the hljs function in app.js... and there is also another occurrence in vendors.js...

if you change the replace tag/tag with tag/htmlentities before: replace(/&/gm,"&")replace(/</gm,"<").replace(/>/gm,">") after: replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")

this will resolve the previous bug and can bee reverted to </TAG> or </TAG> without spaces with no problems and resolve it.

PS. Sorry if I dont do git requests, I have to learn the git system first..

robertd commented 11 years ago

Thanks @websam101. I've updated highlight.js to the newest version. Locally everything works fine for me, but it seems that github needs some time to refresh gh-pages for changes to take effect.

//cc @addyosmani

websam101 commented 11 years ago

@robertd welcome. The index.html is updated and also the highlight.js but not the compiled/compressed app.js + app.js.gz and vendors.js + vendors.js.gz

robertd commented 11 years ago

@addyosmani @unity Do we have minification/deployment system in place for gh-pages?

unity commented 11 years ago

We should : we're using middleman on the "website" branch, and doing a rake publish — Romain Dardour, hull romain@hull.io http://hull.io

On Fri, Jun 28, 2013 at 8:39 PM, Robert Djurasaj notifications@github.com wrote:

@addyosmani @unity Do we have minification/deployment system in place for gh-pages?

Reply to this email directly or view it on GitHub: https://github.com/aurajs/aura/pull/272#issuecomment-20223160

robertd commented 11 years ago

@unity: I've updated highlight.js but rake publish is not working for me. Would you mind re-publishing changes to gh-pages branch please.

Also, in website branch where is the actual html content? #273 changed one link and I was wondering if we need to update website branch as well.

Perhaps we should instruct other people to submit gh-pages related patches in website branch? Maybe Readme.md on gh-pages branch would help?

Let me know of your thoughts

addyosmani commented 11 years ago

@unity I've been (due to rake publish not working for me) making changes directly to the gh-pages branch output (i.e index.html) and pushing those. Should I be updating the website branch with the content changes from there to avoid breaking the middleman workflow or should we be okay?

unity commented 11 years ago

I'll fix rake publish and port the changes today. — Romain Dardour, hull romain@hull.io http://hull.io

On Sat, Jun 29, 2013 at 6:23 AM, Addy Osmani notifications@github.com wrote:

@unity I've been (due to rake publish not working for me) making changes directly to the gh-pages branch output (i.e index.html) and pushing those. Should I be updating the website branch with the content changes from there to avoid breaking the middleman workflow or should we be okay?

Reply to this email directly or view it on GitHub: https://github.com/aurajs/aura/pull/272#issuecomment-20228953

unity commented 11 years ago

@robertd , @addyosmani

I just added a Readme.md to the gh-pages branch explaining the setup,
Ported the fixes to the website to the website branch
Added a favicon (with middleman-favicon-generator)
Updated UI a bit

To answer your question, the content comes directly from the README.md in the website branch, to allow for easier updating. We should ensure it's in sync with the other branches. Right now it's not the case

robertd commented 11 years ago

Thanks @unity :+1:

If I pull the latest content on website branch and run rake publish it should work right? Perhaps we should document steps on how to do this for other contributors (install rvm, run bundle install, etc)

unity commented 11 years ago

It should. Tell me if it does not. ATM it publishes on the origin remote.

I added a readme to gh-pages. Feel free to improve.

— Romain Dardour, hull romain@hull.io http://hull.io

On Sat, Jun 29, 2013 at 12:44 PM, Robert Djurasaj notifications@github.com wrote:

Thanks @unity :+1:

If I pull the latest content on website branch and run rake publish it should work right? Perhaps we should document steps on how to do this for other contributors (install rvm, run bundle install, etc)

Reply to this email directly or view it on GitHub: https://github.com/aurajs/aura/pull/272#issuecomment-20234936

robertd commented 11 years ago

:+1:

buritica commented 11 years ago

After running bundle install && rake build or rake publish i get:

$ bundle exec middleman build --clean
$ /Users/buritica/.rvm/gems/ruby-1.9.3-p362/gems/favicon_maker-0.2.1/lib/favicon_maker/generator.rb:18:in ``': No such file or directory - convert --version (Errno::ENOENT)

robertd commented 11 years ago

You don't have ImageMagick installed. brew install imagemagick

https://github.com/follmann/middleman-favicon-maker/issues/10

robertd commented 11 years ago

@unity Still getting errors on rake publish https://gist.github.com/robertd/b4b5188e22b90c66045a

unity commented 11 years ago

Trying to add a README to explain this but middleman won't output it raw, looking into it.

On Jun 29, 2013, at 1:01 PM, Robert Djurasaj notifications@github.com wrote:

@unity Still getting errors on rake publish https://gist.github.com/robertd/b4b5188e22b90c66045a

— Reply to this email directly or view it on GitHub.

robertd commented 11 years ago

If I add stuff in README.md on website... wouldn't that end up on the website? Is that what we really want? Maybe we need contributing.md that will be website/gh-pages specific. What do you think?

robertd commented 11 years ago

I stand corrected... there is contributing.md but it's more project specific... I may just update that one. :)

unity commented 11 years ago

we can do this The README.md that's used to generate it is taken from '/README.md' in the website branch, and outputted as build/index.html

What I want to do is have a README.md in /build to explain how to build, will not appear on the website

On Jun 29, 2013, at 1:04 PM, Robert Djurasaj notifications@github.com wrote:

If I add stuff in README.md on website... wouldn't that end up on website? Is that what we really want? Maybe we need contributing.md that will be website/gh-pages specific. What do you think?

— Reply to this email directly or view it on GitHub.

robertd commented 11 years ago

Gotcha

buritica commented 11 years ago

ImageMagick? Is that for the favicon? I think that's a lot of friction for any documentation contributor. Is a static image not possible, or is there a special requirement for this favicon?

unity commented 11 years ago

Yes, the +5 favicons are generated from a single one. I'm not too partial to "manual labor" for websites, having automation is key for static websites IMHO

On Jun 29, 2013, at 1:17 PM, Juan Pablo Buritica notifications@github.com wrote:

ImageMagick? Is that for the favicon? I think that's a lot of friction for any documentation contributor. Is a static image not possible, or is there a special requirement for this favicon?

— Reply to this email directly or view it on GitHub.

buritica commented 11 years ago

@unity I agree with automation, I was just curious. I don't think the 5 favicons should be generated every time you publish. Perhaps just have a rake task that can be run whenever the favicon is updated.

Anyway, it's mostly my curiosity. I can work with anything.

aurajs / aura