Contain the navbar

This commit is contained in:
2020-03-15 13:48:30 +00:00
parent 6970c5c490
commit 7cef4d03c0
30 changed files with 45170 additions and 83 deletions

View File

@@ -30,37 +30,40 @@
{% block extra-head %}{% endblock %}
</head>
<body>
{% include "analytics.html" %}
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark" role="navigation">
{% block titleheader %}
{% endblock %}
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% block titleelements %}
{% endblock %}
<li class="nav-item dropdown align-self-end" id="user">
{% if user.is_authenticated %}
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="fas fa-user"></span>
Hi {{ user.first_name }}
</a>
<div class="dropdown-menu" id="userdropdown">
<div class="col-sm-12 text-right">
<a href="{% url 'logout' %}" class="dropdown-item btn btn-primary" >Logout</a>
</div>
</div>
{% else %}
<a class="nav-link" href="{% url 'login' %}">
<span class="icon-user"></span>
Login
</a>
{% endif %}
</li>
</ul>
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark justify-content-between" role="navigation">
<div class="container">
{% block titleheader %}
{% endblock %}
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% block titleelements %}
{% endblock %}
<li class="nav-item dropdown align-self-end" id="user">
{% if user.is_authenticated %}
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="fas fa-user"></span>
Hi {{ user.first_name }}
</a>
<div class="dropdown-menu" id="userdropdown">
<div class="col-sm-12 text-right">
<a href="{% url 'logout' %}" class="dropdown-item btn btn-primary" >Logout</a>
</div>
</div>
{% else %}
<a class="nav-link" href="{% url 'login' %}">
<span class="icon-user"></span>
Login
</a>
{% endif %}
</li>
</ul>
</div>
</div>
</nav>
@@ -95,6 +98,7 @@
};
</script>
<!---script src="{% static "js/jquery.cookie.js" %}"></script--->
<script src="{% static 'js/util.js' %}"></script>
<script src="{% static 'js/alert.js' %}"></script>
<script src="{% static 'js/collapse.js' %}"></script>
<script>

View File

@@ -1,4 +1,7 @@
{% extends 'base.html' %}
{% load static %}
{% block titleheader %}
<a class="navbar-brand" href="/">RIGS</a>
{% endblock %}
@@ -52,7 +55,7 @@
<li class="nav-item"><a class="nav-link" href="{% url 'venue_list' %}">Venues</a></li>
{% endif %}
<form id="searchForm" class="form form-inline" role="form" method="GET">
<input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search..." />
<input id="id_search_input" type="search" name="q" class="form-control w-25" placeholder="Search..." />
<div class="input-group-append">
<select class="custom-select form-control">
<option selected data-action="{% url 'event_archive' %}" href="#">Events</option>
@@ -65,10 +68,17 @@
</select>
</div>
<button class="btn btn-primary form-control"><span class="fas fa-search"></span> Search</button>
<a href="{% url 'search_help' %}" class="nav-link modal-href"><span class="fas fa-question"></span></a></h4>
</form>
<a href="{% url 'search_help' %}" class="nav-link modal-href"><span class="fas fa-question"></span></a></h4>
{% endblock %}
{% block js %}
<script src="{% static 'js/tooltip.js' %}"></script>
<script src="{% static 'js/popover.js' %}"></script>
<script>
$(function () {
$('[data-toggle="tooltip"]').tooltip();
})
</script>
<script>
$(document).ready(function(){
$('#search-options option').click(function(){