From 72004d6c51bec4bbe6d891e468d366d7d7c0c7e7 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Sat, 9 Jun 2018 14:27:43 +0200
Subject: [PATCH] fixed add form

---
 app/static/css/style.css             | 16 ++++++++++++++++
 app/templates/about.html             | 21 +++++++++++++++++++--
 app/templates/add_book.html          |  5 +++--
 app/templates/red_link.html          |  2 +-
 app/templates/show_books.html        | 15 +++++++++++----
 app/templates/show_stack_detail.html | 11 +++++++----
 6 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index 28ddd7b..6bc917f 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -7,6 +7,13 @@ font-family: "Archivo Narrow";
 p{
   font-size: 18px;
 
+
+}
+
+a{
+
+  text-decoration: none;
+  color: black;
 }
 
 .navigation ul{
@@ -46,9 +53,18 @@ padding: 0px 10px;
 
 }
 
+#fileformat{
+  text-align: center;
+}
+
 .lead{
   font-size: 18px;
 
+}
+
+.about{
+font-size: 16px;
+
 }
 .library_table{
 border-spacing:0; /* Removes the cell spacing via CSS */
diff --git a/app/templates/about.html b/app/templates/about.html
index 802a4dc..67aae18 100755
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -2,12 +2,29 @@
 
 {% block main %}
 <h1 class="page-header">About</h1>
-<p>
+<p class='about'>
 XPPL is a project aimed at people who are studying the field of media culture, or as we like to call them: knowledge comrades.
 <br>
-This digital library gathers all the books and articles floating around on PZI shelves and our hard drives and memory sticks, so that they can be shared.
+<br>
+This digital library gathers all the books and articles floating around on the shelves of the Piet Zwart Institute, and our hard drives and memory sticks, so that they can be shared, annotated and grouped together into stacks...
+<br>
 <br>
  Its web interface hosts a curated catalogue of books and articles, and its distributed architecture provides instances for uploading and downloading.
+<br>
 <br>
  It starts at XPUB, but can go anywhere we want it to.</p>
+
+
+<h2> What's the deal with the stacks? </h2>
+<p class='about'>
+  A stack is a number of books that are read at a certain point in time, alternating between them. They usually have a topic in common, or follow a certain study path that can bring you to a point of knowledge. Rather than a bookshelf, where books are lined up and often forgotten, the stack on your table/nightstand/toilet consists of books prone to be opened and reopened at any time.
+</p>
+
+<h2>Who's behind this?</h2>
+<p class='about'>
+We're Angeliki, Alex, Alice, Joca, Natasha and Zalán, helped and supported by Femke, Aymeric, Michael, Steve, Andre, Leslie and many more.
+<br>
+<br>
+XPUB is a study path within the Piet Zwart Institute masters program.
+</p>
 {% endblock %}
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index d3f2ab5..2400b1e 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -34,10 +34,11 @@
             {% endfor %}
         </table>
     </div>
-  </form>
+
 </div>
 <br>
-<div sclass="form-group" style="padding-left:10px;">Category: {{ form.category(size=27, class="form-control") }}
+<div style="padding-left:10px;">
+  Category: {{ form.category(size=27, class="form-control") }}
 <br>
 <br>
 
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index a3416a4..3c81566 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -33,7 +33,7 @@
     {% endif %}
   {% endwith %}
   <div style="width: 220px; float: left; padding-right: 40px;">
-    <img class="no_cover" width="220" src = '/static/img/default_cover.gif';">
+    <img class="no_cover" width="220" src = '/static/img/default_cover.gif';>
   </div>
   <br>
   <div>
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 3f767fc..fa0580b 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -56,12 +56,19 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td>{{ book.fileformat }}</td>
+      <td id='fileformat'>{{ book.fileformat }}</td>
       <td>{{ book.category}}</td>
-      <td>  {% for stack in book.stacks %}
+      <td>
+        {% for stack in book.stacks %}
+
+              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">  </a>
+
+                {{ stack.stack_name }}
+                  </li>
+
+      {% endfor %}
+
 
-              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>  </li>
-              {% endfor %}
               </td>
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
 
diff --git a/app/templates/show_stack_detail.html b/app/templates/show_stack_detail.html
index e7c5193..0e2d293 100644
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@@ -6,7 +6,9 @@
   <h1 class="header">{{ stack.stack_name }}</h1>
 
   <p>{{ stack.stack_description }} </p>
-  <p>Books in this stack: {% for book in stack.books %}
+  <h2>Books in this stack:</h2>
+<p>
+  {% for book in stack.books %}
 
           <li>  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
           <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
@@ -19,12 +21,13 @@
   <br>
   <br>
 <p>
-  <a href="{{ url_for('remove_stack_by_id', id=stack.id )}}">Delete</a> </p>
-  <a href="{{ url_for('edit_stack_by_id', id=stack.id )}}">Edit</a> </p>
+  <a href="{{ url_for('remove_stack_by_id', id=stack.id )}}">Remove stack</a> </p>
+<p>
+  <a href="{{ url_for('edit_stack_by_id', id=stack.id )}}">Edit title and/or description</a> </p>
 
 
 
-<p><a href="{{url_for('show_stacks')}}">Go back to stacks</p>
+<p><a href="{{url_for('show_stacks')}}">Go back to the other stacks</p>
 
 </div>
 {% endblock %}