oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up side nav slightly, can now be collapsed

This commit is contained in:
Oliver Marks 2017-02-06 21:22:03 +00:00
parent 0d538df97e
commit 88f5a54bc0
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/settings/stage.py
View File

@ -216,7 +216,7 @@ LOGGING = {
} }
# Custom Admin URL, use {% url 'admin:index' %} # Custom Admin URL, use {% url 'admin:index' %}
ADMIN_URL = env('DJANGO_ADMIN_URL') ADMIN_URL = env('DJANGO_ADMIN_URL', default='admin')
# Your production stuff: Below this line define 3rd party library settings # Your production stuff: Below this line define 3rd party library settings
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

47
mhackspace/templates/base.html
View File

@ -43,11 +43,36 @@
aria-label="Toggle navigation"> aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<a class="navbar-brand" href="/"> <a href="#navbarSideMenu" class="navbar-brand" type="button" data-toggle="collapse"
<img src="{% static 'images/logo.svg' %}" alt="Maidstone Hackspace Logo" id="navbar-logo"> aria-controls="navbarMainMenu" aria-expanded="false"
aria-label="Toggle navigation">
<img src="{% static 'images/logo.svg' %}" alt="Maidstone Hackspace Logo" id="navbar-logo" data-target="collapse" data-targt="#navbarSideMenu" style="padding:0px;">
Maidstone Hackspace Maidstone Hackspace
</a> </a>
<div class="collapse" id="navbarSideMenu" style="position:absolute;top:80px;left:0px;z-index:1;background-color:#bbbbbb;">
<ul class="nav flex-column navbar-left navbar-nav mr-auto" >
{% if request.user.is_authenticated %}
<li class="nav-item">
<a class="nav-link active" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a>
</li>
{% endif %}
<li class="nav-item">
<a class="nav-link" href="{% url 'members' %}">Members</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'group'%}">Mailing List</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{# url 'equipment' #}">Equipment</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'account_logout' %}">Sign out</a>
</li>
</ul>
</div>
<div class="collapse navbar-collapse" id="navbarMainMenu"> <div class="collapse navbar-collapse" id="navbarMainMenu">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
@ -92,24 +117,6 @@
</nav> </nav>
</div> </div>
<ul class="nav flex-column navbar-left" style="position:absolute;top:80px;background-color:#bbbbbb;">
<li class="nav-item">
<a class="nav-link active" href="#">Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/members">Members</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/mailing-list">Mailing List</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="/equipment">Equipment</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="/accounts/signout">Sign out make these reversed</a>
</li>
</ul>
<div class="container"> <div class="container">
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}