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

Update master from staging - multiple changes #227

Merged
merged 29 commits into from Sep 2, 2014
Merged

Update master from staging - multiple changes #227

merged 29 commits into from Sep 2, 2014

Conversation

andygunn
Copy link

@natmey @critzo @sifrwahid @jheretic @georgiamoon - Please review, per my email.

  1. Download (routers) page: Some text changed, mostly simplification and adding a link to installing and configuring instructions.
  2. Removed old Common Configs and Added "Common Hardware Setups" and "Advanced Hardware Setups" in CCK -> Install+Config
  3. Changed "Get Help" menu to "Documentation".
  4. Moved Wireless Challenges to Networking from Planning
  5. Added "For Organizers"" menu - goes to CCK landing page and various sections.
  6. Small firewall addition to Configure Commotion under advanced

Merge and re-build production site when ready!

Andy Gunn and others added 21 commits August 13, 2014 13:30
…otably adding links to the Installation and Configure pages.
…are Setups" page created and graphics updated. Stub for "Advanced Hardware Setups" created. Menus updated.
…anging a firewall rule for remote administration.
…files moved and links updated, menus updated.
…so changed from "help" to "docs" in line with the new section name.
…re for now. No submenus created, just takes the user to the CCK sections.
…ugging into switches added in web and print version.
Pulling in to staging to see how it looks.

Issue 202 pull request - Add Install and Configure links to Download page
Adding to staging to see how it looks.

Added new Common and Advanced Hardware Setups modules to CCK
Putting in staging to see how it looks.

Updated Configure Commotion CCK module with Firewall information
Putting in staging to see how it looks.

Moving Wireless Challenges to Networking section from Planning
Adding to staging to see what it looks like.

Add "For Organizers" top level menu to site
…that had section type mismatches.

Conflicts:
	commotionwireless.net/docs/cck/installing-configuring/common-configuration/index.md
	commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
	commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
…ary menu additions and new base page. Further additions to Guides and Howtos can be made in the new directory. Simple guides can be placed there instead of in the CCK.
@georgiamoon
Copy link
Member

I think this all looks great. I like the menu changes.

@sifrwahid
Copy link
Contributor

Looks great.

@andygunn
Copy link
Author

@critzo @natmey - If no one else has questions or concerns, can we merge this into master today? Thanks!

Changed PDF for Learn Networking Basics to one generated in Scribus
Added new section to Documentation - "Guides and How-tos"
@natmey
Copy link
Contributor

natmey commented Aug 27, 2014

So I have one issue, that I don't think is a deal breaker, but I want to flag it. On my 1200 pixel width monitor the menu wraps to two lines. Decreasing the padding in CSS fixes it.

Andy Gunn added 2 commits August 28, 2014 17:25
@andygunn
Copy link
Author

@natmey - I worked on the css for the top level menu with @sifrwahid and we think it is all set. The top menu will still wrap, but it won't break the formatting the way it did before. This should be consistent with the rest of the responsive sizing changes for smaller monitors. Please merge when ready!

@andygunn
Copy link
Author

andygunn commented Sep 2, 2014

@critzo - since @natmey is out for the next two weeks, can you take a look and merge when ready?

critzo pushed a commit that referenced this pull request Sep 2, 2014
Update master from staging - multiple changes
@critzo critzo merged commit 0d6363f into master Sep 2, 2014
@andygunn
Copy link
Author

andygunn commented Sep 2, 2014

Thanks @critzo !

@critzo
Copy link

critzo commented Sep 2, 2014

np @andygunn - regenerating live site now.

@critzo
Copy link

critzo commented Sep 2, 2014

@andygunn Live site is now updated. Thanks!

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

5 participants