From 82c974fd8ea398d72be836be859553c07de1b105 Mon Sep 17 00:00:00 2001
From: Mike Shoup <mike@shoup.io>
Date: Fri, 28 Jun 2019 11:52:15 -0600
Subject: [PATCH] Layout changes

---
 src/humulus/static/favicon.ico            | Bin 0 -> 15406 bytes
 src/humulus/templates/_base.html          |   8 ++++++++
 src/humulus/templates/recipes/create.html |   1 +
 src/humulus/templates/recipes/index.html  |   5 +++++
 src/humulus/templates/recipes/info.html   |   2 +-
 src/humulus/templates/recipes/update.html |   1 +
 6 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 src/humulus/static/favicon.ico

diff --git a/src/humulus/static/favicon.ico b/src/humulus/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bf4e066ca0a267af4413e816e07b84f5b97d3a66
GIT binary patch
literal 15406
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
ShzosudSkl#cDDs=x4?gD>_S=q

literal 0
HcmV?d00001

diff --git a/src/humulus/templates/_base.html b/src/humulus/templates/_base.html
index 13e61ef..8e94dff 100644
--- a/src/humulus/templates/_base.html
+++ b/src/humulus/templates/_base.html
@@ -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>
diff --git a/src/humulus/templates/recipes/create.html b/src/humulus/templates/recipes/create.html
index 417288e..691c43f 100644
--- a/src/humulus/templates/recipes/create.html
+++ b/src/humulus/templates/recipes/create.html
@@ -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 %}
diff --git a/src/humulus/templates/recipes/index.html b/src/humulus/templates/recipes/index.html
index 544a8d2..7d61f3a 100644
--- a/src/humulus/templates/recipes/index.html
+++ b/src/humulus/templates/recipes/index.html
@@ -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 %}
diff --git a/src/humulus/templates/recipes/info.html b/src/humulus/templates/recipes/info.html
index 646ebd1..01b7c36 100644
--- a/src/humulus/templates/recipes/info.html
+++ b/src/humulus/templates/recipes/info.html
@@ -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) }}
diff --git a/src/humulus/templates/recipes/update.html b/src/humulus/templates/recipes/update.html
index ac4b53a..aea95bc 100644
--- a/src/humulus/templates/recipes/update.html
+++ b/src/humulus/templates/recipes/update.html
@@ -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 %}