Modify template stuff.

This commit is contained in:
Chris GIACOFEI 2024-06-03 11:04:42 -04:00
parent fa1e4a6b24
commit 875c6beda2
7 changed files with 53 additions and 66 deletions

View File

@ -20,10 +20,14 @@
<style>
{% block style %}{% endblock %}
body {
margin-top: 50px;
}
</style>
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<div class="container">
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="/">Damn Yankee Brewing</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
@ -53,19 +57,45 @@
<li class="nav-item">
<a class="nav-link" href="/about/">About</a>
</li>
</ul>
{% if user.is_authenticated %}
<form id="LougoutForm" action="{% url 'logout' %}" method="POST" class="form-inline my-2 my-lg-0">
{% csrf_token %}
<label style="color: Gray">{{ user.username }}&nbsp;&nbsp;&nbsp;</label>
<a href="#" onclick="document.getElementById('LougoutForm').submit();">Log Out</a>
</form>
<a href="{% url 'password_change' %}">Change Password</a>
{% else %}
<a href="{% url 'login' %}">Log In</a>
{% endif %}
<!-- <form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form> -->
</div>
</nav>
<div>
{% block content %}
{% endblock %}
</div>
<footer class="text-left fixed-bottom">
<main role="main">
<div class="jumbotron">
<div class="container">
<div class="content row">
<h2>{% block jumbotron %}{% endblock %}</h2>
</div>
<div class="content row">
<h4>{% block jumbotronsub %}{% endblock %}</h4>
</div>
</div>
</div>
{% block content %}{% endblock %}
</main>
<footer class="bg-body-tertiary text-center fixed-bottom">
<!-- Copyright -->
<div class="text-center p-1" style="background-color: rgba(0, 0, 0, 0.1);">
&copy; Damn yankee Brewing 2010-{% now "Y" %}

View File

@ -2,18 +2,9 @@
{% block title %} Home {% endblock %}
{% block jumbotron %}Brewing Tools{% endblock %}
{% block content %}
<main role="main">
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1 class="display-3">Brewing Tools</h1>
</div>
</div>
<div class="container">
<!-- Example row of columns -->
<div class="row">
@ -38,6 +29,4 @@
</div> <!-- /container -->
</main>
{% endblock %}

View File

@ -1,17 +1,11 @@
{% extends "base.html" %}
{% load mathfilters %}
{% block title %}Sample Batch{% endblock %}
{% block jumbotron %}Batch Number{% endblock %}
{% block jumbotronsub %}{{ batch.id }}{% endblock %}
{% block content %}
<main role="main">
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1 class="display-3">Batch Number: {{ batch.id }}</h1>
</div>
</div>
<div class="container">
<h1>{{ batch.strain.name }}</h1>
@ -45,7 +39,7 @@
</fieldset>
</div>
<div class="col-md-6 form-group">
<h1>Print Labels for this Batch</h1>
<legend>Print Labels for this Batch</legend>
<p><p>
<label for="skip_count">Number of labels already removed from the sheet: </label>
<input id="skip_count" type="number" name="skip_count" value=0 size="4">
@ -55,6 +49,5 @@
</div>
</form>
</div> <!-- /container -->
</main>
{% endblock %}

View File

@ -6,12 +6,10 @@ label { display: table-cell; }
input { display: table-cell; }
{% endblock %}
{% block jumbotron %}
Add Batch
{% endblock %}
{% block content %}
<div class="jumbotron">
<div class="container">
<h1 class="display-3">Add Batch</h1>
</div>
</div>
<div class="container">
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}

View File

@ -1,17 +1,10 @@
{% extends "base.html" %}
{% load mathfilters %}
{% block title %}Sample Batches{% endblock %}
{% block jumbotron %}Yeast Sample Batches{% endblock %}
{% block content %}
<main role="main">
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1 class="display-3">Yeast Sample Batches</h1>
</div>
</div>
<div class="container">
<ul>
{% for batch in object_list %}
@ -47,8 +40,4 @@
<a href="{% url 'yeast:addbatch' %}">Add Batch</a><br>
<a href="{% url 'yeast:addstrain' %}">Add Yeast Strain</a>
</div> <!-- /container -->
</main>
{% endblock %}

View File

@ -1,17 +1,11 @@
{% extends "base.html" %}
{% load mathfilters %}
{% block title %}Yeast Samples{% endblock %}
{% block jumbotron %}Yeast Sample:{% endblock %}
{% block jumbotronsub %}{{ sample.id }}{% endblock %}
{% block content %}
<main role="main">
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1 class="display-3">Yeast Sample: {{ yeast.id }}</h1>
</div>
</div>
<div class="container">
<h3>{{ batch.strain.name }}</h3>
@ -32,6 +26,4 @@
</ul>
{% endfor %}
</div> <!-- /container -->
</main>
{% endblock %}

View File

@ -6,12 +6,8 @@ label { display: table-cell; }
input { display: table-cell; }
{% endblock %}
{% block jumbotron %}Add Strain{% endblock %}
{% block content %}
<div class="jumbotron">
<div class="container">
<h1 class="display-3">Add Strain</h1>
</div>
</div>
<div class="container">
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}