CopyleftConf/copyleftconf-website Changeset - 31cb8b34483d

Changeset - 31cb8b34483d

Parent rev.

Child rev.

[Not reviewed]

Merge

0 7 2

Josh Simmons - 7 years ago 2017-08-18 17:48:18
joshuasimmons@google.com

Merge branch 'master' into chrisjrn/nicer-login-view

4 files changed with 158 insertions and 28 deletions:

fixtures/sitetree.json

149

pinaxcon/templates/_account_bar.html

pinaxcon/templates/static_pages/about/team.html

static/scss/custom.scss

0 comments (0 inline, 0 general)

fixtures/sitetree.json

➞

Show inline comments

@@ ... / @@ -53,3 +53,3 @@ @@
         "parent": null,
-        "sort_order": 7,
+        "sort_order": 8,
         "access_permissions": []
@@ ... / @@ -66,3 +66,3 @@ @@
         "tree": 1,
-        "hidden": true,
+        "hidden": false,
         "alias": null,
@@ ... / @@ -76,3 +76,3 @@ @@
         "access_perm_type": 1,
-        "parent": null,
+        "parent": 24,
         "sort_order": 4,
@@ ... / @@ -101,3 +101,3 @@ @@
         "parent": null,
-        "sort_order": 8,
+        "sort_order": 9,
         "access_permissions": []
@@ ... / @@ -125,3 +125,3 @@ @@
         "parent": null,
-        "sort_order": 9,
+        "sort_order": 24,
         "access_permissions": []
@@ ... / @@ -320,2 +320,146 @@ @@
+    }
 },
+{
     "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/team.html

➞

Show inline comments

...		@@ -51,3 +51,3 @@ Our team of North Bay and Bay Area locals has years of experience building commu

		<h2>Advisors</h2>
		<h2>Advisors<a name="advisors"></a></h2>

static/scss/custom.scss

➞

Show inline comments

@@ ... / @@ -366,2 +366,9 @@ footer .footer-copy { @@
+  }
+}
 @media (max-width: 992px) and (min-width: 768px) {
   .nav > li > a {
     padding: 15px 9px;
+  }
+}
@@ ... / @@ -384,2 +391,3 @@ footer .footer-copy { @@
   background-color: $gray-lighter;
   font-size: 10px;
+}

0 comments (0 inline, 0 general)