Changeset - 787663516eab
[Not reviewed]
0 5 0
Christopher Neugebauer - 6 years ago 2018-07-04 16:59:19
chrisjrn@gmail.com
more tweaks
5 files changed with 59 insertions and 105 deletions:
0 comments (0 inline, 0 general)
fixtures/sitetree.json
Show inline comments
...
 
@@ -50,54 +50,54 @@
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": null,
 
        "sort_order": 24,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 7,
 
    "fields": {
 
        "title": "Call for Proposals (Closed)",
 
        "title": "Call for Proposals",
 
        "hint": "",
 
        "url": "/program/call-for-proposals",
 
        "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": 39,
 
        "sort_order": 4,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 8,
 
    "fields": {
 
        "title": "Attend",
 
        "hint": "",
 
        "url": "/attend",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "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": 8,
 
        "access_permissions": []
...
 
@@ -190,24 +190,72 @@
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": 1,
 
        "sort_order": 33,
 
        "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,
 
    "fields": {
 
        "title": "Code of Conduct",
 
        "hint": "",
 
        "url": "/code-of-conduct",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "alias": null,
 
        "description": "",
...
 
@@ -391,25 +439,25 @@
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 29,
 
    "fields": {
 
        "title": "Wiki",
 
        "hint": "",
 
        "url": "/wiki",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "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": 26,
 
        "access_permissions": []
...
 
@@ -463,36 +511,36 @@
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 32,
 
    "fields": {
 
        "title": "Events",
 
        "hint": "",
 
        "url": "/program/events",
 
        "urlaspattern": false,
 
        "tree": 1,
 
        "hidden": false,
 
        "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": 24,
 
        "sort_order": 4,
 
        "sort_order": 32,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 33,
 
    "fields": {
 
        "title": "Petaluma",
 
        "hint": "",
 
        "url": "/about/petaluma",
 
        "urlaspattern": false,
 
        "tree": 1,
...
 
@@ -532,25 +580,25 @@
 
        "access_perm_type": 1,
 
        "parent": 8,
 
        "sort_order": 14,
 
        "access_permissions": []
 
    }
 
},
 
{
 
    "model": "sitetree.treeitem",
 
    "pk": 35,
 
    "fields": {
 
        "title": "How to Pitch Your Manager",
 
        "hint": "",
 
        "url": "/attend/business-case",
 
        "url": "/attend/business-cases",
 
        "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,
...
 
@@ -597,110 +645,14 @@
 
        "description": "",
 
        "inmenu": true,
 
        "inbreadcrumbs": true,
 
        "insitetree": true,
 
        "access_loggedin": false,
 
        "access_guest": false,
 
        "access_restricted": false,
 
        "access_perm_type": 1,
 
        "parent": 8,
 
        "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": []
 
    }
 
}
 
]
pinaxcon/templates/dashboard.html
Show inline comments
...
 
@@ -21,25 +21,27 @@
 
              <span class="pull-right">
 
                <i class="fa fa-user"></i> {% user_display request.user %}
 
              </span>
 
          </h3>
 
      </div>
 
      <div class="panel-body">
 
        <li>
 
            <a href="{% url 'account_password' %}">{% trans "Change password" %}</a>
 
        </li>
 
      </div>
 
    </div>
 

	
 
    {% comment %}
 
    {% include "registrasion/dashboard_widget.html" %}
 
    {% endcomment %}
 
    
 
    <div class="panel panel-default">
 
        <div class="panel-heading">
 
            <div class="pull-right">
 
                {% if not user.speaker_profile %}
 
                    <a href="{% url "speaker_create" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-plus-sign"></i> Create a speaker profile
 
                    </a>
 
                {% else %}
 
                    <a href="{% url "speaker_edit" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-pencil"></i> Edit your speaker profile
 
                    </a>
pinaxcon/templates/static_pages/about/petaluma.html
Show inline comments
...
 
@@ -15,15 +15,15 @@
 

	
 
{% block content %}
 

	
 
<p>North Bay Python's home is <a href="/about/petaluma">Petaluma</a>, a delightfully quaint dairy town, nestled on a river at the southern edge of California's Wine Country. We've got beautiful scenery right on our doorstep, and we're less than an hour's drive from San Francisco over the Golden Gate Bridge. We've got a whole page dedicated to <a href="/about/petaluma">Petaluma</a> if you want to learn more about it.</p>
 

	
 
<p>Our venue, The Mystic Theatre, is not the only local example of early 1900s architecture, either: Downtown is full of great examples of Victorian-era buildings that survived the 1906 earthquake. Just down the road, you'll find the center of the maker movement and a thriving craft brewery scene.</p>
 

	
 

	
 
<h2>Travel and Lodging</h2>
 

	
 
<p>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 <a href="/attend/travel">How to Get Here</a> page.</p>
 

	
 
<p>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 <a href="/attend/hotels">Where to Stay</a> page.</p>
 
<p>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 <a href="/attend/hotels">Where to Stay</a> page.{%endcomment%} We'll have group rates and discounts at local hotels when tickets are available.</p>
 

	
 
{% endblock %}
pinaxcon/templates/static_pages/homepage.html
Show inline comments
...
 
@@ -24,25 +24,25 @@
 
        <h2 class="homepage-subtitle">The Python conference in a live music venue</h2>
 
      </div>
 

	
 
      <div class="row">
 
        <div class="col-md-6">
 
          <h3>
 
            The Mystic Theatre</br>
 
            Petaluma, California
 
          </h3>
 

	
 
          <h4>
 
            November 3 &amp; 4, 2018<br/>
 
            Call for Proposals closes August 10th
 
            Talk proposal submissions close August 10th
 
          </h4>
 
        </div>
 
        <div class="col-md-4 col-md-offset-2 email-signup-panel">
 
          <div class="panel panel-default">
 
            <div class="panel-heading">
 
              <h2 class="panel-title">Sign up for our low-volume announcements newsletter!</h4>
 
            </div>
 
            <div class="panel-body">
 
              <form
 
                class="form-inline"
 
                action="https://tinyletter.com/northbaypython" method="post" target="popupwindow" onsubmit="window.open('https://tinyletter.com/northbaypython', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true">
 
                <div class="form-group">
static/images/icon.png
Show inline comments
 
binary diff not shown
Show images
0 comments (0 inline, 0 general)