From 0324ead275c32b651005a76c533cd732bf654abf Mon Sep 17 00:00:00 2001 From: Mike Shoup Date: Fri, 5 Jul 2019 09:11:29 -0600 Subject: [PATCH] Add footer for displaying specs --- src/humulus/static/style.css | 4 ++ src/humulus/templates/_base.html | 1 + src/humulus/templates/recipes/_macros.html | 55 ++++++++++++---------- src/humulus/templates/recipes/create.html | 12 ++++- src/humulus/templates/recipes/update.html | 12 ++++- 5 files changed, 54 insertions(+), 30 deletions(-) diff --git a/src/humulus/static/style.css b/src/humulus/static/style.css index e874c3a..67646b2 100644 --- a/src/humulus/static/style.css +++ b/src/humulus/static/style.css @@ -31,3 +31,7 @@ body { padding-top: 5rem; } + +.above-footer { + padding-bottom: 12rem; +} diff --git a/src/humulus/templates/_base.html b/src/humulus/templates/_base.html index 3421471..4b0f264 100644 --- a/src/humulus/templates/_base.html +++ b/src/humulus/templates/_base.html @@ -65,6 +65,7 @@ {% block body %}{% endblock %} + diff --git a/src/humulus/templates/recipes/_macros.html b/src/humulus/templates/recipes/_macros.html index ffa5f5d..ae48f16 100644 --- a/src/humulus/templates/recipes/_macros.html +++ b/src/humulus/templates/recipes/_macros.html @@ -29,32 +29,6 @@
{{ render_field_with_errors(form.efficiency, 'ingredient-field') }}
{{ render_field_with_errors(form.volume, 'ingredient-field') }}
- {#- - Recipe specifications - -#} -

Estimated Specifications

-
-
-
-
Original Gravity
-
-
Final Gravity
-
-
Alcohol
-
-
-
-
-
-
Bitterness
-
-
Bitterness Ratio
-
-
Color
-
-
-
-
{#- Fermentable Ingredients -#} @@ -154,3 +128,32 @@ {% endmacro %} + +{% macro render_footer() %} +
+
+
+
+
+
Original Gravity
+
+
Final Gravity
+
+
Alcohol
+
+
+
+
+
+
Bitterness
+
+
Bitterness Ratio
+
+
Color
+
+
+
+
+
+
+{% endmacro %} diff --git a/src/humulus/templates/recipes/create.html b/src/humulus/templates/recipes/create.html index 691c43f..0d074dd 100644 --- a/src/humulus/templates/recipes/create.html +++ b/src/humulus/templates/recipes/create.html @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. -#} -{% from "recipes/_macros.html" import render_recipe_form %} +{% from "recipes/_macros.html" import render_recipe_form, render_footer %} {% extends '_base.html' %} {% block title %}Create Recipe{% endblock %} @@ -21,5 +21,13 @@ {% block body %}

Create a new recipe

{{ render_recipe_form(form, url_for('recipes.create'), 'Create recipe') }} -Back to recipe list +
+
+ Back to recipe list +
+
+{% endblock %} + +{% block footer %} +{{ render_footer() }} {% endblock %} diff --git a/src/humulus/templates/recipes/update.html b/src/humulus/templates/recipes/update.html index aea95bc..3995ea8 100644 --- a/src/humulus/templates/recipes/update.html +++ b/src/humulus/templates/recipes/update.html @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. -#} -{% from "recipes/_macros.html" import render_recipe_form %} +{% from "recipes/_macros.html" import render_recipe_form, render_footer %} {% extends '_base.html' %} {% block title %}Update | {{ form.name.data }}{% endblock %} @@ -21,5 +21,13 @@ {% block body %}

{{ form.name.data }}

{{ render_recipe_form(form, url_for('recipes.update', id=id, rev=rev), 'Update recipe') }} -Cancel +
+
+ Cancel +
+
+{% endblock %} + +{% block footer %} +{{ render_footer() }} {% endblock %}