Updating boostrap required pulling in popper.js (which required adding sync-exec as a dev dependency). Some of the templates were updated based on changes from bootstrap. Signed-off-by: Adam Wallis <adam.wallis@gmail.com>master
Adam Wallis
7 years ago
parent
5879da5324
commit
19cdae8adf
@ -1,49 +1,50 @@ |
||||
{% raw %} |
||||
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> |
||||
<div class="container"> |
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top"> |
||||
<a class="navbar-brand" href="{{ url_for('public.home') }}"> |
||||
{% endraw %} {{cookiecutter.project_name}} {% raw %} |
||||
</a> |
||||
<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> |
||||
|
||||
<!-- Brand and toggle get grouped for better mobile display --> |
||||
<div class="navbar-header"> |
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> |
||||
<span class="sr-only">Toggle navigation</span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
</button> |
||||
<a class="navbar-brand" href="{{ url_for('public.home') }}"> |
||||
{% endraw %} |
||||
{{cookiecutter.project_name}} |
||||
{% raw %} |
||||
</a> |
||||
</div> |
||||
<!-- Collect the nav links, forms, and other content for toggling --> |
||||
<div class="collapse navbar-collapse navbar-ex1-collapse"> |
||||
<ul class="nav navbar-nav"> |
||||
<li><a href="{{ url_for('public.home') }}">Home</a></li> |
||||
<li><a href="{{ url_for('public.about') }}">About</a></li> |
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent"> |
||||
<ul class="navbar-nav mr-auto"> |
||||
<li class="nav-item active"> |
||||
<a class="nav-link" href="{{ url_for('public.home') }}">Home |
||||
<span class="sr-only">(current)</span> |
||||
</a> |
||||
</li> |
||||
<li class="nav-item"> |
||||
<a class="nav-link" href="{{ url_for('public.about') }}">About</a> |
||||
</li> |
||||
</ul> |
||||
{% if current_user and current_user.is_authenticated %} |
||||
<ul class="nav navbar-nav navbar-right"> |
||||
<li> |
||||
<p class="navbar-text"><a class="navbar-link" href="{{ url_for('user.members') }}">Logged in as {{ current_user.username }}</a></p> |
||||
</li> |
||||
<li><a class="navbar-link" href="{{ url_for('public.logout') }}"><i class="fa fa-sign-out"></i></a></li> |
||||
|
||||
<ul class="navbar-nav my-auto"> |
||||
<li class="nav-item active"> |
||||
<a class="nav-link" href="{{ url_for('user.members') }}">Logged in as {{ current_user.username }}</a> |
||||
</li> |
||||
<li class="nav-item"> |
||||
<a class="nav-link" href="{{ url_for('public.logout') }}"> |
||||
<i class="fa fa-sign-out"></i> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
{% elif form %} |
||||
<ul class="nav navbar-nav navbar-right"> |
||||
<li><a href="{{ url_for('public.register') }}">Create account</a></li> |
||||
</ul> |
||||
<form id="loginForm" method="POST" class="navbar-form form-inline navbar-right" action="/" role="login"> |
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/> |
||||
<div class="form-group"> |
||||
{{ form.username(placeholder="Username", class_="form-control") }} |
||||
{{ form.password(placeholder="Password", class_="form-control") }} |
||||
<form class="form" id="loginForm" method="POST" action="/" role="login"> |
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" /> |
||||
<div class="input-group mb-2 mr-sm-2"> |
||||
{{ form.username(placeholder="Username", class_="form-control mr-sm-1 my-auto") }} {{ form.password(placeholder="Password", |
||||
class_="form-control mr-sm-1 my-auto") }} |
||||
<button class="btn btn-light btn-primary m-auto" type="submit">submit</button> |
||||
</div> |
||||
<button type="submit" class="btn btn-default">Log in</button> |
||||
</form> |
||||
<ul class="navbar-nav my-auto"> |
||||
<li class="nav-item"> |
||||
<a class="nav-link navbar-text" href="{{ url_for('public.register') }}">Create account</a> |
||||
</li> |
||||
</ul> |
||||
{% endif %} |
||||
</div><!-- /.navbar-collapse --> |
||||
</div><!-- /.container --> |
||||
</nav> |
||||
{% endraw %} |
||||
{% endraw %} |
||||
@ -1,7 +1,9 @@ |
||||
{% raw %} |
||||
{% extends "layout.html" %} |
||||
{% block content %} |
||||
<h1>Welcome {{ current_user.username }}</h1> |
||||
<h3>This is the members-only page.</h3> |
||||
<div class="container"> |
||||
<h1>Welcome {{ current_user.username }}</h1> |
||||
<h3>This is the members-only page.</h3> |
||||
</div> |
||||
{% endblock %} |
||||
{% endraw%} |
||||
|
||||
Loading…
Reference in new issue