CopyleftConf/copyleftconf-website Changeset - 787663516eab

Changeset - 787663516eab

Parent rev.

Child rev.

[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:

fixtures/sitetree.json

103

pinaxcon/templates/dashboard.html

pinaxcon/templates/static_pages/about/petaluma.html

pinaxcon/templates/static_pages/homepage.html

static/images/icon.png

bin+mod

0 comments (0 inline, 0 general)

fixtures/sitetree.json

➞

Show inline comments

@@ ... / @@ -56,13 +56,13 @@ @@
+    }
 },
+{
     "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,
@@ ... / @@ -72,26 +72,26 @@ @@
         "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,
@@ ... / @@ -196,12 +196,60 @@ @@
         "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": "",
@@ ... / @@ -397,13 +445,13 @@ @@
     "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,
@@ ... / @@ -469,24 +517,24 @@ @@
     "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,
@@ ... / @@ -538,13 +586,13 @@ @@
+{
     "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,
@@ ... / @@ -603,104 +651,8 @@ @@
         "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

@@ ... / @@ -27,13 +27,15 @@ @@
         <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">

pinaxcon/templates/static_pages/about/petaluma.html

➞

Show inline comments

@@ ... / @@ -21,9 +21,9 @@ @@
 <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

@@ ... / @@ -30,13 +30,13 @@ @@
             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>

static/images/icon.png

➞

Show inline comments

binary diff not shown

Show images

0 comments (0 inline, 0 general)