New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move site to new template #345
Move site to new template #345
Conversation
Changes look good to me. Publish v1.1 Updates
All looks good.
Recent changes to Master
Update Master from Staging - Feb. 24th 2015
Commit staging to Master
* Move old content to attic * Copy in new css, includes, layouts, scripts, assets
* _config.yml: stop ignoring cck * _layouts: copy collections layout to cck * _includes: Naively import old CCK includes
Conflicts: commotionwireless.net/_config.yml commotionwireless.net/attic/_posts/es/test.md commotionwireless.net/es/docs/cck/building-mounting/gather-tools-and-wireless-equipment/index.md commotionwireless.net/es/docs/cck/building-mounting/learn-about-rooftop-mounts/index.md commotionwireless.net/es/docs/cck/building-mounting/learn-rooftop-basics/index.md commotionwireless.net/es/docs/cck/building-mounting/prep-install-rooftop-nodes/index.md commotionwireless.net/es/docs/cck/installing-configuring/configure-commotion/index.md commotionwireless.net/es/docs/cck/installing-configuring/install-and-recover-tftp/index.md commotionwireless.net/es/docs/cck/installing-configuring/install-ubiquiti-router/index.md commotionwireless.net/es/docs/cck/installing-configuring/troubleshoot-your-wireless-node/index.md commotionwireless.net/es/docs/cck/networking/intro-to-mesh/index.md commotionwireless.net/es/docs/cck/networking/learn-networking-basics/index.md commotionwireless.net/es/docs/cck/planning/design-your-network-construction-elements/index.md commotionwireless.net/es/docs/cck/planning/design-your-network-every-network-tells-story/index.md commotionwireless.net/es/docs/cck/planning/get-word-out-flyer-design/index.md commotionwireless.net/es/docs/cck/planning/identify-neighborhood-skills/index.md commotionwireless.net/es/docs/cck/planning/inventory-the-neighborhood/index.md commotionwireless.net/es/download/verify-signatures/index.md
@critzo @georgiamoon can one of you take a look for any problems before merging? |
@georgiamoon @areynold @jheretic I built the forked branch and everything looks ok, except for the bits that @areynold pointed out. Additionally, there's an issue with the language selection pieces in how the URLs get constructed. If you look at one of the CCK pages, you'll note that the template for the sub-menu items has logic to correctly display the correct URL for links depending on what language you have selected. So if I click on "ES" at the top, other menu links show up with /es/ in the URL. This isn't the case for top level CCK menu items, or other menu items. Perhaps we just need to get it merged into staging and test the remaining additions. |
@critzo Yeah, I'm going to merge it so I can work against it for translation restructuring. |
Summary
This is an initial migration aimed at re-integrating the new template into mainline development before the forks diverge too far. The site should function as before, but some design choices were expedient compromises and should be refined as individual issues.
To Test
Known Issues
Optional/Additional Tasks
@jheretic @georgiamoon @critzo