Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework navbar to have a consistent look with the static site.

Browse source
This commit is contained in:
James Polley 2017-10-09 08:11:52 +11:00
parent cd4c640c1b
commit e18cfc4704
9 changed files with 551 additions and 300 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

686
fixtures/sitetree.json
View file

@ -25,7 +25,7 @@
"sort_order": 2,
"title": "LINUX.CONF.AU 2018",
"tree": 1,
"url": "http://lca2018.org",
"url": "https://linux.conf.au/index.html",
"urlaspattern": false
},
"model": "sitetree.treeitem",
@ -45,8 +45,8 @@
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 3,
"parent": 23,
"sort_order": 10,
"title": "Dashboard",
"tree": 1,
"url": "dashboard",
@ -107,58 +107,6 @@
"model": "sitetree.treeitem",
"pk": 4
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
53
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "change main to miniconf if needed",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 7,
"title": "Bulk Update",
"tree": 1,
"url": "/reviews/section/main/admin/accept",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 7
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
53
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "change main to miniconf if needed",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 8,
"title": "Notifications",
"tree": 1,
"url": "/reviews/section/main/notification/accepted/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 8
},
{
"fields": {
"access_guest": false,
@ -177,7 +125,7 @@
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 9,
"sort_order": 35,
"title": "Admin",
"tree": 1,
"url": "#",
@ -186,216 +134,6 @@
"model": "sitetree.treeitem",
"pk": 9
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
288,
287,
52,
53,
55,
56
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 10,
"title": "Talks",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 10
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
290,
289
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 11,
"title": "Miniconf",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 11
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 12,
"title": "Bulk Update",
"tree": 1,
"url": "/reviews/section/miniconf/admin/accept",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 12
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 13,
"title": "Notifications",
"tree": 1,
"url": "/reviews/section/miniconf/notification/accepted/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 13
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
287
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 14,
"title": "Review Admin",
"tree": 1,
"url": "/reviews/section/main/admin/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 14
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
287
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 15,
"title": "Voting Status",
"tree": 1,
"url": "/reviews/section/main/status/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 15
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
289
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 17,
"title": "Voting Status",
"tree": 1,
"url": "/reviews/section/miniconf/status/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 16
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
289
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 16,
"title": "Review Admin",
"tree": 1,
"url": "/reviews/section/miniconf/admin/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 17
},
{
"fields": {
"access_guest": false,
@ -414,42 +152,398 @@
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 18,
"title": "Schedule Admin",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 18
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
106,
107,
108
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 18,
"parent": 9,
"sort_order": 19,
"title": "Edit",
"title": "Schedule Edit",
"tree": 1,
"url": "/schedule/edit",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 19
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 3,
"title": "Home",
"tree": 1,
"url": "https://linux.conf.au/index.html",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 20
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 9,
"title": "About",
"tree": 1,
"url": "https://linux.conf.au/about",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 21
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 21,
"title": "News",
"tree": 1,
"url": "https://linux.conf.au/news",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 22
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 22,
"title": "Attend",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 23
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 24,
"title": "Tickets and Prices",
"tree": 1,
"url": "https://linux.conf.au/attend",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 24
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 25,
"title": "Accommodation",
"tree": 1,
"url": "https://linux.conf.au/attend/accommodation",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 25
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 26,
"title": "Business Case",
"tree": 1,
"url": "https://linux.conf.au/attend/business-case",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 26
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 27,
"title": "Shirts",
"tree": 1,
"url": "https://linux.conf.au/attend/shirts",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 27
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 28,
"title": "Code of Conduct",
"tree": 1,
"url": "https://linux.conf.au/attend/code-of-conduct",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 28
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 29,
"title": "Terms and Conditions",
"tree": 1,
"url": "https://linux.conf.au/attend/terms-and-conditions",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 29
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 23,
"sort_order": 30,
"title": "Volunteer",
"tree": 1,
"url": "https://linux.conf.au/attend/volunteer",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 30
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 23,
"title": "Programme",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 31
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 31,
"sort_order": 32,
"title": "Overview",
"tree": 1,
"url": "https://linux.conf.au/programme",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 32
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 31,
"sort_order": 33,
"title": "Miniconfs",
"tree": 1,
"url": "https://linux.conf.au/programme/miniconfs.html",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 33
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 31,
"sort_order": 34,
"title": "Proposals",
"tree": 1,
"url": "https://linux.conf.au/proposals",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 34
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 31,
"title": "Sponsors",
"tree": 1,
"url": "https://linux.conf.au/sponsors",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 35
}
]

18
pinaxcon/templates/site_base.html
View file

@ -16,6 +16,7 @@
{% block styles %}
<link href="{% static 'css/bootstrap.css' %}" rel="stylesheet">
<link href="{% static 'css/app.css' %}" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.pride.codes/css/bar_body.css">
<link rel="icon" href="{% static 'lca2018/images/favicon.png' %}">
{% block extra_style %}{% endblock %}
@ -28,8 +29,23 @@
<body class="{% block body_class %}{% endblock %}">
<div class="container">
<header class="banner clearfix hidden-print">
{% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
<table class="table table-responsive">
<tr>
<td>
<div class="container-fluid" id="logo">
<div class="row" >
<div ><a href="#"><img src="https://linux.conf.au/media/img/LCA18_nodate.svg" height=80 /></a></div>
</div>
</div>
</td>
<td style="vertical-align: middle;">
{% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
</td>
</tr>
</table>
</header>
{% if messages %}
<ul class="messagelist hidden-print">
{% for message in messages %}

3
pinaxcon/templates/sitetree_header.html
View file

@ -1,5 +1,5 @@
{% load sitetree %}
<nav class="navbar navbar-inverse navbar-default">
<nav class="navbar nav-top navbar-static-top" role="navigation">
<div class="container-fluid">
{% for item in sitetree_items %}
{% if forloop.counter == 1 %}
@ -10,7 +10,6 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% sitetree_url for item %}">{{ item.title_resolved }}</a>
</div>
{% else %}
{% if forloop.counter == 2 %}

1
pinaxcon/templates/symposion/proposals/proposal_submit.html
View file

@ -9,7 +9,6 @@
{% if kinds %}
<h1>Select what kind of proposal you'd like to submit:</h1>
{% for kind in kinds %}
<a class="btn btn-lg btn-primary" role="button" href="{% url "proposal_submit_kind" kind.slug %}">{{ kind }}</a>
{% endfor %}

143
static/src/css/app.css
View file

@ -1,3 +1,32 @@
/* Fonts from our style guide */
@font-face {
font-family: 'Titillium Web';
src: url('../fonts/Titillium-Semibold.otf');
}
@font-face {
font-family: 'Roboto';
src: url('../fonts/Roboto-Regular.ttf');
}
.row { margin: 0px;}
/* for review */
#logo { padding: 16px 0px; }
body { font-family: 'Roboto', sans-serif; margin:0px; padding: 0px; width:100%; }
h1, h2 {
font-family: 'Titillium Web', sans-serif;
color: #3C3C3B; }
h3, h4 {
font-family: 'Titillium Web', sans-serif;
color: #4E87A0; }
img.profile-pic {
border-radius: 50%;
}
.label-required:after { content: ' *'; }
textarea, .monospace-text { font-family: Hack, monospace; }
.monospace-text { white-space: pre-wrap; }
@ -138,3 +167,117 @@ div.system-message p.system-message-title {
.StripeElement--webkit-autofill {
background-color: #fefde5 !important;
}
/* Navbar */
.navbar-nav > li > a, .navbar-brand {
padding-top:5px !important; padding-bottom:0 !important;
height: 40px;
}
.navbar {
min-height: 40px !important;
background-color: #ffffff;
border: #ffffff;
color: #000000;
width: fit-content;
margin-bottom: unset;
}
/* Standard nav menu styling */
.navbar-nav li a {
color: #575757 !important;
padding: 0px;
line-height: 32px;
font-family: 'Titillium Web', sans-serif;
font-weight: bold;
}
.navbar-nav > li { width: 130px; text-align: center; }
.dropdown-menu {
padding: 0;
left: 130px;
}
.dropdown-menu > li {
min-width: unset;
text-align: left;
padding: 0 0 0 5px;
}
.banner table, .banner thead, .banner tbody, .banner th, .banner td, .banner tr {
border: 0px !important;
}
/* 4 different navbar styles to alternate through */
.navbar-nav li:nth-child(4n+0) {background-color: #ECE81A;}
.navbar-nav li:nth-child(4n+1) { background-color: #DE7C00; }
.navbar-nav li:nth-child(4n+2) { background-color: #5BC2E7; }
.navbar-nav li:nth-child(4n+3) { background-color: #4E87A0; }
/* nav menu highligh */
.navbar-nav li:hover { background-color: #005760; }
.navbar-nav > li:hover > a { color: #e9e9e9 !important;}
.navbar-nav > li > a:hover { background-color: transparent !important; }
.navbar-nav .dropdown-menu li:hover > a { background-color: #005760 !important; color: #e9e9e9 !important; }
.navbar-nav .open > a, .navbar-nav .open > a:hover, .navbar-nav .open > a:focus {
background-color: transparent !important;
color: #e9e9e9 !important;
border: none;
}
@media all and (max-width: 760px) {
.navbar-nav { margin: 0px -15px; }
.navbar-nav > li { width: 120px !important; }
.dropdown-menu { left: 20px; top: 30px; }
}
@media all and (min-width: 760px) {
.navbar-nav > li {
-webkit-transform: skew(-45deg);
-moz-transform: skew(-45deg);
transform: skew(-45deg);
}
.navbar-nav > li > * {
-webkit-transform: skew(45deg);
-moz-transform: skew(45deg);
transform: skew(45deg);
}
}
@media only screen and (max-width: 1200px) and (min-width: 760px) {
/* Force table to not be like tables anymore */
.banner table {
display: table-row;
}
.banner thead, .banner tbody, .banner th, .banner td, .banner tr {
display: block;
border-top: 0px !important;
}
.banner td {
/* Behave like a "row" */
border: none;
position: relative;yes
padding-left: 50%;
}
.banner td:before {
/* Now like a table header */
position: absolute;
/* Top/left values mimic padding */
top: 6px;
left: 6px;
width: 45%;
padding-right: 10px;
white-space: nowrap;
}
.navbar-nav {
padding-left: 20px;
}
}

BIN
static/src/fonts/Roboto-Regular.ttf Executable file
View file

Binary file not shown.

BIN
static/src/fonts/RobotoCondensed-Regular.ttf Executable file
View file

Binary file not shown.

BIN
static/src/fonts/Titillium-Regular.otf Executable file
View file

Binary file not shown.

BIN
static/src/fonts/Titillium-Semibold.otf Executable file
View file

Binary file not shown.