From 3296a2efcf20467d00b6749b2aefb354d6d4832c Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Thu, 7 Jun 2018 23:33:22 +0200
Subject: [PATCH] updates to grid and list view

---
 app/forms.py                       |  7 +++++--
 app/templates/results.html         |  8 ++++----
 app/templates/results_grid.html    |  2 +-
 app/templates/show_books.html      |  8 ++++----
 app/templates/show_books_grid.html | 18 ++++++++++++++++--
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index 81508e1..f1704ab 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -3,7 +3,7 @@ from wtforms import StringField, FileField, validators
 from wtforms.validators import InputRequired, DataRequired
 from wtforms import FieldList
 from wtforms import Form as NoCsrfForm
-from wtforms.fields import StringField, FormField, SubmitField, SelectField
+from wtforms.fields import StringField, FormField, SubmitField, SelectField, RadioField
 from app.models import Book, BookSchema, Author, Stack, StackSchema
 
 # - - - Forms - - -
@@ -49,9 +49,12 @@ class SearchForm(FlaskForm):
                ('Author', 'Author'),
                ('Category', 'Category'),
                ('Stack', 'Stack')]
-    select = SelectField('', choices=choices)
+    select = SelectField('', choices=choices, default='All')
     search = StringField('', validators=[InputRequired()])
     grid = SubmitField('Grid')
     listview = SubmitField('List')
+    randomize = SubmitField('Order differently')
+
+
 
 
diff --git a/app/templates/results.html b/app/templates/results.html
index 54f4546..6ccb272 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -9,7 +9,7 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
      <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>      
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>    
     </form>
     </div>
 
@@ -33,7 +33,7 @@
 
   <table class="library_table" id="table" style="width:100%">
     <tr id="header">
-      <th>Cover</th>
+      <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
       <th width="100px;">Filetype</th>
@@ -45,7 +45,7 @@
         {% for book in books %}
     <tr>
     <td style= "padding: 5px;">
-<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
+<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
       <td><a href="{{url_for('show_book_by_id', id=book.id)}}">{{ book.title }}</a></td>
 
       <td>  {% for author in book.authors %}
@@ -75,7 +75,7 @@
 
   <table class="library_table" id="table" style="width:100%">
     <tr id="header">
-      <th>Cover</th>
+      <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
       <th width="100px;">Filetype</th>
diff --git a/app/templates/results_grid.html b/app/templates/results_grid.html
index cea341b..5b2a1ec 100644
--- a/app/templates/results_grid.html
+++ b/app/templates/results_grid.html
@@ -36,7 +36,7 @@
 
 
 <div class="gridbox">
-<a href="books/{{ book.id }}">
+<a href="/books/{{ book.id }}">
 <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
 <p>
 <tbody>
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 258c0e6..69be928 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -9,7 +9,7 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
        <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
  </form>
 
   <h1 class="page-header">All Books</h1>
@@ -28,7 +28,7 @@
   <table class="library_table" id="table" style="width:100%">
     <thead>
     <tr id="header">
-      <th>Cover</th>
+      <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
       <th width="100px;">Filetype</th>
@@ -38,11 +38,11 @@
     </tr>
     </thead>
     <tbody>
-        {% for book in books|sort(attribute='title', reverse = False) %}
+        {% for book in books %}
     <tr>
       <td style= "padding: 5px;">
 
-        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
+        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
       <!--  <object class="no_cover" data="../static/img/default_cover.png" type="image/png" width="65">
           <p hidden="True"></p>
 
diff --git a/app/templates/show_books_grid.html b/app/templates/show_books_grid.html
index 51eec0b..4384ee8 100644
--- a/app/templates/show_books_grid.html
+++ b/app/templates/show_books_grid.html
@@ -9,13 +9,27 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
            <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p> 
  </form>
     </div>
 
+
+  <h1 class="page-header">All Books</h1>
+  {% with messages = get_flashed_messages() %}
+    {% if messages %}
+      <div class="alert alert-success">
+        <ul>
+        {% for message in messages %}
+          <li>{{ message }}</li>
+        {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
+  {% endwith %}
+
 <div class="grid">
 
-        {% for book in books|sort(attribute='title', reverse = False) %}
+        {% for book in books %}
 
 
 <div class="gridbox">