CopyleftConf/copyleftconf-website Changeset - fb3e1d6c1874

Changeset - fb3e1d6c1874

Parent rev.

Child rev.

[Not reviewed]

Merge

0 5 0

Christopher Neugebauer - 7 years ago 2017-08-18 15:48:01
chrisjrn@gmail.com

Merge branch 'master' into prod

5 files changed with 159 insertions and 29 deletions:

fixtures/sitetree.json

149

pinaxcon/templates/_account_bar.html

pinaxcon/templates/static_pages/about/north_bay_python.html

pinaxcon/templates/static_pages/about/team.html

static/scss/custom.scss

0 comments (0 inline, 0 general)

fixtures/sitetree.json

➞

Show inline comments

@@ ... / @@ -48,36 +48,36 @@ @@
         "insitetree": true,
         "access_loggedin": false,
         "access_guest": false,
         "access_restricted": false,
         "access_perm_type": 1,
         "parent": null,
-        "sort_order": 7,
+        "sort_order": 8,
         "access_permissions": []
+    }
 },
+{
     "model": "sitetree.treeitem",
     "pk": 7,
     "fields": {
         "title": "Call for Proposals",
         "hint": "",
         "url": "/program/call-for-proposals",
         "urlaspattern": false,
         "tree": 1,
-        "hidden": true,
+        "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": null,
+        "parent": 24,
         "sort_order": 4,
         "access_permissions": []
+    }
 },
+{
     "model": "sitetree.treeitem",
@@ ... / @@ -96,13 +96,13 @@ @@
         "insitetree": true,
         "access_loggedin": false,
         "access_guest": false,
         "access_restricted": false,
         "access_perm_type": 1,
         "parent": null,
-        "sort_order": 8,
+        "sort_order": 9,
         "access_permissions": []
+    }
 },
+{
     "model": "sitetree.treeitem",
     "pk": 9,
@@ ... / @@ -120,13 +120,13 @@ @@
         "insitetree": true,
         "access_loggedin": false,
         "access_guest": false,
         "access_restricted": false,
         "access_perm_type": 1,
         "parent": null,
-        "sort_order": 9,
+        "sort_order": 24,
         "access_permissions": []
+    }
 },
+{
     "model": "sitetree.treeitem",
     "pk": 11,
@@ ... / @@ -315,8 +315,152 @@ @@
         "access_restricted": false,
         "access_perm_type": 1,
         "parent": 3,
         "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": []
+    }
+}
+]

pinaxcon/templates/_account_bar.html

➞

Show inline comments

 {% load i18n %}
 {% load account_tags %}
 <ul class="nav navbar-nav pull-right">
     {% if request.user.is_authenticated %}
         <li>
             <a href="{% url "dashboard" %}"><i class="fa fa-tasks"></i> {% trans "Dashboard" %}</a>
         </li>
         <li>
             <a id="account_logout" href="{% url 'account_logout' %}"><i class="fa fa-power-off"></i> {% trans "Log out" %}</a>
         </li>
     {% else %}
         <li><a href="{% url 'account_login' %}">{% trans "Log in" %}</a></li>
         {% if ACCOUNT_OPEN_SIGNUP %}
             <li><a href="{% url 'account_signup' %}">{% trans "Sign up" %}</a></li>
         {% endif %}
     {% endif %}
 </ul>
 <form id="accountLogOutForm" action="{% url 'account_logout' %}" method="POST">
     {% csrf_token %}
 </form>

pinaxcon/templates/static_pages/about/north_bay_python.html

➞

Show inline comments

@@ ... / @@ -46,13 +46,13 @@ @@
 <h4>By Bus</h4>
 <p>Public transit to Petaluma is not great. You can take the 101 bus operated by Golden Gate Transit from downtown San Francisco, or south from Santa Rosa. Depending on sponsorship, we hope to run a free shuttle with BART and Caltrain connections for people from further out of town.</p>
 <h4>By Plane</h4>
-<p>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.</p>
+<p>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.</p>
 <p>If you happen to have an aircraft of your own, Petaluma Municipal Airport is 3 miles down the road.</p>
 <h3>Staying Here</h3>

pinaxcon/templates/static_pages/about/team.html

➞

Show inline comments

@@ ... @@
 <p><img src="{% static "images/team/andrew.jpg" %}" alt="Andrew Godwin" class="team-headshot">Andrew is a Django and Python developer who originally hails from London but moved to the Bay Area four years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (<a href="https://twitter.com/andrewgodwin">@andrewgodwin on Twitter</a>)</p>
 <h3>Josh Simmons</h3>
 <p><img src="{% static "images/team/josh.jpg" %}" alt="Josh Simmons" class="team-headshot">Josh 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 &amp; 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. (<a href="https://twitter.com/joshsimmons">@joshsimmons on Twitter</a>)</p>
 <h2>Advisors</h2>
+<h2>Advisors<a name="advisors"></a></h2>
 <p>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.</p>
 <ul>
   <li><a href="https://twitter.com/vavroom">Nicolas Steenhout</a> is helping us with accessibility and inclusion of people with disabilities.</li>
   <li><a href="https://twitter.com/vmbrasseur">VM (Vicky) Brasseur</a> is helping us run an excellent call for proposals, design our office hours program, and support new speakers with speaker training.</li>

static/scss/custom.scss

➞

Show inline comments

@@ ... / @@ -361,12 +361,19 @@ footer .footer-copy { @@
+}
 @media (max-width: 768px) {
   .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) {
+}
@@ ... / @@ -379,7 +386,8 @@ footer .footer-copy { @@
 .homepage-subtitle {
   font-size: $font-size-h3;
+}
 .navbar-toggle {
   background-color: $gray-lighter;
   font-size: 10px;
+}

0 comments (0 inline, 0 general)