Merge remote-tracking branch 'origin/master'

This commit is contained in:
Christopher C. Wells 2021-12-21 15:58:42 -05:00
commit db703c07ec
4 changed files with 6 additions and 6 deletions

View File

@ -143,11 +143,11 @@ AUTHENTICATION_BACKENDS = [
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',
] ]
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = ''
LOGIN_URL = '/login/' LOGIN_URL = 'login/'
LOGOUT_REDIRECT_URL = '/login/' LOGOUT_REDIRECT_URL = 'login/'
# Timezone # Timezone

View File

@ -27,7 +27,7 @@
{% block breadcrumb_nav %} {% block breadcrumb_nav %}
<nav aria-label="breadcrumb" role="navigation"> <nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/">{% trans "Home" %}</a></li> <li class="breadcrumb-item"><a href={% url "babybuddy:root-router" %}>{% trans "Home" %}</a></li>
{% block breadcrumbs %}{% endblock %} {% block breadcrumbs %}{% endblock %}
</ol> </ol>
</nav> </nav>

View File

@ -3,7 +3,7 @@
{% block nav %} {% block nav %}
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand mr-2" href="/"> <a class="navbar-brand mr-2" href={% url "babybuddy:root-router" %}>
<img src="{% static "babybuddy/logo/icon-brand.png" %}" width="30" height="30" class="d-inline-block align-top" alt=""> <img src="{% static "babybuddy/logo/icon-brand.png" %}" width="30" height="30" class="d-inline-block align-top" alt="">
<span class="d-none d-lg-inline-block"> <span class="d-none d-lg-inline-block">
<span class="text-primary">Baby</span> Buddy <span class="text-primary">Baby</span> Buddy

View File

@ -19,6 +19,6 @@
{% endblocktrans %} {% endblocktrans %}
</h1> </h1>
<input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" /> <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
<a href="/" class="btn btn-default">{% trans "Cancel" %}</a> <a href={% url "babybuddy:root-router" %} class="btn btn-default">{% trans "Cancel" %}</a>
</form> </form>
{% endblock %} {% endblock %}