From 7bd3ff4c263a7fb94441eb96320b6723c6c54c7f Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sun, 22 Nov 2020 23:56:34 +1100
Subject: [PATCH] fixed up author and publisher drop-down lists to have right
 id/val, not sure if array subscripting the names will work. To be tested,
 also removed as many divs and margins and paddings as I can, still dont fully
 understand why some indent more than others, etc. but it works for now

---
 templates/book.html | 100 +++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/templates/book.html b/templates/book.html
index c92d088..b826bc3 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -25,67 +25,63 @@
 								{% endfor %}
 							</div>
 					{% elif key == "publisher" %}
-							<div class="col-lg-10">
-								<div class="form-row input-group" style="margin-left:0px; margin-right:0px;">
+						<div class="form-row col input-group" style="margin-left:0px; margin-right:0px;">
+							<div class="input-group-prepend">
+								<button class="btn btn-outline-primary" type="button">
+									<a style="color:inherit" href="{{url_for(key, id=books[key][0].id)}}"><i class="far fa-edit"></i></a>
+								</button>
+							</div>
+							<select class="form-control" id="publisher">
+							{% for pub in publisher_list %}
+								{% set pname=pub.name %}
+								<option id="{{pub.id}}" value="{{pub.id}}"
+								{% if books.publisher[0].name == pname %}
+									selected
+								{% endif %}
+								>{{pname}}</option>
+							{% endfor %}
+							</select>
+						</div class="row">
+					{% elif key == "author" %}
+						<div class="form-row col" style="margin-left:0px;margin-right:0px">
+							{% set cnt = namespace(idx=0) %}
+							{% for objects in books[key] %}
+								<div class="col input-group" style="padding-left:0px;padding-right:0px">
+									{% if cnt.idx > 0 %}
+										<div class="input-group-prepend">
+											<button class="btn btn-outline-danger" type="button">
+												<a style="color:inherit" href="{{url_for(key, id=-1)}}"><i class="fas fa-minus"></i></a>
+											</button>
+										</div>
+									{% endif %}
 									<div class="input-group-prepend">
 										<button class="btn btn-outline-primary" type="button">
-											<a style="color:inherit" href="{{url_for(key, id=books[key][0].id)}}"><i class="far fa-edit"></i></a>
+											<a style="color:inherit" href="{{url_for(key, id=books[key][cnt.idx].id)}}"><i class="far fa-edit"></i></a>
 										</button>
 									</div>
-									<select class="form-control" id="publisher">
-									{% for pub in publisher_list %}
-										{% set pname=pub.name %}
-										<option id="{{books.publisher[0].id}}" value="{{books.publisher[0].id}}"
-										{% if books.publisher[0].name == pname %}
+									<select class="form-control" id="author[{{cnt.idx}}]">
+									{% for auth in author_list %}
+										{% set aname=auth.surname+", "+auth.firstnames %}
+										<option id="{{auth.id}}" value="{{auth.id}}"
+										{% if books.author[cnt.idx].id == auth.id %}
 											selected
 										{% endif %}
-										>{{pname}}</option>
+										>{{aname}}</option>
 									{% endfor %}
 									</select>
-								</div class="row">
-							</div class="col-lg-10">
-					{% elif key == "author" %}
-							<div class="col-lg-10">
-								<div class="form-row" style="margin-left:0px;margin-right:0px">
-									{% set cnt = namespace(idx=0) %}
-									{% for objects in books[key] %}
-										<div class="col input-group" style="padding-left:0px;padding-right:0px">
-											{% if cnt.idx > 0 %}
-												<div class="input-group-prepend">
-													<button class="btn btn-outline-danger" type="button">
-														<a style="color:inherit" href="{{url_for(key, id=-1)}}"><i class="fas fa-minus"></i></a>
-													</button>
-												</div>
-											{% endif %}
-											<div class="input-group-prepend">
-												<button class="btn btn-outline-primary" type="button">
-													<a style="color:inherit" href="{{url_for(key, id=books[key][cnt.idx].id)}}"><i class="far fa-edit"></i></a>
-												</button>
-											</div>
-											<select class="form-control" id="publisher">
-											{% for auth in author_list %}
-												{% set aname=auth.surname+", "+auth.firstnames %}
-												<option id="{{books.author[cnt.idx].id}}" value="{{books.author[cnt.idx].id}}"
-												{% if books.author[cnt.idx].id == auth.id %}
-													selected
-												{% endif %}
-												>{{aname}}</option>
-											{% endfor %}
-											</select>
-										</div class="col">
-										{% set cnt.idx = cnt.idx+1 %}
-									{% endfor %}
-									<div class="input-group-append">
-											<button class="btn btn-outline-success" type="button">
-												<a style="color:inherit" href="{{url_for(key, id=-1)}}"><i class="fas fa-plus"></i></a>
-											</button>
-									</div>
-								</div class="form-row">
-							</div class="col-lg-10">
+								</div class="col">
+								{% set cnt.idx = cnt.idx+1 %}
+							{% endfor %}
+							<div class="input-group-append">
+								<button class="btn btn-outline-success" type="button">
+									<a style="color:inherit" href="{{url_for(key, id=-1)}}"><i class="fas fa-plus"></i></a>
+								</button>
+							</div>
+						</div class="form-row">
 					{% else %}
-							<div class="col-lg-10">
-								{{book_form[key](class="form-control", value=books[key], rows="5" )}}
-							</div class="col-lg-10">
+						<div class="col">
+							{{book_form[key](class="form-control", value=books[key], rows="5" )}}
+						</div class="col">
 					{% endif %}
 				</div class="form-row">
 			{% endfor %}