diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index 37c28c9a7f07f70b9b0918a8ae3e619690d0ecc2..941770ca9052805a3924165d0c69b836b23921b8 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -59,7 +59,7 @@ "model": "sitetree.treeitem", "pk": 7, "fields": { - "title": "Call for Proposals (Closed)", + "title": "Call for Proposals", "hint": "", "url": "/program/call-for-proposals", "urlaspattern": false, @@ -75,7 +75,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": 24, - "sort_order": 39, + "sort_order": 4, "access_permissions": [] } }, @@ -88,7 +88,7 @@ "url": "/attend", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, @@ -199,6 +199,54 @@ "access_permissions": [] } }, +{ + "model": "sitetree.treeitem", + "pk": 14, + "fields": { + "title": "Reporting an Incident", + "hint": "", + "url": "/code-of-conduct/harassment-incidents", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 8, + "sort_order": 15, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 15, + "fields": { + "title": "Staff Procedures", + "hint": "", + "url": "/code-of-conduct/harassment-staff-procedures", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 8, + "sort_order": 17, + "access_permissions": [] + } +}, { "model": "sitetree.treeitem", "pk": 17, @@ -400,7 +448,7 @@ "url": "/wiki", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, @@ -472,7 +520,7 @@ "url": "/program/events", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, @@ -483,7 +531,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": 24, - "sort_order": 4, + "sort_order": 32, "access_permissions": [] } }, @@ -541,7 +589,7 @@ "fields": { "title": "How to Pitch Your Manager", "hint": "", - "url": "/attend/business-case", + "url": "/attend/business-cases", "urlaspattern": false, "tree": 1, "hidden": false, @@ -606,101 +654,5 @@ "sort_order": 36, "access_permissions": [] } -}, -{ - "model": "sitetree.treeitem", - "pk": 38, - "fields": { - "title": "Transparency Reports", - "hint": "", - "url": "/about/transparency", - "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": 1, - "sort_order": 38, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 39, - "fields": { - "title": "Accepted Talks", - "hint": "", - "url": "/schedule/general-sessions/list/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 24, - "sort_order": 32, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 40, - "fields": { - "title": "Financial Aid", - "hint": "", - "url": "/attend/finaid", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 8, - "sort_order": 40, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 42, - "fields": { - "title": "Guide Index", - "hint": "", - "url": "/guides", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 8, - "sort_order": 42, - "access_permissions": [] - } } ] diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 7696abb8b708e194baf3d6d403fed46825c25718..60479fdbce78095595789ec0911e9f57e4b30f6f 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -30,8 +30,10 @@ + {% comment %} {% include "registrasion/dashboard_widget.html" %} - + {% endcomment %} +
diff --git a/pinaxcon/templates/static_pages/about/petaluma.html b/pinaxcon/templates/static_pages/about/petaluma.html index 07a4e014d6c45e71745cbcb38778ec37e3cc3f9a..e63d0f017f7f1556be71e04b693a5a055dd21d1b 100644 --- a/pinaxcon/templates/static_pages/about/petaluma.html +++ b/pinaxcon/templates/static_pages/about/petaluma.html @@ -9,7 +9,7 @@ {% block body_class %}about{% endblock %} {% block lede %} - The best town you probably haven't bothered visiting yet. + The best town you probably haven't bothered visiting yet. {% endblock %} @@ -24,6 +24,6 @@

The Golden Gate Bridge is well-known to San Franciscans as being approximately 8,000 miles long and shrouded in fog, so few ever cross up into the North Bay. Happily, the drive north is easy and it can be swift. There are many ways to get to Petaluma, we've covered driving, public transit, and flights on the How to Get Here page.

-

When you get here, you're sure to find a nice place to stay that fits your budget. You can find a range of options, and some special discounts, available on the Where to Stay page.

+

When you get here, you're sure to find a nice place to stay that fits your budget. {%comment %}You can find a range of options, and some special discounts, available on the Where to Stay page.{%endcomment%} We'll have group rates and discounts at local hotels when tickets are available.

{% endblock %} diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index 7bbbd5bf8ad0f09de03b1dcc5a7eb074f9f5774e..7e5e730e04c7d8918087209049fff42ae7ad1f0a 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -33,7 +33,7 @@

November 3 & 4, 2018
- Call for Proposals closes August 10th + Talk proposal submissions close August 10th