Lil fixes.

3 files changed, 22 insertions, 67 deletions

diff --git a/app/templates/modules/add-invoice.html b/app/templates/modules/add-invoice.html
deleted file mode 100644
index 92748be..0000000
--- a/app/templates/modules/add-invoice.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{# -*- mode: web; -*- #}
-
-{% extends "base.html" %}
-
-
-{% block title %}Add a new invoice{% endblock %}
-{% block content %}
-
-{% if message %}
-{# the form was submitted and message exists #}
-<p><strong>{{ item }}</strong></p>
-{# links #}
-<p><a href="{{ url_for('add_item', item=item) }}" class="button">Submit another {{ item }}</a></p>
-<p><a href="/fapg/home">Return to the index</a></p>
-
-{% else %}
-{# the form is displayed when template opens via GET not POST #}
-
-{# show flash - based on WTForms validators see
-https://pythonprogramming.net/flash-flask-tutorial/
-get_flashed_messages() exists here because of flash() in the route
-function #}
-
-{% with errors = get_flashed_messages() %} {% if errors %}
-{% for err in errors %}
-<div class="alert alert-danger alert-dismissible" role="alert">
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
-    {{ err }}
-</div>
-{% endfor %}
-{% endif %}
-{% endwith %}
-{# end of flash #}
-
-
-{# the form #}
-<form action="{{ url_for('add_item', item=item) }}" method="POST">
-    <fieldset>
-	<legend>Add a new {{ item }} to our database.</legend>
-	{% for field in form %}
-	{{ field.label() }}
-	{{ field() }}<br/>
-	{% endfor %}
-    </fieldset>
-</form>
-
-{% endif %}
-{% endblock %}
diff --git a/app/templates/modules/add-item.html b/app/templates/modules/add-item.html
index 356ce9f..4eaee3d 100644
--- a/app/templates/modules/add-item.html
+++ b/app/templates/modules/add-item.html
@@ -10,7 +10,7 @@
     <fieldset>
 	<legend>Add a new item to our {{ table }} table.</legend>
 	{% for field in form %}
-	{{ field.label() }}
+	{{ field.label() }}<br/>
 	{{ field() }}<br/>
 	{% endfor %}
     </fieldset>
diff --git a/app/templates/modules/invoices.html b/app/templates/modules/invoices.html
index 55a4b87..293a45b 100644
--- a/app/templates/modules/invoices.html
+++ b/app/templates/modules/invoices.html
@@ -13,25 +13,28 @@ Invoices
 {% block content %}
 <i>Track your invoices and create new ones here.</i><br/>
 
+{# Pagination Links #}
+{# gotten from https://betterprogramming.pub/simple-flask-pagination-example-4190b12c2e2e #}
 <center>
-{% for page_num in invoices.iter_pages(left_edge=1, right_edge=1, left_current=1, right_current=2) %}
-{% if page_num %}
-<!-- Check for the active page and set the link to "Active"-->
-{% if invoices.page == page_num %}
-<a href="{{ url_for('invoices.view', page=page_num) }}"
-   class="button">
-    {{ page_num }}
-</a>
-{% else %}
-<a href="{{ url_for('invoices.view', page=page_num) }}"
-   class="button button-light">
-    {{ page_num }}
-</a>
-{% endif %}
-{% else %}
-...
-{% endif %}
-{% endfor %}
+    {# Loop through the number of pages to display a link for each #}
+    {% for page_num in invoices.iter_pages(left_edge=1, right_edge=1, left_current=1, right_current=2) %}
+    {% if page_num %}
+    {# Check for the active page and set the link to "Active" #}
+    {% if invoices.page == page_num %}
+    <a href="{{ url_for('invoices.view', page=page_num) }}"
+       class="button">
+	{{ page_num }}
+    </a>
+    {% else %}
+    <a href="{{ url_for('invoices.view', page=page_num) }}"
+       class="button button-light">
+	{{ page_num }}
+    </a>
+    {% endif %}
+    {% else %}
+    ...
+    {% endif %}
+    {% endfor %}
 </center>
 <table>
     <thead>