Skip to content
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

Merged
merged 156 commits into from Sep 22, 2015

Conversation

areynold
Copy link
Collaborator

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

  1. The new template is based on Community Technology's template. Check that the credit link in the footer is appropriate and sufficient.
  2. Check for missing pages and empty content.
  3. Site should render correctly in supported browsers/devices.

Known Issues

  1. Pagination is disabled. For some reason, paginator doesn't find our posts directory, so our blog index is empty when pagination is enabled.
  2. Spanish and French sites are out of sync. French in particular is missing several pages.
  3. Main logo height is a compromise. It's technically centered and full size, but doesn't look like it. Header should be reworked to display the logo "correctly" regardless of the amount of header text (titles, subtitles, etc.).

Optional/Additional Tasks

  1. Add Twitter link.
  2. Add RSS feed. I tested the jekyll-feed plugin the other day, but output seemed buggy. Could be something in our posts or a bug in jekyll-feed.
  3. Migrate to a sass-based css framework. This would give us documented, well-tested styles that could be easily customized via sass variables. The base framework could be updated automatically using bower.
  4. Clean up cruft. A lot of code could be merged or thrown out.

@jheretic @georgiamoon @critzo

natmey and others added 30 commits October 15, 2014 15:00
Changes look good to me. Publish v1.1 Updates
Update Master from Staging - Feb. 24th 2015
* 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
@jheretic
Copy link
Member

@critzo @georgiamoon can one of you take a look for any problems before merging?

@critzo
Copy link

critzo commented Sep 22, 2015

@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.

@jheretic
Copy link
Member

@critzo Yeah, I'm going to merge it so I can work against it for translation restructuring.

jheretic added a commit that referenced this pull request Sep 22, 2015
@jheretic jheretic merged commit 371abb4 into opentechinstitute:staging Sep 22, 2015
@areynold areynold deleted the theme-update/release branch November 11, 2015 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants