CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #64 from northbaypython/copy

Browse source 
nav tweaks for responsive winningness
This commit is contained in:
Christopher Neugebauer 2017-08-17 18:26:03 -07:00 • committed by GitHub
commit ce56bc1e37
2 changed files with 149 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
fixtures/sitetree.json
View file

@ -51,7 +51,7 @@
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"sort_order": 7,
"sort_order": 8,
"access_permissions": []
}
},
@ -64,7 +64,7 @@
"url": "/program/call-for-proposals",
"urlaspattern": false,
"tree": 1,
"hidden": true,
"hidden": false,
"alias": null,
"description": "",
"inmenu": true,
@ -74,7 +74,7 @@
"access_guest": false,
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"parent": 24,
"sort_order": 4,
"access_permissions": []
}
@ -99,7 +99,7 @@
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"sort_order": 8,
"sort_order": 9,
"access_permissions": []
}
},
@ -123,7 +123,7 @@
"access_restricted": false,
"access_perm_type": 1,
"parent": null,
"sort_order": 9,
"sort_order": 24,
"access_permissions": []
}
},
@ -318,5 +318,149 @@
"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": []
}
}
]

22
pinaxcon/templates/_account_bar.html
View file

@ -1,22 +0,0 @@
{% 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>