From 195daf98e038bd4879686ff60ca9dabaf6246215 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sun, 3 Jan 2021 11:51:22 +1100
Subject: [PATCH] fixed BUG-1 (loan div in wrong spot)

---
 BUGs                |  3 ---
 templates/book.html | 30 ++++++++++++++++--------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/BUGs b/BUGs
index 861ba33..e47ad99 100644
--- a/BUGs
+++ b/BUGs
@@ -1,7 +1,4 @@
 #### BUGS
-BUG-1:		loan card is not in right div anymore (since series stuff?)
-			- http://mara.ddp.net:5000/book/1513
-
 BUG-2:		series does not deal with calcd_rating... 
 			- (on edit could, recalc as a catch-all, and obviously if we change a single book's rating, we should re-calc)
 
diff --git a/templates/book.html b/templates/book.html
index bf401e6..a822154 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -295,20 +295,6 @@ function AddAuthorToBook(num) {
 		</div class="form-row">
 		{{ hiddens.txt|safe }}
 		</form>
-		{% if 'Edit' in page_title %}
-			{% if b.parent|length == 0 %}
-				<form role="form" class="form col-lg-10" action="{{url_for('new_book')}}" method="POST">
-					<input type="hidden" name="add_sub_parent_id" value="{{books.id}}">
-					{{ book_form.add_sub( class="btn btn-outline-success offset-lg-2 col-lg-2" )}}
-				</form>
-			{% else %}
-				<form role="form" class="form col-lg-10" action="{{url_for('remove_sub_book')}}" method="POST">
-					<input type="hidden" name="rem_sub_sub_book_id" value="{{books.id}}">
-					<input type="hidden" name="rem_sub_parent_id" value="{{b.parent[0].id}}">
-					{{ book_form.rem_sub( class="btn btn-outline-danger offset-lg-2 col-lg-3" )}}
-				</form>
-			{% endif %}
-		{% endif %}
 		{% if books.loan|length %}
 				<div class="col">
 					<div class="card border-primary">
@@ -324,6 +310,22 @@ function AddAuthorToBook(num) {
 			</div>
 		{% endif %}
 
+		{% if 'Edit' in page_title %}
+			<div class="form-row">
+			{% if b.parent|length == 0 %}
+				<form role="form" class="form col-lg-10" action="{{url_for('new_book')}}" method="POST">
+					<input type="hidden" name="add_sub_parent_id" value="{{books.id}}">
+					{{ book_form.add_sub( class="btn btn-outline-success offset-lg-2 col-lg-2" )}}
+				</form>
+			{% else %}
+				<form role="form" class="form col-lg-10" action="{{url_for('remove_sub_book')}}" method="POST">
+					<input type="hidden" name="rem_sub_sub_book_id" value="{{books.id}}">
+					<input type="hidden" name="rem_sub_parent_id" value="{{b.parent[0].id}}">
+					{{ book_form.rem_sub( class="btn btn-outline-danger offset-lg-2 col-lg-3" )}}
+				</form>
+			{% endif %}
+			</div>
+		{% endif %}
 	</div class="row">
 </div class="container">