1
0
Fork 0
mirror of https://github.com/shouptech/humulus.git synced 2026-02-03 13:49:41 +00:00

Layout changes

This commit is contained in:
Emma 2019-06-28 11:52:15 -06:00
parent 17282af304
commit 82c974fd8e
6 changed files with 16 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -23,6 +23,9 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}" />
<!-- favicon -->
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" />
<title>{% block title %}{% endblock %} - Humulus</title>
</head>
<body>
@ -33,6 +36,11 @@
</button>
<div class="collapse navbar-collapse" id="navbarHumulusDefault">
<ul class="navbar-nav mr-auto">
<li class="nav-item {% if request.url_rule.endpoint == 'recipes.index' %}active{% endif %}">
<a class="nav-link" href="{{ url_for('recipes.index') }}">Recipes</a>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Login</a>

View file

@ -21,4 +21,5 @@
{% block body %}
<div class="row"><h1>Create a new recipe</h1></div>
{{ render_recipe_form(form, url_for('recipes.create'), 'Create recipe') }}
<a href="{{ url_for('recipes.index')}}" class="mt-2 btn btn-secondary btn-sm">Back to recipe list</a>
{% endblock %}

View file

@ -21,6 +21,10 @@
{% block body %}
<div class="row"><h1>Recipes</h1></div>
<div class="row">
<a href="{{ url_for('recipes.create') }}" class="btn btn-primary btn-sm mt-1 mb-2 ml-auto">Create a recipe</a>
</div>
<div class="row">
<table class="table table-hover table-sm">
<thead>
<tr>
@ -53,4 +57,5 @@
</tr>
{% endfor %}
</table>
</div>
{% endblock %}

View file

@ -144,7 +144,7 @@
Buttons to do things
-#}
<div class="row mt-4 pt-1 border-top">
<a class="btn btn-secondary" href="{{ url_for('recipes.update', id=recipe._id) }}">Update Recipe</a>
<a class="btn btn-secondary mr-1" href="{{ url_for('recipes.update', id=recipe._id) }}">Update Recipe</a>
{{ render_delete_button('Delete Recipe', 'deleteRecipe', 'btn-danger') }}
</div>
{{ render_delete_modal(url_for('recipes.delete', id=recipe._id), 'deleteRecipe', recipe.name) }}

View file

@ -21,4 +21,5 @@
{% block body %}
<div class="row"><h1>{{ form.name.data }}</h1></div>
{{ render_recipe_form(form, url_for('recipes.update', id=id, rev=rev), 'Update recipe') }}
<a href="{{ url_for('recipes.info', id=id)}}" class="mt-2 btn btn-secondary btn-sm">Cancel</a>
{% endblock %}