diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index a75839873513bcaef2db0ee6320cec860cc1c5d1..4226cb75b1548d55575a3e66cc9328bc15f89bbe 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -51,7 +51,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": null, - "sort_order": 7, + "sort_order": 8, "access_permissions": [] } }, @@ -64,7 +64,7 @@ "url": "/program/call-for-proposals", "urlaspattern": false, "tree": 1, - "hidden": true, + "hidden": false, "alias": null, "description": "", "inmenu": true, @@ -74,7 +74,7 @@ "access_guest": false, "access_restricted": false, "access_perm_type": 1, - "parent": null, + "parent": 24, "sort_order": 4, "access_permissions": [] } @@ -99,7 +99,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": null, - "sort_order": 8, + "sort_order": 9, "access_permissions": [] } }, @@ -123,7 +123,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": null, - "sort_order": 9, + "sort_order": 24, "access_permissions": [] } }, @@ -318,5 +318,149 @@ "sort_order": 22, "access_permissions": [] } +}, +{ + "model": "sitetree.treeitem", + "pk": 24, + "fields": { + "title": "Program", + "hint": "", + "url": "/program", + "urlaspattern": false, + "tree": 1, + "hidden": true, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": null, + "sort_order": 7, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 25, + "fields": { + "title": "Log In", + "hint": "", + "url": "/account/login/", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": true, + "access_restricted": false, + "access_perm_type": 1, + "parent": null, + "sort_order": 26, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 26, + "fields": { + "title": "My Account", + "hint": "", + "url": "/dashboard", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": true, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": null, + "sort_order": 29, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 27, + "fields": { + "title": "Dashboard", + "hint": "", + "url": "/dashboard", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": true, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 26, + "sort_order": 27, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 28, + "fields": { + "title": "Log Out", + "hint": "", + "url": "/account/logout/", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": true, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 26, + "sort_order": 28, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 29, + "fields": { + "title": "Wiki", + "hint": "", + "url": "/wiki", + "urlaspattern": false, + "tree": 1, + "hidden": true, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": null, + "sort_order": 25, + "access_permissions": [] + } } ] diff --git a/pinaxcon/templates/_account_bar.html b/pinaxcon/templates/_account_bar.html index 8da34329752eda9341bfe130f0a102a6423784e0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/pinaxcon/templates/_account_bar.html +++ b/pinaxcon/templates/_account_bar.html @@ -1,22 +0,0 @@ -{% load i18n %} -{% load account_tags %} - -
- - diff --git a/pinaxcon/templates/static_pages/about/north_bay_python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html index 7ae9a79fa46b5657cf589c919520f418ce0a05ba..48642cec39ca5f5b357e8ce8f9571ea2a210f0dc 100644 --- a/pinaxcon/templates/static_pages/about/north_bay_python.html +++ b/pinaxcon/templates/static_pages/about/north_bay_python.html @@ -49,7 +49,7 @@If you're coming from out of the area, you may want to consider Sonoma County Airport (STS). STS is 30 minutess out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.
+If you're coming from out of the area, you may want to consider Sonoma County Airport (STS). STS is 30 minutes out of Petaluma, and has nonstop flights to most major west coast cities. If you can't make it to STS, you can also try San Francisco (SFO) or Oakland (OAK) international airports.
If you happen to have an aircraft of your own, Petaluma Municipal Airport is 3 miles down the road.
diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index 4fd05ad83a695a559c517f04254256f7754acc70..1bd7a6d240a68ba5efd37794f864023ae8e15296 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -49,7 +49,7 @@ Our team of North Bay and Bay Area locals has years of experience building commuJosh is a community organizer and web developer with a penchant for armchair philosophy who was born and raised in the North Bay. He spent 4.5 years building Web & Interactive Media Professionals (WIMP), a local community with over 600 members, before moving on to do community management for O'Reilly Media. These days Josh works on the Google Open Source outreach team and serves as a board member and volunteer CFO for Open Source Initiative. (@joshsimmons on Twitter)
-We acknowledge that our small team has limited perspective, and that to build a truly inclusive event, we need to seek the perspectives of a diverse range of people. We thank the following people and organizations for providing us with advice along the way.
diff --git a/static/scss/custom.scss b/static/scss/custom.scss index 06885fcaf3c1c4fd9796e3408b59b665624f3500..71e33f68f4687360b624a724822018d6ef441173 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -364,6 +364,13 @@ footer .footer-copy { .navbar-nav.pull-right { float: left !important; } + +} + +@media (max-width: 992px) and (min-width: 768px) { + .nav > li > a { + padding: 15px 9px; + } } @media (max-width: 550px) { @@ -382,4 +389,5 @@ footer .footer-copy { .navbar-toggle { background-color: $gray-lighter; + font-size: 10px; }