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 61 insertions and 107 deletions:
0 comments (0 inline, 0 general)
fixtures/sitetree.json
Show inline comments
...
 
@@ -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": []
 
    }
 
}
 
]
pinaxcon/templates/dashboard.html
Show inline comments
...
 
@@ -30,8 +30,10 @@
 
      </div>
 
    </div>
 

	
 
    {% comment %}
 
    {% include "registrasion/dashboard_widget.html" %}
 

	
 
    {% endcomment %}
 
    
 
    <div class="panel panel-default">
 
        <div class="panel-heading">
 
            <div class="pull-right">
pinaxcon/templates/static_pages/about/petaluma.html
Show inline comments
...
 
@@ -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 @@
 

	
 
<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
...
 
@@ -33,7 +33,7 @@
 

	
 
          <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">
static/images/icon.png
Show inline comments
 
binary diff not shown
Show images
0 comments (0 inline, 0 general)